annotate ja/mq-ref.tex @ 348:32d33b238b7e

made changes to the source files to be compiled at any rate.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 19 Aug 2008 16:03:33 +0900
parents 701429159ba8
children 73aa295a40da
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
1 %\chapter{Mercurial Queues reference}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
2 \chapter{Mercurial Queues $B%j%U%!%l%s%9(B}
224
34943a3d50d6 Start writing up extensions. Begin with inotify.
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
3 \label{chap:mqref}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
5 %\section{MQ command reference}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
6 \section{MQ $B%3%^%s%I%j%U%!%l%s%9(B}
224
34943a3d50d6 Start writing up extensions. Begin with inotify.
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
7 \label{sec:mqref:cmdref}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
9 %For an overview of the commands provided by MQ, use the command
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
10 %\hgcmdargs{help}{mq}.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
11
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
12 MQ$B$K$h$C$FDs6!$5$l$k%3%^%s%I$N35MW$K$D$$$F$O(B\hgcmdargs{help}{mq}$B$rMxMQ$5(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
13 $B$l$?$$!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
15 %\subsection{\hgxcmd{mq}{qapplied}---print applied patches}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
16 \subsection{\hgxcmd{mq}{qapplied}---$BE,MQ$5$l$?%Q%C%A$NI=<((B}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
17
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
18 %The \hgxcmd{mq}{qapplied} command prints the current stack of applied
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
19 %patches. Patches are printed in oldest-to-newest order, so the last
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
20 %patch in the list is the ``top'' patch.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
21
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
22 \hgxcmd{mq}{qapplied}$B%3%^%s%I$O!$E,MQ$5$l$?%Q%C%A$N8=:_$N%9%?%C%/$rI=<((B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
23 $B$9$k!%%Q%C%A$O8E$$$b$N$+$i?7$7$$$b$N$N=g$KI=<($5$l$k!%$=$N$?$a!$%j%9%H$N(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
24 $B:G8e$N%Q%C%A$O(B``top''$B%Q%C%A$H$J$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
26 %\subsection{\hgxcmd{mq}{qcommit}---commit changes in the queue
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
27 %repository}
348
32d33b238b7e made changes to the source files to be compiled at any rate.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 341
diff changeset
28 \subsection{\hgxcmd{mq}{qcommit}---$B%-%e!<$NCf$NJQ99$r%3%_%C%H$9$k(B}
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
29
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
30 %The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
31 %\sdirname{.hg/patches} repository. This command only works if the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
32 %\sdirname{.hg/patches} directory is a repository, i.e.~you created the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
33 %directory using \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} or ran
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
34 %\hgcmd{init} in the directory after running \hgxcmd{mq}{qinit}.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
35
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
36 \hgxcmd{mq}{qcommit}$B%3%^%s%I$O!$(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$K$"$k(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
37 $BV(N)$7$?JQ99$r%3%_%C%H$9$k!%$3$N%3%^%s%I$O(B\sdirname{.hg/patches}$B%G%#%l%/(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
38 $B%H%j$,%j%]%8%H%j$N>l9g$K$N$_F0:n$9$k!%Nc$($P(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
39 \hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}}$B%3%^%s%I$K$h$C$F%G%#%l%/%H%j$r:n$C(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
40 $B$?$j!$(B\hgxcmd{mq}{qinit}$B%3%^%s%I$N8e$K(B\hgcmd{init}$B$r<B9T$7$?>l9g$,AjEv$9(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
41 $B$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
42
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
43 %This command is shorthand for \hgcmdargs{commit}{--cwd .hg/patches}.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
44
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
45 $B$3$N%3%^%s%I$O(B\hgcmdargs{commit}{--cwd .hg/patches}$B$NC;=L7A$G$"$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
46
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
47 %\subsection{\hgxcmd{mq}{qdelete}---delete a patch from the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
48 % \sfilename{series} file}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
49 \subsection{\hgxcmd{mq}{qdelete}---\sfilename{series}$B%U%!%$%k$+$i%Q%C%A(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
50 $B$r>C5n$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
51
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
52 %The \hgxcmd{mq}{qdelete} command removes the entry for a patch from the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
53 %\sfilename{series} file in the \sdirname{.hg/patches} directory. It
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
54 %does not pop the patch if the patch is already applied. By default,
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
55 %it does not delete the patch file; use the \hgxopt{mq}{qdel}{-f} option to
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
56 %do that.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
57
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
58 \hgxcmd{mq}{qdelete}$B%3%^%s%I$O(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$N(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
59 \sfilename{series}$B%U%!%$%k$+$i%Q%C%A$r>C5n$9$k!%%Q%C%A$,4{$KE,MQ$5$l$F$$(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
60 $B$k>l9g$O%Q%C%A$r%]%C%W$7$J$$!%%G%U%)%k%H$G$O%Q%C%A%U%!%$%k$r>C5n$7$J$$$?(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
61 $B$a!$$=$NMQES$G$O(B\hgxopt{mq}{qdel}{-f}$B%*%W%7%g%s$r;H$&!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
62
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
63 %Options:
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
64 $B%*%W%7%g%s(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
65 \begin{itemize}
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
66 %\item[\hgxopt{mq}{qdel}{-f}] Delete the patch file.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
67 \item[\hgxopt{mq}{qdel}{-f}] $B%Q%C%A$r>C5n$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
68 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
69
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
70 %\subsection{\hgxcmd{mq}{qdiff}---print a diff of the topmost applied
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
71 %patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
72 \subsection{\hgxcmd{mq}{qdiff}---$B:G>e0L$NE,MQ$5$l$?%Q%C%A$N(Bdiff$B$r=PNO$9(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
73 $B$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
74
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
75 %The \hgxcmd{mq}{qdiff} command prints a diff of the topmost applied patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
76 %It is equivalent to \hgcmdargs{diff}{-r-2:-1}.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
77
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
78 \hgxcmd{mq}{qdiff}$B%3%^%s%I$O:G>e0L$NE,MQ$5$l$?%Q%C%A$N(Bdiff$B$r=PNO$9$k!%$3(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
79 $B$l$O(B\hgcmdargs{diff}{-r-2:-1}$B$HEy2A$G$"$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
80
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
81 %\subsection{\hgxcmd{mq}{qfold}---merge (``fold'') several patches into
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
82 %one}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
83 \subsection{\hgxcmd{mq}{qfold}---$B$$$/$D$+$N%Q%C%A$r0l$D$K%^!<%8(B($B$^$?$O(B``fold'')$B$9$k(B}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
84
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
85 %The \hgxcmd{mq}{qfold} command merges multiple patches into the topmost
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
86 %applied patch, so that the topmost applied patch makes the union of
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
87 %all of the changes in the patches in question.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
88
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
89 \hgxcmd{mq}{qfold}$B%3%^%s%I$OJ#?t$N%Q%C%A$rE,MQ$5$l$?:F>e0L$N%Q%C%A$K%^!<(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
90 $B%8$9$k!%:F>e0L$N%Q%C%A$O4X?4$N$"$k%Q%C%AA4$F$NJQ99$N=89g$K$J$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
91
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
92 %The patches to fold must not be applied; \hgxcmd{mq}{qfold} will exit with
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
93 %an error if any is. The order in which patches are folded is
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
94 %significant; \hgcmdargs{qfold}{a b} means ``apply the current topmost
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
95 %patch, followed by \texttt{a}, followed by \texttt{b}''.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
96
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
97 fold$B$9$k%Q%C%A$OE,MQ$5$l$F$$$F$O$J$i$J$$!%(B\hgxcmd{mq}{qfold}$B$O!$$I$l$+$,(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
98 $BE,MQ$5$l$F$$$k>l9g$O%(%i!<$rJV$7$F=*N;$9$k!%(Bfold$B$5$l$k%Q%C%A$N=g=x$O=EMW(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
99 $B$G!$(B\hgcmdargs{qfold}{a b}$B$O!$(B``\texttt{a}, \texttt{b}$B$,B3$$$F$$$k8=:_$N(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
100 $B:F>e0L$N%Q%C%A$rE,MQ$9$k(B''$B$H$$$&0UL#$K$J$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
101
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
102 %The comments from the folded patches are appended to the comments of
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
103 %the destination patch, with each block of comments separated by three
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
104 %asterisk (``\texttt{*}'') characters. Use the \hgxopt{mq}{qfold}{-e}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
105 %option to edit the commit message for the combined patch/changeset
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
106 %after the folding has completed.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
107
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
108 $B%U%)!<%k%I$5$l$?%Q%C%A$N%3%a%s%H$O!$L\E*$N%Q%C%A$N%3%a%s%H$KDI2C$5$l$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
109 $B3F!9$N%3%a%s%H%V%m%C%/$O(B3$B$D$N%"%9%?%j%9%/$K$h$C$FJ,N%$5$l$F$$$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
110 \hgxopt{mq}{qfold}{-e}$B%*%W%7%g%s$K$h$C$F!$%U%)!<%k%I$,40N;$7$?8e$K7k9g$7(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
111 $B$?%Q%C%A!?%A%'%s%8%;%C%H$N%3%_%C%H%a%C%;!<%8$rJT=8$9$k$3$H$,$G$-$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
112
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
113 %Options:
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
114 $B%*%W%7%g%s(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
115 \begin{itemize}
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
116 %\item[\hgxopt{mq}{qfold}{-e}] Edit the commit message and patch description
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
117 % for the newly folded patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
118 \item[\hgxopt{mq}{qfold}{-e}] $B?7$?$K%U%)!<%k%I$5$l$k%Q%C%A$N%3%_%C%H%a%C(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
119 $B%;!<%8$H%Q%C%A$N@bL@$rJT=8$9$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
120 %\item[\hgxopt{mq}{qfold}{-l}] Use the contents of the given file as the new
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
121 % commit message and patch description for the folded patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
122 \item[\hgxopt{mq}{qfold}{-l}] $B%U%)!<%k%I$5$l$?%Q%C%A$N?7$7$$%3%_%C%H%a%C(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
123 $B%;!<%85Z$S%Q%C%A$N@bL@$H$7$F!$M?$($i$l$?%U%!(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
124 $B%$%k$r;HMQ$9$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
125 %\item[\hgxopt{mq}{qfold}{-m}] Use the given text as the new commit message
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
126 % and patch description for the folded patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
127 \item[\hgxopt{mq}{qfold}{-m}] $B%U%)!<%k%I$5$l$?%Q%C%A$N?7$7$$%3%_%C%H%a%C(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
128 $B%;!<%85Z$S%Q%C%A$N@bL@$H$7$F!$M?$($i$l$?%F(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
129 $B%-%9%H$rMQ$$$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
130 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
131
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
132 %\subsection{\hgxcmd{mq}{qheader}---display the header/description of a patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
133 \subsection{\hgxcmd{mq}{qheader}---$B%Q%C%A$N%X%C%@!?@bL@$rI=<((B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
134
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
135 %The \hgxcmd{mq}{qheader} command prints the header, or description, of a
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
136 %patch. By default, it prints the header of the topmost applied patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
137 %Given an argument, it prints the header of the named patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
138
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
139 \hgxcmd{mq}{qheader}$B%3%^%s%I$O%Q%C%A$N%X%C%@$^$?$O@bL@$rI=<($9$k!%%G%U%)(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
140 $B%k%H$G$O:F>e0L$KE,MQ$5$l$?%Q%C%A$N%X%C%@$rI=<($9$k!%0z?t$,EO$5$l$k$H!$;X(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
141 $BDj$5$l$?%Q%C%A$N%X%C%@$rI=<($9$k(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
142
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
143 %\subsection{\hgxcmd{mq}{qimport}---import a third-party patch into the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
144 %queue}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
145 \subsection{\hgxcmd{mq}{qimport}---$B%5!<%I%Q!<%F%#$N%Q%C%A$r%-%e!<$X%$%s(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
146 $B%]!<%H$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
147
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
148 %The \hgxcmd{mq}{qimport} command adds an entry for an external patch to the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
149 %\sfilename{series} file, and copies the patch into the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
150 %\sdirname{.hg/patches} directory. It adds the entry immediately after
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
151 %the topmost applied patch, but does not push the patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
152
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
153 \hgxcmd{mq}{qimport}$B%3%^%s%I$O!$(B\sfilename{series}$B%U%!%$%k$K30It$N%Q%C%A(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
154 $B$N$?$a$N%(%s%H%j$rDI2C$7!$%Q%C%A$r(B\sdirname{.hg/patches}$B%G%#%l%/%H%j$K%3(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
155 $B%T!<$9$k!%DI2C$O:F>e0L$NE,MQ:Q$_%Q%C%A$ND>8e$K9T$o$l!$%Q%C%A$N%W%C%7%e$O(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
156 $B9T$o$J$$!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
157
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
158 %If the \sdirname{.hg/patches} directory is a repository,
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
159 %\hgxcmd{mq}{qimport} automatically does an \hgcmd{add} of the imported
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
160 %patch.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
161
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
162 \sdirname{.hg/patches}$B%G%#%l%/%H%j$,%j%]%8%H%j$N>l(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
163 $B9g!$(B\hgxcmd{mq}{qimport}$B$O<+F0E*$K%$%s%]!<%H$5$l$?%Q%C%A$KBP$7$F(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
164 \hgcmd{add}$B$r9T$&!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
165
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
166 %\subsection{\hgxcmd{mq}{qinit}---prepare a repository to work with MQ}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
167 \subsection{\hgxcmd{mq}{qinit}---MQ$B$G;HMQ$9$k%j%]%8%H%j$rMQ0U$9$k(B}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
168
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
169 %The \hgxcmd{mq}{qinit} command prepares a repository to work with MQ. It
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
170 %creates a directory called \sdirname{.hg/patches}.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
171
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
172 \hgxcmd{mq}{qinit}$B%3%^%s%I$O(BMQ$B$G;HMQ$9$k%j%]%8%H%j$rMQ0U$9(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
173 $B$k!%(B\sdirname{.hg/patches}$B$H$$$&%G%#%l%/%H%j$,:n$i$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
174
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
175 %Options:
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
176 $B%*%W%7%g%s(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
177 \begin{itemize}
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
178 %\item[\hgxopt{mq}{qinit}{-c}] Create \sdirname{.hg/patches} as a repository
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
179 % in its own right. Also creates a \sfilename{.hgignore} file that
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
180 % will ignore the \sfilename{status} file.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
181 \item[\hgxopt{mq}{qinit}{-c}] \sdirname{.hg/patches}$B$r%j%]%8%H%j$H$7$F!$(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
182 $B%3%^%s%I<B9T;~$N8"8B$G:n@.$9$k!%F1;~$K(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
183 \sfilename{status}$B%U%!%$%k$rL5;k$9$k$?$a$K(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
184 \sfilename{.hgignore}$B%U%!%$%k$r:n@.$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
185 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
186
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
187 %When the \sdirname{.hg/patches} directory is a repository, the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
188 %\hgxcmd{mq}{qimport} and \hgxcmd{mq}{qnew} commands automatically \hgcmd{add}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
189 %new patches.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
190
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
191 \sdirname{.hg/patches}$B%G%#%l%/%H%j$,%j%]%8%H%j$N>l(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
192 $B9g!$(B\hgxcmd{mq}{qimport}$B%3%^%s%I$H(B\hgxcmd{mq}{qnew}$B%3%^%s%I$O?7$7$$%Q%C(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
193 $B%A$r<+F0E*$K(B\hgcmd{add}$B$9$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
194
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
195 %\subsection{\hgxcmd{mq}{qnew}---create a new patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
196 \subsection{\hgxcmd{mq}{qnew}---$B?7$7$$%Q%C%A$r:n@.$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
197
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
198 %The \hgxcmd{mq}{qnew} command creates a new patch. It takes one mandatory
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
199 %argument, the name to use for the patch file. The newly created patch
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
200 %is created empty by default. It is added to the \sfilename{series}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
201 %file after the current topmost applied patch, and is immediately
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
202 %pushed on top of that patch.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
203
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
204 \hgxcmd{mq}{qnew}$B%3%^%s%I$O?7$7$$%Q%C%A$r:n@.$9$k!%$3$N%3%^%s%I$OI,?\$N0z(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
205 $B?t$H$7$F%Q%C%A%U%!%$%k$H$7$F;HMQ$9$kL>A0$r<h$k!%?75,$K:n@.$5$l$?%Q%C%A(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
206 $B$O!$%G%U%)%k%H$G$O6u$G$"$j!$(B\sfilename{series}$B%U%!%$%k$K!$8=:_$N:F>e0L$N(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
207 $BE,MQ$5$l$?%Q%C%A$ND>8e$KDI2C$5$l!$D>$A$K$=$N%Q%C%A$N>e$K%W%C%7%e$5$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
208
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
209 %If \hgxcmd{mq}{qnew} finds modified files in the working directory, it will
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
210 %refuse to create a new patch unless the \hgxopt{mq}{qnew}{-f} option is
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
211 %used (see below). This behaviour allows you to \hgxcmd{mq}{qrefresh} your
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
212 %topmost applied patch before you apply a new patch on top of it.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
213
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
214 \hgxcmd{mq}{qnew}$B$O!$%o!<%-%s%0%G%#%l%/%H%j$+$iJQ99$5$l$?%U%!%$%k$r8+$D$1(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
215 $B$k$H!$(B\hgxopt{mq}{qnew}{-f}$B%*%W%7%g%s!J2<5-$r;2>H!K$,;H$o$l$J$$8B$j?7$7$$(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
216 $B%Q%C%A$N:n@.$r5qH]$9$k!%$3$N5sF0$N$?$a!$:F>e0L$NE,MQ$5$l$?%Q%C%A$N>e$K?7(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
217 $B$?$J%Q%C%A$rE,MQ$9$kA0$K!$(B\hgxcmd{mq}{qrefresh}$B$9$k$3$H$,$G$-$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
218
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
219 %Options:
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
220 $B%*%W%7%g%s(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
221 \begin{itemize}
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
222 %\item[\hgxopt{mq}{qnew}{-f}] Create a new patch if the contents of the
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
223 % working directory are modified. Any outstanding modifications are
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
224 % added to the newly created patch, so after this command completes,
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
225 % the working directory will no longer be modified.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
226 \item[\hgxopt{mq}{qnew}{-f}] $B%+%l%s%H%G%#%l%/%H%j$NFbMF$,99?7$5$l$F$$$k(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
227 $B>l9g!$?7$7$$%Q%C%A$r:n@.$9$k!%8IN)$7$?JQ2&(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
228 $B$O?75,$K:n@.$7$?%Q%C%A$KDI2C$5$l!$$3$N%3%^(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
229 $B%s%I$,=*N;$9$k$H%o!<%-%s%0%G%#%l%/%H%j$OJQ(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
230 $B99$J$7$N>uBV$K$J$k!%(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
231 %\item[\hgxopt{mq}{qnew}{-m}] Use the given text as the commit message.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
232 % This text will be stored at the beginning of the patch file, before
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
233 % the patch data.
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
234 \item[\hgxopt{mq}{qnew}{-m}] $BM?$($i$l$?%F%-%9%H$r%3%_%C%H%a%C%;!<%8$H$7(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
235 $B$FMQ$$$k!%$3$N%F%-%9%H$O%Q%C%A%U%!%$%k$N@h(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
236 $BF,$G%G!<%?$NA0$K5-O?$5$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
237 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
238
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
239 %\subsection{\hgxcmd{mq}{qnext}---print the name of the next patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
240 \subsection{\hgxcmd{mq}{qnext}---$B<!$N%Q%C%A$NL>A0$rI=<($9$k(B}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
241
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
242 %The \hgxcmd{mq}{qnext} command prints the name of the next patch in
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
243 %the \sfilename{series} file after the topmost applied patch. This
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
244 %patch will become the topmost applied patch if you run \hgxcmd{mq}{qpush}.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
245
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
246 \hgxcmd{mq}{qnext}$B%3%^%s%I$O(B\sfilename{series}$B%U%!%$%k$N<!$N%Q%C%A$NL>A0(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
247 $B$rI=<($9$k!%$3$N%Q%C%A$O!$(B\hgxcmd{mq}{qpush}$B$r<B9T$9$k$H:G>e0L$NE,MQ:Q$_(B
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
248 $B%Q%C%A$H$J$k(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
249
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
250 %\subsection{\hgxcmd{mq}{qpop}---pop patches off the stack}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
251 \subsection{\hgxcmd{mq}{qpop}---$B%9%?%C%/$+$i%Q%C%A$r%]%C%W$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
252
340
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
253 %The \hgxcmd{mq}{qpop} command removes applied patches from the top of the
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
254 %stack of applied patches. By default, it removes only one patch.
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
255
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
256 \hgxcmd{mq}{qpop}$B%3%^%s%I$OE,MQ$5$l$?%Q%C%A$N%9%?%C%/$N%H%C%W$+$i%Q%C%A(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
257 $B$r=|5n$9$k!%%G%U%)%k%H$G$O%Q%C%A$r(B1$B$D=|5n$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
258
340
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
259 %This command removes the changesets that represent the popped patches
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
260 %from the repository, and updates the working directory to undo the
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
261 %effects of the patches.
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
262
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
263 $B$3$N%3%^%s%I$O%j%]%8%H%j$+$i%]%C%W$5$l$?%Q%C%A$rI=$9%A%'%s%8%;%C%H$r=|5n(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
264 $B$7!$%o!<%-%s%0%G%#%l%/%H%j$r%Q%C%A$N8z2L$r=|5n$9$k$h$&$K99?7$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
265
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
266 %This command takes an optional argument, which it uses as the name or
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
267 %index of the patch to pop to. If given a name, it will pop patches
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
268 %until the named patch is the topmost applied patch. If given a
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
269 %number, \hgxcmd{mq}{qpop} treats the number as an index into the entries in
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
270 %the series file, counting from zero (empty lines and lines containing
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
271 %only comments do not count).It pops patches until the patch
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
272 %identified by the given index is the topmost applied patch.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
273
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
274 $B$3$N%3%^%s%I$O%]%C%W$9$k%Q%C%A$NL>A0$d%$%s%G%C%/%9$H$7$F;H$&$?$a$K!$%*%W(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
275 $B%7%g%s$N0z?t$r<h$k!%$3$N%3%^%s%I$O!$L>A0$,M?$($i$l$k$HL>A0$NIU$1$i$l$?%Q%C(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
276 $B%A$,:G>e0L$NE,MQ:Q$_%Q%C%A$H$J$k$^$G%Q%C%A$r%]%C%W$9$k!%HV9f$,M?$($i$l$?(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
277 $B>l9g!$(B\hgxcmd{mq}{qpop}$B$OHV9f$r0lO"$N%U%!%$%k$NCf$N%(%s%H%j$X$N%<%m$+$i?t(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
278 $B$(;O$a$k!J6u9T$H%3%a%s%H9T$O?t$($J$$!K%$%s%G%C%/%9$H$7$F<h$j07$&!%$3$N%3(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
279 $B%^%s%I$OM?$($?%$%s%G%C%/%9$N%Q%C%A$,:G>e0L$NE,MQ:Q$_%Q%C%A$H$J$k$^$G%Q%C(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
280 $B%A$r%]%C%W$7B3$1$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
281
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
282 %The \hgxcmd{mq}{qpop} command does not read or write patches or the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
283 %\sfilename{series} file. It is thus safe to \hgxcmd{mq}{qpop} a patch
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
284 %that you have removed from the \sfilename{series} file, or a patch that
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
285 %you have renamed or deleted entirely. In the latter two cases, use the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
286 %name of the patch as it was when you applied it.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
287
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
288 \hgxcmd{mq}{qpop}$B%3%^%s%I$O%Q%C%A$d(B\sfilename{$B%7%j!<%:(B}$B%U%!%$%k$rFI$_=q$-(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
289 $B$7$J$$!%$=$N$?$a$9$G$K(B\sfilename{series}$B%U%!%$%k$+$i:o=|$7$?%Q%C%A$d!$40(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
290 $BA4$K>C5n$7$?%Q%C%A$r(B\hgxcmd{mq}{qpop}$B$7$F$b0BA4$G$"$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
291 $B8e$+$i=R$Y$?(B2$B$D$N%1!<%9$G$O!$%Q%C%A$rE,MQ$7$?;~$NL>A0;HMQ$9$k!%(B
340
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
292
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
293 %By default, the \hgxcmd{mq}{qpop} command will not pop any patches if the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
294 %working directory has been modified. You can override this behaviour
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
295 %using the \hgxopt{mq}{qpop}{-f} option, which reverts all modifications in
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
296 %the working directory.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
297
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
298 $B%G%U%)%k%H$G$O(B\hgxcmd{mq}{qpop}$B%3%^%s%I$O!$%o!<%-%s%0%G%#%l%/%H%j$,JQ99(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
299 $B$5$l$F$$$k>l9g$O$$$+$J$k%Q%C%A$b%]%C%W$7$J$$!%$3$N5sF0$O(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
300 \hgxopt{mq}{qpop}{-f}$B%*%W%7%g%s$K$h$C$F%*!<%P%i%$%I2DG=$G!$$3$l$K$h$j!$(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
301 $B%o!<%-%s%0%G%#%l%/%H%j$N$9$Y$F$NJQ99$,<h$j>C$5$l$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
302
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
303
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
304 %Options:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
305 $B%*%W%7%g%s(B:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
306 \begin{itemize}
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
307 %\item[\hgxopt{mq}{qpop}{-a}] Pop all applied patches. This returns the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
308 % repository to its state before you applied any patches.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
309 \item[\hgxopt{mq}{qpop}{-a}] $BE,MQ$5$l$?$9$Y$F$N%Q%C%A$r%]%C%W$9$k!%$3$N(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
310 $B%3%^%s%I$O%Q%C%A$rE,MQ$9$kA0$N>uBV$X%j%]%8(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
311 $B%H%j$rLa$9!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
312 %\item[\hgxopt{mq}{qpop}{-f}] Forcibly revert any modifications to the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
313 % working directory when popping.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
314 \item[\hgxopt{mq}{qpop}{-f}] $B%]%C%W;~$K%o!<%-%s%0%G%#%l%/%H%j$X$N$"$i$f$k(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
315 $B99?7$r6/@)E*$KLa$9!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
316
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
317 %\item[\hgxopt{mq}{qpop}{-n}] Pop a patch from the named queue.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
318 \item[\hgxopt{mq}{qpop}{-n}] $BL>A0IU$1$5$l$?%-%e!<$+$i%Q%C%A$r(B1$B$D%]%C%W$9(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
319 $B$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
320 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
321
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
322 %The \hgxcmd{mq}{qpop} command removes one line from the end of the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
323 %\sfilename{status} file for each patch that it pops.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
324
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
325 \hgxcmd{mq}{qpop}$B%3%^%s%I$O(B\sfilename{status}$B%U%!%$%k$NKvHx$+$i!$%]%C%W(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
326 $B$5$l$?%Q%C%A$KBP1~$9$k9T$r(B1$B9T<h$j=|$/!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
327
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
328 %\subsection{\hgxcmd{mq}{qprev}---print the name of the previous patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
329 \subsection{\hgxcmd{mq}{qprev}---$B0JA0$N%Q%C%A$NL>A0$rI=<($9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
330
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
331 %The \hgxcmd{mq}{qprev} command prints the name of the patch in the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
332 %\sfilename{series} file that comes before the topmost applied patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
333 %This will become the topmost applied patch if you run \hgxcmd{mq}{qpop}.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
334
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
335 \hgxcmd{mq}{qprev}$B%3%^%s%I$O!$(B\sfilename{series}$B%U%!%$%kFb$K$"$k!$:G>e0L(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
336 $B$NE,MQ:Q$_%Q%C%A$NA0%Q%C%A$NL>A0$rI=<($9$k!%$3$N%Q%C%A$O(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
337 \hgxcmd{mq}{qpop}$B$r<B9T$9$k$H!$:G>e0L$N%Q%C%A$H$J$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
338
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
339 %\subsection{\hgxcmd{mq}{qpush}---push patches onto the stack}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
340 \subsection{\hgxcmd{mq}{qpush}---$B%Q%C%A$r%9%?%C%/$K%W%C%7%e$9$k(B}
224
34943a3d50d6 Start writing up extensions. Begin with inotify.
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
341 \label{sec:mqref:cmd:qpush}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
342
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
343 %The \hgxcmd{mq}{qpush} command adds patches onto the applied stack. By
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
344 %default, it adds only one patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
345
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
346 \hgxcmd{mq}{qpush}$B%3%^%s%I$O%Q%C%A$rE,MQ:Q$_%9%?%C%/$N>e$KDI2C$9$k!%%G%U%)(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
347 $B%k%H$G$O!$$3$N%3%^%s%I$O%Q%C%A$r0l$D$@$1DI2C$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
348
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
349 %This command creates a new changeset to represent each applied patch,
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
350 %and updates the working directory to apply the effects of the patches.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
351
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
352 $B$3$N%3%^%s%I$OE,MQ$5$l$?%Q%C%A$R$H$D$R$H$D$K$D$$$F?7$?$J%A%'%s%8%;%C%H$r(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
353 $B:n@.$7!$%o!<%-%s%0%G%#%l%/%H%j$K%Q%C%A$N1F6A$rE,MQ$9$k$h$&JQ99$r2C$($k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
354
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
355 %The default data used when creating a changeset are as follows:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
356 $B%A%'%s%8%;%C%H$r:n@.$9$k;~$KMQ$$$i$l$k%G%U%)%k%H%G!<%?$O<!$NDL$j$G$"$k(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
357 \begin{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
358 %\item The commit date and time zone are the current date and time
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
359 % zone. Because these data are used to compute the identity of a
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
360 % changeset, this means that if you \hgxcmd{mq}{qpop} a patch and
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
361 % \hgxcmd{mq}{qpush} it again, the changeset that you push will have a
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
362 % different identity than the changeset you popped.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
363 \item $B%3%_%C%H$NF|;~$H%?%$%`%>!<%s$K$O!$8=:_$NF|;~$H%?%$%`%>!<%s$,MQ$$$i(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
364 $B$l$k!%$3$l$i$N%G!<%?$O%A%'%s%8%;%C%H$N%"%$%G%s%F%#%F%#$r7W;;$9$k$N(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
365 $B$KMQ$$$i$l$k$?$a!$%Q%C%A$r(B\hgxcmd{mq}{qpop}$B$7$?8e!$:F$S(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
366 \hgxcmd{mq}{qpush}$B$9$k$H!$(Bpush$B$K$h$k%A%'%s%8%;%C%H$O(Bpop$B$7$?;~$H0[(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
367 $B$J$k%"%$%G%s%F%#%F%#$r;}$D!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
368 %\item The author is the same as the default used by the \hgcmd{commit}
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
369 % command.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
370 \item $B%*!<%5!<$O(B\hgcmd{commit}$B%3%^%s%IMQ$$$i$l$k%G%U%)%k%HCM$,MQ$$$i$l(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
371 $B$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
372 %\item The commit message is any text from the patch file that comes
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
373 % before the first diff header. If there is no such text, a default
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
374 % commit message is used that identifies the name of the patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
375 \item $B%3%_%C%H%a%C%;!<%8$O!$%Q%C%A%U%!%$%k$N:G=i$N(Bdiff$B%X%C%@$NA0$N$"$i$f(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
376 $B$k%F%-%9%H$G$"$k!%$=$N$h$&$J%F%-%9%H$,B8:_$7$J$$>l9g!$%Q%C%A$NL>A0(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
377 $B$r<1JL$9$k$N$K%G%U%)%k%H$N%3%_%C%H%a%C%;!<%8$,;H$o$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
378 \end{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
379 %If a patch contains a Mercurial patch header (XXX add link), the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
380 %information in the patch header overrides these defaults.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
381 $B%Q%C%A$,(BMercurial$B$N%Q%C%A%X%C%@(B(XXX add link)$B$r4^$`>l9g!$%Q%C%A%X%C%@$N(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
382 $B>pJs$,$3$l$i$N%G%U%)%k%HCM$r%*!<%P%i%$%I$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
383
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
384 %Options:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
385 $B%*%W%7%g%s(B:
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
386 \begin{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
387 %\item[\hgxopt{mq}{qpush}{-a}] Push all unapplied patches from the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
388 % \sfilename{series} file until there are none left to push.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
389 \item[\hgxopt{mq}{qpush}{-a}] \sfilename{series}$B%U%!%$%k$N$9$Y$F$NL$E,MQ(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
390 $B%Q%C%A$r$9$Y$F%W%C%7%e$9$k(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
391 %\item[\hgxopt{mq}{qpush}{-l}] Add the name of the patch to the end
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
392 % of the commit message.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
393 \item[\hgxopt{mq}{qpush}{-l}] $B%Q%C%A$NL>A0$r%3%_%C%H%a%C%;!<%8$N:G8e$KDI(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
394 $B2C$9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
395 %\item[\hgxopt{mq}{qpush}{-m}] If a patch fails to apply cleanly, use the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
396 % entry for the patch in another saved queue to compute the parameters
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
397 % for a three-way merge, and perform a three-way merge using the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
398 % normal Mercurial merge machinery. Use the resolution of the merge
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
399 % as the new patch content.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
400 \item[\hgxopt{mq}{qpush}{-m}] $B@5>o$K%Q%C%A$,E,MQ$G$-$J$+$C$?>l9g!$(B $B%Q%C%A(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
401 $B$r(B3$B%&%'%$%^!<%8$9$k$?$a$N%Q%i%a!<%?$r!$(B $B%-%e!<$K%;!<%V$5$l$?B>$N%(%s%H%j!<(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
402 $B$+$i7W;;$7!$DL>o$N(BMercurial$B$N%^!<%85!9=$r(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
403 $BMQ$$$F(B3$B%&%'%$%^!<%8$r9T$&!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
404 %\item[\hgxopt{mq}{qpush}{-n}] Use the named queue if merging while pushing.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
405 \item[\hgxopt{mq}{qpush}{-n}] $B%W%C%7%eCf$N%^!<%8$KL>A0$D$-%-%e!<$rMQ$$$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
406 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
407
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
408 %The \hgxcmd{mq}{qpush} command reads, but does not modify, the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
409 %\sfilename{series} file. It appends one line to the \hgcmd{status}
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
410 %file for each patch that it pushes.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
411 \hgxcmd{mq}{qpush}$B%3%^%s%I$O(B\sfilename{series}$B%U%!%$%k$rFI$`$,JQ99$O9T$o(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
412 $B$J$$!%$3$N%3%^%s%I$O%W%C%7%e$9$k3F!9$N%Q%C%A$rI=$99T$r(B\hgcmd{status}$B%U%!(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
413 $B%$%k$KDI2C$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
414
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
415 %\subsection{\hgxcmd{mq}{qrefresh}---update the topmost applied patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
416 \subsection{\hgxcmd{mq}{qrefresh}---$B:F>e0L$NE,MQ:Q$_%Q%C%A$r99?7$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
417
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
418 %The \hgxcmd{mq}{qrefresh} command updates the topmost applied patch. It
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
419 %modifies the patch, removes the old changeset that represented the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
420 %patch, and creates a new changeset to represent the modified patch.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
421
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
422 \hgxcmd{mq}{qrefresh}$B%3%^%s%I$O:G>e0L$NE,MQ:Q$_%Q%C%A$r99?7$9$k!%$3$N%3%^(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
423 $B%s%I$O%Q%C%A$rJQ99$7!$%Q%C%A$rI=$98E$$%A%'%s%8%;%C%H$r=|5n$7!$JQ99$5$l$?(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
424 $B%Q%C%A$rI=$9?7$?$J%A%'%s%8%;%C%H$r@8@.$9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
425
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
426 %The \hgxcmd{mq}{qrefresh} command looks for the following
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
427 %modifications:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
428 \hgxcmd{mq}{qrefresh}$B%3%^%s%I$O!$0J2<$N$h$&$JJQ99$rC5$9!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
429 \begin{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
430 %\item Changes to the commit message, i.e.~the text before the first
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
431 % diff header in the patch file, are reflected in the new changeset
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
432 % that represents the patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
433 \item $B%3%_%C%H%a%C%;!<%8$X$NJQ99!%Nc$($P(B~$B%Q%C%A%U%!%$%k$NCf$N:G=i$N(Bdiff$B%X%C(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
434 $B%@$NA0$N%F%-%9%H$O!$%Q%C%A$rI=$9?7$7$$%A%'%s%8%;%C%H$KH?1G$5$l$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
435 %\item Modifications to tracked files in the working directory are
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
436 % added to the patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
437 \item $B%o!<%-%s%0%G%#%l%/%H%j$NCf$N4IM}$5$l$F$$$k%U%!%$%k$X$NJQ99$O%Q%C%A(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
438 $B$XDI2C$5$l$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
439 %\item Changes to the files tracked using \hgcmd{add}, \hgcmd{copy},
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
440 % \hgcmd{remove}, or \hgcmd{rename}. Added files and copy and rename
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
441 % destinations are added to the patch, while removed files and rename
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
442 % sources are removed.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
443 \item $B%3%^%s%I(B\hgcmd{add}, \hgcmd{copy}, \hgcmd{remove}, \hgcmd{rename}$B$G(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
444 $B4IM}$5$l$F$$$k%U%!%$%k$X$NJQ99!%DI2C$5$l$?%U%!%$%k!$%3%T!<!&%j%M!<(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
445 $B%`@h$NL>A0$O%Q%C%A$KDI2C$5$l!$:o=|$5$l$?%U%!%$%k$H%j%M!<%`85$NL>A0(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
446 $B$O%Q%C%A$+$i:o=|$5$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
447 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
448
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
449 %Even if \hgxcmd{mq}{qrefresh} detects no changes, it still recreates the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
450 %changeset that represents the patch. This causes the identity of the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
451 %changeset to differ from the previous changeset that identified the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
452 %patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
453 \hgxcmd{mq}{qrefresh}$B$O!$JQ99$r8!CN$7$J$+$C$?$H$7$F$b!$%Q%C%A$rI=$9?7$?$J(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
454 $B%A%'%s%8%;%C%H$r:F@8@.$9$k!%$3$l$K$h$j!$%A%'%s%8%;%C%H$N%"%$%G%s%F%#%F%#(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
455 $B$O!$%Q%C%A$rI=$7$F$$$?0JA0$N%A%'%s%8%;%C%H$N$b$N$H$OJL$N$b$N$K$J$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
456
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
457 %Options:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
458 $B%*%W%7%g%s!'(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
459 \begin{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
460 %\item[\hgxopt{mq}{qrefresh}{-e}] Modify the commit and patch description,
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
461 % using the preferred text editor.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
462 \item[\hgxopt{mq}{qrefresh}{-e}] $B%3%_%C%H$H%Q%C%A$N@bL@$r9%$_$N%(%G%#%?(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
463 $B$GJQ99$9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
464 %\item[\hgxopt{mq}{qrefresh}{-m}] Modify the commit message and patch
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
465 % description, using the given text.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
466 \item[\hgxopt{mq}{qrefresh}{-m}] $B%3%_%C%H%a%C%;!<%8$H%Q%C%A$N@bL@$r!$M?(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
467 $B$($i$l$?%F%-%9%H$G9T$&!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
468 %\item[\hgxopt{mq}{qrefresh}{-l}] Modify the commit message and patch
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
469 % description, using text from the given file.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
470 \item[\hgxopt{mq}{qrefresh}{-l}] $B%3%_%C%H%a%C%;!<%8$H%Q%C%A$N@bL@$rM?$((B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
471 $B$i$l$?%U%!%$%k$K$h$C$F9T$&!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
472 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
473
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
474 %\subsection{\hgxcmd{mq}{qrename}---rename a patch}
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
475 \subsection{\hgxcmd{mq}{qrename}---$B%Q%C%A$N%j%M!<%`(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
476
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
477 %The \hgxcmd{mq}{qrename} command renames a patch, and changes the entry for
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
478 %the patch in the \sfilename{series} file.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
479 \hgxcmd{mq}{qrename}$B%3%^%s%I$O%Q%C%A$r%j%M!<%`$7!$(B\sfilename{series}$B%U%!(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
480 $B%$%kCf$N$3$N%Q%C%A$N%(%s%H%j$rJQ99$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
481
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
482 %With a single argument, \hgxcmd{mq}{qrename} renames the topmost applied
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
483 %patch. With two arguments, it renames its first argument to its
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
484 %second.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
485 $B0z?t(B1$B$D$rM?$($?>l9g!$(B\hgxcmd{mq}{qrename}$B$O:G>e0L$NE,MQ:Q$_%Q%C%A$r%j%M!<(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
486 $B%`$9$k!%0z?t(B2$B$D$N>l9g!$(B1$BHVL\$N0z?t$N%Q%C%A$r(B2$BHVL\$N0z?t$NL>A0$K%j%M!<%`(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
487 $B$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
488
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
489 %\subsection{\hgxcmd{mq}{qrestore}---restore saved queue state}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
490 \subsection{\hgxcmd{mq}{qrestore}---$B%;!<%V$5$l$?%-%e!<>uBV$KI|85$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
491
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
492 %XXX No idea what this does.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
493 XXX $B$3$N%3%^%s%I$,2?$r$9$k$+ITL@(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
494
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
495 %\subsection{\hgxcmd{mq}{qsave}---save current queue state}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
496 \subsection{\hgxcmd{mq}{qsave}---$B8=:_$N%-%e!<>uBV$r%;!<%V$9$k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
497
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
498 %XXX Likewise.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
499 XXX $BF1>e(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
500
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
501 %\subsection{\hgxcmd{mq}{qseries}---print the entire patch series}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
502 \subsection{\hgxcmd{mq}{qseries}---$B%Q%C%A7ONs$rA4$FI=<((B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
503
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
504 %The \hgxcmd{mq}{qseries} command prints the entire patch series from the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
505 %\sfilename{series} file. It prints only patch names, not empty lines
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
506 %or comments. It prints in order from first to be applied to last.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
507
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
508 \hgxcmd{mq}{qseries}$B%3%^%s%I$O!$(B\sfilename{series}$B%U%!%$%k$K4^$^$l$k%Q%C(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
509 $B%A7ONsA4$F$rI=<($9$k!%$3$N%3%^%s%I$O%Q%C%AL>$@$1$rI=<($7!$6u9T$d%3%a%s%H(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
510 $B$OI=<($7$J$$!%:G=i$KE,MQ$5$l$?%Q%C%A$+$i:G8e$KE,MQ$5$l$?%Q%C%A$N=g$KI=<((B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
511 $B$9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
512
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
513 %\subsection{\hgxcmd{mq}{qtop}---print the name of the current patch}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
514 \subsection{\hgxcmd{mq}{qtop}---$B8=:_$N%Q%C%A$NL>A0$rI=<((B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
515
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
516 %The \hgxcmd{mq}{qtop} prints the name of the topmost currently applied
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
517 %patch.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
518 \hgxcmd{mq}{qtop}$B%3%^%s%I$O8=:_$N:G>e0L$NE,MQ:Q$_%Q%C%A$NL>A0$rI=<($9$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
519
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
520 %\subsection{\hgxcmd{mq}{qunapplied}---print patches not yet applied}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
521 \subsection{\hgxcmd{mq}{qunapplied}---$BL$E,MQ$N%Q%C%A$rI=<((B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
522
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
523 %The \hgxcmd{mq}{qunapplied} command prints the names of patches from the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
524 %\sfilename{series} file that are not yet applied. It prints them in
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
525 %order from the next patch that will be pushed to the last.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
526
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
527 \hgxcmd{mq}{qunapplied}$B%3%^%s%I$O(B\sfilename{series}$B%U%!%$%k$K4^$^$l$k$9$Y(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
528 $B$F$NL$E,MQ$N%Q%C%A$NL>A0$rI=<($9$k!%$3$N%3%^%s%I$O<!$KKvHx$K%W%C%7%e$5$l(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
529 $B$k%Q%C%A$+$i=g$KI=<($9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
530
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
531
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
532 %\subsection{\hgcmd{strip}---remove a revision and descendants}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
533 \subsection{\hgcmd{strip}---$B%j%S%8%g%s$H$=$N;RB9$r:o=|(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
534
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
535 %The \hgcmd{strip} command removes a revision, and all of its
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
536 %descendants, from the repository. It undoes the effects of the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
537 %removed revisions from the repository, and updates the working
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
538 %directory to the first parent of the removed revision.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
539
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
540 \hgcmd{strip}$B%3%^%s%I$O%j%]%8%H%j$+$i(B1$B$D$N%j%S%8%g%s$H$=$N;RB9$r:o=|$9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
541 $B$3$N%3%^%s%I$O:o=|$5$l$?%j%S%8%g%s$N1F6A$r%j%]%8%H%j$+$i<h$j=|$-!$%o!<%-(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
542 $B%s%0%G%#%l%/%H%j$r:o=|$5$l$?%j%S%8%g%s$N?F$N>uBV$K99?7$9$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
543
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
544 %The \hgcmd{strip} command saves a backup of the removed changesets in
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
545 %a bundle, so that they can be reapplied if removed in error.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
546 \hgcmd{strip}$B%3%^%s%I$O!$:o=|$5$l$?%A%'%s%8%;%C%H$N%P%C%/%"%C%W0l<0$rJ](B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
547 $BB8$9$k$N$G!$8m$C$F:o=|$7$?>l9g$J$I$K$O:FE,MQ$9$k$3$H$,$G$-$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
548
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
549 %Options:
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
550 $B%*%W%7%g%s!'(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
551 \begin{itemize}
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
552 %\item[\hgopt{strip}{-b}] Save unrelated changesets that are intermixed
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
553 % with the stripped changesets in the backup bundle.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
554 \item[\hgopt{strip}{-b}] $B=|5n$7$?%A%'%s%8%;%C%H$H:.8r$7$?L54X78$N%A%'%s%8(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
555 $B%;%C%H$r%P%C%/%"%C%W%P%s%I%k$KJ]B8$9$k(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
556 %\item[\hgopt{strip}{-f}] If a branch has multiple heads, remove all
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
557 % heads. XXX This should be renamed, and use \texttt{-f} to strip revs
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
558 % when there are pending changes.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
559 \item[\hgopt{strip}{-f}] $B%V%i%s%A$,J#?t$N%X%C%I$r;}$C$F$$$k>l9g!$$9$Y$F$N(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
560 $B%X%C%I$r>C5n$9$k!%(BXXX $B$3$N%*%W%7%g%s$O%j%M!<%`$5(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
561 $B$l$k$Y$-$G!$(B\texttt{-f}$B$O%Z%s%G%#%s%0>uBV$NJQ99(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
562 $B$,$"$k>l9g$K%j%S%8%g%s$r=|5n$9$k$N$KMQ$$$i$l$k$Y(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
563 $B$-$G$"$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
564 %\item[\hgopt{strip}{-n}] Do not save a backup bundle.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
565 \item[\hgopt{strip}{-n}] $B%P%C%/%"%C%W%P%s%I%k$rJ]B8$7$J$$!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
566 \end{itemize}
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
567
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
568 %\section{MQ file reference}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
569 \section{MQ $B%U%!%$%k%j%U%!%l%s%9(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
570
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
571 %\subsection{The \sfilename{series} file}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
572 \subsection{\sfilename{series}$B%U%!%$%k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
573
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
574 %The \sfilename{series} file contains a list of the names of all
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
575 %patches that MQ can apply. It is represented as a list of names, with
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
576 %one name saved per line. Leading and trailing white space in each
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
577 %line are ignored.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
578
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
579 \sfilename{series}$B%U%!%$%k$O(BMQ$B$,E,MQ$G$-$k$9$Y$F$N%Q%C%A$NL>A0$rJ];}$7$F(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
580 $B$$$k!%$3$l$OL>A0$N%j%9%H$H$7$FI=8=$5$l$F$*$j!$(B1$B9T$K(B1$B$D$:$D%Q%C%AL>$r4^(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
581 $B$`!%A08e$N6uGr$OL5;k$5$l$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
582
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
583 %Lines may contain comments. A comment begins with the ``\texttt{\#}''
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
584 %character, and extends to the end of the line. Empty lines, and lines
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
585 %that contain only comments, are ignored.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
586
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
587 $B9T$K$O%3%a%s%H$r4^$a$F$bNI$$!%%3%a%s%H$O(B``\texttt{\#}''$BJ8;z$G;O$^$j!$9T(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
588 $BKv$^$GB3$/!%6u9T$H%3%a%s%H$N$_$N9T$OL5;k$5$l$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
589
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
590 %You will often need to edit the \sfilename{series} file by hand, hence
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
591 %the support for comments and empty lines noted above. For example,
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
592 %you can comment out a patch temporarily, and \hgxcmd{mq}{qpush} will skip
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
593 %over that patch when applying patches. You can also change the order
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
594 %in which patches are applied by reordering their entries in the
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
595 %\sfilename{series} file.
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
596
341
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
597 $B%3%a%s%H$H6u9T$N$?$a$K(B\sfilename{series}$B$r<j$GJT=8$9$kI,MW$,@8$8$k$3$H$,(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
598 $B$"$k!%Nc$($P!$$"$k%Q%C%A$r0l;~E*$K%3%a%s%H%"%&%H$7$F!$(B\hgxcmd{mq}{qpush}
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
599 $B$,%Q%C%AE,MQ;~$K$=$N%Q%C%A$r%9%-%C%W$9$k$h$&$K$9$k$J$I$,9M$($i$l$k!%$^(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
600 $B$?!$%Q%C%A$NE,MQ$5$l$k=gHV$r(B\sfilename{series}$B$rJT=8$9$k$3$H$K$h$C$FJQ99(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
601 $B$9$k$3$H$b$G$-$k!%(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
602
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
603 %Placing the \sfilename{series} file under revision control is also
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
604 %supported; it is a good idea to place all of the patches that it
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
605 %refers to under revision control, as well. If you create a patch
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
606 %directory using the \hgxopt{mq}{qinit}{-c} option to \hgxcmd{mq}{qinit}, this
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
607 %will be done for you automatically.
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
608
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
609 \sfilename{series}$B%U%!%$%k$r%j%S%8%g%s%3%s%H%m!<%k$N2<$KCV$/$3$H$b%5%]!<(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
610 $B%H$5$l$F$$$k!%$3$N%U%!%$%k$,;2>H$9$k$9$Y$F$N%Q%C%A$r%j%S%8%g%s%3%s%H%m!<(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
611 $B%k2<$K$*$/$3$H$ONI$$9M$($G$"$k!%(B\hgxcmd{mq}{qinit}$B%3%^%s%I$K(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
612 \hgxopt{mq}{qinit}{-c}$B%*%W%7%g%s$rEO$7$F;H$$!$D>@\%Q%C%A$r@8@.$7$?>l9g(B
701429159ba8 finished mq-ref.tex
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 340
diff changeset
613 $B$O!$<+F0E*$K$3$N$h$&$J>uBV$K$J$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
614
339
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
615 %\subsection{The \sfilename{status} file}
12dde4918d24 more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 319
diff changeset
616 \subsection{\sfilename{status}$B%U%!%$%k(B}
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
617
340
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
618 %The \sfilename{status} file contains the names and changeset hashes of
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
619 %all patches that MQ currently has applied. Unlike the
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
620 %\sfilename{series} file, this file is not intended for editing. You
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
621 %should not place this file under revision control, or modify it in any
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
622 %way. It is used by MQ strictly for internal book-keeping.
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
623
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
624 \sfilename{status}$B%U%!%$%k$O(BMQ$B$,8=:_E,MQ$7$F$$$k$9$Y$F$N%Q%C%A$NL>A0$H%A%'(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
625 $B%s%8%;%C%H%O%C%7%e$r;}$D!%(B\sfilename{series}$B%U%!%$%k$H0c$C$F!$$3$N%U%!%$(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
626 $B%k$OJT=8$5$l$k$3$H$r0U?^$7$F$$$J$$!%$3$N%U%!%$%k$O%j%S%8%g%s4IM}$7$?$j!$(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
627 $BJT=8$7$?$j$9$Y$-$G$O$J$$!%$3$l$O(BMQ$B$K$h$C$FFbIt$N4IM}$KMQ$$$i$l$k$Y$-$b$N(B
48ebf2d7dafe more mq-ref.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 339
diff changeset
628 $B$G$"$k!%(B
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
629
348
32d33b238b7e made changes to the source files to be compiled at any rate.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 341
diff changeset
630 %%% Local Variables:
293
3b1291f24c0d - replaved latex-mode to yatex-mode
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 290
diff changeset
631 %%% mode: yatex
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
632 %%% TeX-master: "00book"
348
32d33b238b7e made changes to the source files to be compiled at any rate.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents: 341
diff changeset
633 %%% End: