annotate ja/mq.tex @ 333:db3aa48f2f73

more mq.tex
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Sun, 30 Mar 2008 17:46:24 +0900
parents 9ad5d69c4a37
children 2a8c05da3fae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1 %\chapter{Managing change with Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
2 \chapter{Mercurial Queues$B$GJQ99$r4IM}$9$k(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 \label{chap:mq}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
5 %\section{The patch management problem}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
6 \section{$B%Q%C%A4IM}$NLdBj(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 \label{sec:mq:patch-mgmt}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
9 %Here is a common scenario: you need to install a software package from
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
10 %source, but you find a bug that you must fix in the source before you
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
11 %can start using the package. You make your changes, forget about the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
12 %package for a while, and a few months later you need to upgrade to a
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
13 %newer version of the package. If the newer version of the package
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
14 %still has the bug, you must extract your fix from the older source
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
15 %tree and apply it against the newer version. This is a tedious task,
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
16 %and it's easy to make mistakes.
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
17
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
18 $B$h$/$"$k%7%J%j%*!'%=!<%9$+$i%=%U%H%&%'%"%Q%C%1!<%8$r%$%s%9%H!<%k$9$kI,MW(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
19 $B$,$"$k!%$7$+$7%Q%C%1!<%8$r;H$&A0$K%=!<%9$+$iD>$9$Y$-%P%0$r8+$D$1$?!%JQ99(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
20 $B$r2C$($F!$;C$/%Q%C%1!<%8$N$3$H$OK:$l$F$$$k!%?t%v7n8e!$?7$7$$%P!<%8%g%s$r(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
21 $B%$%s%9%H!<%k$9$k$3$H$K$J$C$?!%$b$7?7$7$$%P!<%8%g%s$,!$0MA3$H$7$F$=$N%P%0(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
22 $B$r;}$C$F$$$?>l9g!$=$@5$r8E$$%=!<%9$+$iCj=P$7$F!$?7$7$$%P!<%8%g%s$KE,MQ$7(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
23 $B$J$1$l$P$J$i$J$$!%$3$l$OB`6~$G$7$+$b4V0c$$$d$9$$;E;v$@!%(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
24
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
25 %This is a simple case of the ``patch management'' problem. You have
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
26 %an ``upstream'' source tree that you can't change; you need to make
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
27 %some local changes on top of the upstream tree; and you'd like to be
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
28 %able to keep those changes separate, so that you can apply them to
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
29 %newer versions of the upstream source.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
30
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
31 $B$3$l$,%Q%C%A4IM}LdBj$N%7%s%W%k$JNc$G$"$k!%$b$7$"$J$?$,JQ99$G$-$J$$>eN.$N(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
32 $B%=!<%9%D%j!<$,$"$l$P!$%"%C%W%9%H%j!<%`$N%D%j!<$N>e$G%m!<%+%k$JJQ99$r$7$J(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
33 $B$1$l$P$J$i$J$$!%$"$J$?$O%"%C%W%9%H%j!<%`%=!<%9$KE,MQ$G$-$k$h$&$K$-$C$H$3(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
34 $B$NJQ99$rJ,N%$7$F$*$-$?$$$H;W$&$O$:$@!%(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
35
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
36 %The patch management problem arises in many situations. Probably the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
37 %most visible is that a user of an open source software project will
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
38 %contribute a bug fix or new feature to the project's maintainers in the
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
39 %form of a patch.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
40
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
41 $B%Q%C%A4IM}LdBj$O$$$m$$$m$J>u67$G5/$3$k!%$*$=$i$/:G$bL@$i$+$J$N$O!$%*!<%W(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
42 $B%s%=!<%9%=%U%H%&%'%"%W%m%8%'%/%H$N%f!<%6$,!$%W%m%8%'%/%H$N%a%s%F%J$K%P%0(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
43 $B%U%#%C%/%9$d?75!G=$r%Q%C%A$N7A$G9W8%$9$k$3$H$G$"$m$&!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
44
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
45 %Distributors of operating systems that include open source software
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
46 %often need to make changes to the packages they distribute so that
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
47 %they will build properly in their environments.
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
48
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
49 $B%*!<%W%s%=%U%H%&%'%"$r4^$`%*%Z%l!<%F%#%s%0%7%9%F%`$NG[I[<T$O!$G[I[$9$k%Q%C(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
50 $B%1!<%8$,H`$i$N4D6-$G@5$7$/%S%k%I$G$-$k$h$&$K%Q%C%1!<%8$XJQ99$r2C$($k$3$H(B
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
51 $B$,B?$$!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
52
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
53 %When you have few changes to maintain, it is easy to manage a single
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
54 %patch using the standard \command{diff} and \command{patch} programs
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
55 %(see section~\ref{sec:mq:patch} for a discussion of these tools). Once
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
56 %the number of changes grows, it starts to make sense to maintain patches
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
57 %as discrete ``chunks of work,'' so that for example a single patch will
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
58 %contain only one bug fix (the patch might modify several files, but it's
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
59 %doing ``only one thing''), and you may have a number of such patches for
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
60 %different bugs you need fixed and local changes you require. In this
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
61 %situation, if you submit a bug fix patch to the upstream maintainers of
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
62 %a package and they include your fix in a subsequent release, you can
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
63 %simply drop that single patch when you're updating to the newer release.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
64
328
8bdd9bc948d4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 327
diff changeset
65 $B$b$7%a%s%F%J%s%9$7$F$$$kJQ99$,$4$/$o$:$+$J$i!$I8=`$N(B\command{diff}$B%3%^%s(B
8bdd9bc948d4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 327
diff changeset
66 $B%I$H(B\command{patch}$B%3%^%s%I$r;H$C$FC10l$N%Q%C%A$r4IM}$9$k$N$,4JC1$@!%!J$3(B
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
67 $B$l$i$N%D!<%k$K$D$$$F$O(B~\ref{sec:mq:patch}$B$N@a$r;2>H!%!KJQ99$N?t$,A}$($F$/(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
68 $B$k$H!$C10l$N%P%0%U%#%C%/%9$r4^$`8D!9$N%Q%C%A$r0l2t$N=89g$H$7$F4IM}$9$k$3(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
69 $B$H$,8=<BL#$rBS$S$F$/$k!%!J3F!9$N%Q%C%A$OJ#?t$N%U%!%$%k$rJQ99$9$k$+$b$7$l(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
70 $B$J$$$,!$L\E*$O(B1$B$D$-$j$G$"$k!%!K=$@5$7$?$$%P%0$,$$$/$D$b$"$C$?$j!$%m!<%+%k(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
71 $B$G$NMM!9$JJQ99$NI,MW$N$?$a!$?tB?$/$N$=$N$h$&$J%Q%C%A$r;}$D$3$H$K$J$k$+$b(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
72 $B$7$l$J$$!%$3$N>u67$G!$%"%C%W%9%H%j!<%`$N%a%s%F%J$K%P%0=$@5%Q%C%A$rAw$j!$(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
73 $BH`$i$,$"$J$?$N=$@5$r8e$N%j%j!<%9$K<h$j9~$a$P!$<j85$G?7$7$$%j%j!<%9$K@ZBX(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
74 $B$($?;~$K$OC1=c$K$=$N%Q%C%A$rGK4~$9$l$PNI$$!%(B
326
e03366f4d1e5 more mq.tex. in the mid of a paragraph, but I'm feeling tired.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 325
diff changeset
75
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
76 %Maintaining a single patch against an upstream tree is a little
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
77 %tedious and error-prone, but not difficult. However, the complexity
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
78 %of the problem grows rapidly as the number of patches you have to
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
79 %maintain increases.With more than a tiny number of patches in hand,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
80 %understanding which ones you have applied and maintaining them moves
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
81 %from messy to overwhelming.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
82
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
83 $BC10l$N%Q%C%A$r%"%C%W%9%H%j!<%`$N%D%j!<$KBP$7$F%a%s%F%J%s%9$9$k$3$H$O$d$d(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
84 $BLLE]$G!$4V0c$$$N85$K$J$j$,$A$G$"$k$,!$Fq$7$/$O$J$$!%$7$+$7!$%a%s%F%J%s%9(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
85 $B$9$k%Q%C%A$N?t$,A}$($k$K=>$C$FLdBj$NJ#;($5$,5^B.$KA}$7$F$$$/!%%Q%C%A$N?t(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
86 $B$,$"$kDxEY0J>eB?$/$J$k$H!$$I$N%Q%C%A$rE,MQ$7$?$+!$$I$N%Q%C%A$r4IM}$7$F$$(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
87 $B$k$N$+$NM}2r$,!$Lq2p$H$$$&>uBV$+$i05E]$5$l$k$F$$$k>uBV$K$J$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
88
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
89 %Fortunately, Mercurial includes a powerful extension, Mercurial Queues
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
90 %(or simply ``MQ''), that massively simplifies the patch management
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
91 %problem.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
92
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
93 $B9,$$$K$b!$(BMercurial$B$O(BMercurial Queues$B!J$"$k$$$OC1$K(BMQ$B!K$H$$$&6/NO$J%(%/%9(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
94 $B%F%s%7%g%s$r$b$C$F$*$j!$%Q%C%A4IM}$NLdBj$rBgI}$KC1=c2=$9$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
95
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
96
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
97 %\section{The prehistory of Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
98 \section{Mercurial Queues$BA0;K(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
99 \label{sec:mq:history}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
100
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
101 %During the late 1990s, several Linux kernel developers started to
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
102 %maintain ``patch series'' that modified the behaviour of the Linux
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
103 %kernel. Some of these series were focused on stability, some on
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
104 %feature coverage, and others were more speculative.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
105
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
106 1990$BG/Be$N=*$o$j:"!$(BLinux$B%+!<%M%k$N3+H/<TC#$O!$(BLinux$B%+!<%M%k$r2~A1$9$k0l(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
107 $BO"$N%Q%C%A$N4IM}$r;O$a$?!%$=$l$i$N$&$A!$$"$k$b$N$O0BDj@-$K!$JL$N$b$N$OFC(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
108 $BDj$N5!G=$K!$$^$?JL$N$b$N$OLn?4E*$JFbMF$KFC2=$7$F$$$?!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
109
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
110 %The sizes of these patch series grew rapidly. In 2002, Andrew Morton
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
111 %published some shell scripts he had been using to automate the task of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
112 %managing his patch queues. Andrew was successfully using these
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
113 %scripts to manage hundreds (sometimes thousands) of patches on top of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
114 %the Linux kernel.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
115
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
116 $B$3$l$i$N%Q%C%A%7%j!<%:$N%5%$%:$O$O$9$0$KKD$l>e$,$C$?!%(B2002$BG/$K(BAndrew
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
117 Morton$B$OH`$N%Q%C%A%-%e!<$N4IM}$r<+F02=$9$k$$$/$D$+$N%7%'%k%9%/%j%W%H$r8x(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
118 $BI=$7$?!%(BAndrew$B$O?tI4$+$i?t@i$N(BLinux$B%+!<%M%k%Q%C%A$r$3$l$i$N%9%/%j%W%H$G(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
119 $B4IM}$9$k$3$H$,$G$-$F$$$?!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
120
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
121 %\subsection{A patchwork quilt}
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
122 \subsection{patchwork quilt}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
123 \label{sec:mq:quilt}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
124
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
125 %In early 2003, Andreas Gruenbacher and Martin Quinson borrowed the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
126 %approach of Andrew's scripts and published a tool called ``patchwork
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
127 %quilt''~\cite{web:quilt}, or simply ``quilt''
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
128 %(see~\cite{gruenbacher:2005} for a paper describing it). Because
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
129 %quilt substantially automated patch management, it rapidly gained a
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
130 %large following among open source software developers.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
131
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
132 2003$BG/$N;O$a!$(BAndreas Gruenbacher$B$H(BMartin Quinson$B$O(BAndrew$B$N%9%/%j%W%H$N$d(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
133 $B$jJ}$r??;w$F!$(B``patchwork quilt''~\cite{web:quilt}$B$"$k$$$OC1$K(B``quilt''$B$H(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
134 $B8F$P$l$k%D!<%k$r%j%j!<%9$7$?!%!J>\$7$/$OO@J8(B~\cite{gruenbacher:2005}$B$r;2(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
135 $B>H$N$3$H!%!K(Bquilt$B$O==J,$K<+F02=$5$l$?%Q%C%A4IM}$rDs6!$7$F$$$?$N$G!$%=%U%H(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
136 $B%&%'%"3+H/<T$NBg$-$J;Y;}$r5^B.$K3MF@$7$F$$$C$?!%(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
137
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
138 %Quilt manages a \emph{stack of patches} on top of a directory tree.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
139 %To begin, you tell quilt to manage a directory tree, and tell it which
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
140 %files you want to manage; it stores away the names and contents of
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
141 %those files. To fix a bug, you create a new patch (using a single
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
142 %command), edit the files you need to fix, then ``refresh'' the patch.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
143
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
144 quilt$B$O%G%#%l%/%H%j%D%j!<>e$G(B\emph{$B%Q%C%A$N%9%?%C%/(B}$B$r4IM}$9$k!%%Q%C%A$N(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
145 $B4IM}$r;O$a$k$K$O!$(Bquilt$B$K4IM}$9$Y$-%G%#%l%/%H%j%D%j!<$H!$4IM}BP>]$N%U%!%$(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
146 $B%k$r;XDj$9$k!%(Bquilt$B$O$3$l$i$N%U%!%$%k$NL>A0$HCf?H$rJ]B8$9$k!%%P%0$r=$@5(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
147 $B$9$k>l9g$O!$$^$:?7$7$$%Q%C%A$r!J%3%^%s%I(B1$B$D$G!K:n@.$7!$I,MW$J%U%!%$%k$K(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
148 $B=$@5$r2C$($?8e!$%Q%C%A$r(B``$B%j%U%l%C%7%e(B''$B$9$l$P$h$$!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
149
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
150 %The refresh step causes quilt to scan the directory tree; it updates
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
151 %the patch with all of the changes you have made. You can create
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
152 %another patch on top of the first, which will track the changes
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
153 %required to modify the tree from ``tree with one patch applied'' to
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
154 %``tree with two patches applied''.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
155
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
156 $B%j%U%l%C%7%e$G$O!$(Bquilt$B$O%G%#%l%/%H%j%D%j!<$r%9%-%c%s$7!$JQ99A4$F$rH?1G$5(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
157 $B$;$F%Q%C%A$r99?7$9$k!%(B``$B$"$k%Q%C%A$,E,MQ$5$l$?>uBV$N%D%j!<(B''$B$+$i(B``2$B$D$N%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
158 $B%A$,E,MQ$5$l$?%D%j!<(B''$B$X99?7$9$k$N$KI,MW$JJQ99$rDI@W$7!$JL$N%Q%C%A$r:n$k(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
159 $B$3$H$b$G$-$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
160
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
161 %You can \emph{change} which patches are applied to the tree. If you
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
162 %``pop'' a patch, the changes made by that patch will vanish from the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
163 %directory tree. Quilt remembers which patches you have popped,
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
164 %though, so you can ``push'' a popped patch again, and the directory
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
165 %tree will be restored to contain the modifications in the patch.Most
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
166 %importantly, you can run the ``refresh'' command at any time, and the
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
167 %topmost applied patch will be updated. This means that you can, at
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
168 %any time, change both which patches are applied and what
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
169 %modifications those patches make.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
170
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
171 $B%f!<%6$O$I$N%Q%C%A$,%D%j!<$KE,MQ$5$l$k$+$r(B\emph{$BJQ99(B}$B$G$-$k!%$"$k%Q%C%A$r(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
172 $B%]%C%W$9$k$H!$$3$N%Q%C%A$K$h$kJQ99$O%D%j!<$+$i>CLG$9$k!%(Bquilt$B$O$I$N%Q%C%A(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
173 $B$r%]%C%W$7$?$+5-21$7$F$*$j!$0lEY%]%C%W$7$?%U%!%$%k$r:F$S%W%C%7%e$7!$%G%#(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
174 $B%l%/%H%j%D%j!<$r%Q%C%A$K$h$kJQ99$,$J$5$l$?>uBV$KLa$9$3$H$,$G$-$k!%:G$b=E(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
175 $BMW$J$3$H$O!$$$$D$G$b(B``refresh''$B%3%^%s%I$r<B9T$7$F0lHV?7$7$/E,MQ$5$l$?%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
176 $B%A$r99?7$G$-$k$3$H$G$"$k!%$3$l$O$9$J$o$A!$%Q%C%A$NE,MQ$5$l$?>uBV$H!$%Q%C(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
177 $B%A$=$l<+BN$r$$$D$G$b99?7$G$-$k$H$$$&$3$H$G$"$k!%(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
178
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
179 %Quilt knows nothing about revision control tools, so it works equally
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
180 %well on top of an unpacked tarball or a Subversion working copy.
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
181
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
182 quilt$B$O%j%S%8%g%s4IM}%D!<%k$K$D$$$F$OA4$/4XCN$7$J$$$?$a!$E83+$5$l$?(Btar$B%\!<(B
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
183 $B%k>e$G$b!$(BSubversion$B$N%o!<%-%s%0%3%T!<>e$G$bF1MM$KF0:n$9$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
184
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
185 %\subsection{From patchwork quilt to Mercurial Queues}
323
2d1054e1de5b more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 322
diff changeset
186 \subsection{patchwork quilt$B$+$i(BMercurial Queues$B$X(B}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
187 \label{sec:mq:quilt-mq}
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
188
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
189 %In mid-2005, Chris Mason took the features of quilt and wrote an
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
190 %extension that he called Mercurial Queues, which added quilt-like
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
191 %behaviour to Mercurial.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
192
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
193 2005$BG/$NCf:"(BChris Mason$B$O!$(Bquilt$B$N5!G=$r<h$jF~$l$F!$(BMercurial$B$K(Bquilt$B$N$h(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
194 $B$&$JF0:n$rDI2C$9$k(BMercurial Queues$B$H$$$&%(%/%9%F%s%7%g%s$r=q$$$?!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
195
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
196 %The key difference between quilt and MQ is that quilt knows nothing
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
197 %about revision control systems, while MQ is \emph{integrated} into
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
198 %Mercurial. Each patch that you push is represented as a Mercurial
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
199 %changeset. Pop a patch, and the changeset goes away.
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
200
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
201 quilt$B$H(BMQ$B$N0c$$$O!$(Bquilt$B$O%j%S%8%g%s4IM}%7%9%F%`$K$D$$$F2?$b4XCN$7$J$$$N(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
202 $B$KBP$7$F!$(BMQ$B$O(BMercurial$B$KE}9g$5$l$F$$$k$3$H$G$"$k!%%W%C%7%e$7$?8D!9$N%Q%C(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
203 $B%A$O(BMercurial$B$N%A%'%s%8%;%C%H$H$7$FI=8=$5$l$k!%%Q%C%A$r%]%C%W$9$k$H!$%A%'(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
204 $B%s%8%;%C%H$O>C$($F$J$/$J$k!%(B
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
205
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
206 %Because quilt does not care about revision control tools, it is still
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
207 %a tremendously useful piece of software to know about for situations
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
208 %where you cannot use Mercurial and MQ.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
209
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
210 quilt$B$O%j%S%8%g%s4IM}%D!<%k$HL54X78$KMxMQ2DG=$J$?$a!$(BMercurial$B$H(BMQ$B$,;H$((B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
211 $B$J$$>u67$G$O0MA3$H$7$FHs>o$KM-1W$J%D!<%k$G$"$k$3$H$O5-21$KN1$a$F$*$/$Y$-(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
212 $B$G$"$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
213
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
214 %\section{The huge advantage of MQ}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
215 \section{MQ$B$NBg$-$JMxE@(B}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
216
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
217 %I cannot overstate the value that MQ offers through the unification of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
218 %patches and revision control.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
219
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
220 MQ$B$,%Q%C%A$H%j%S%8%g%s%3%s%H%m!<%k$NE}9g$K$h$C$F$b$?$i$92ACM$r8XD%$9$k$o(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
221 $B$1$K$O$$$+$J$$!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
222
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
223 %A major reason that patches have persisted in the free software and
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
224 %open source world---in spite of the availability of increasingly
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
225 %capable revision control tools over the years---is the \emph{agility}
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
226 %they offer.
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
227
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
228 $B;~$rDI$&Kh$K%j%S%8%g%s%3%s%H%m!<%k%D!<%k$NMxMQ$,9-$,$C$F$$$k$K$b$+$+$o$i(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
229 $B$:!$%U%j!<%=%U%H$H%*!<%W%s%=!<%9$N@$3&$K%Q%C%A$,B8:_$9$kBg$-$JM}M3$O$=$N(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
230 \emph{$B5!IR$5(B}$B$K$"$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
231
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
232 %Traditional revision control tools make a permanent, irreversible
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
233 %record of everything that you do. While this has great value, it's
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
234 %also somewhat stifling. If you want to perform a wild-eyed
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
235 %experiment, you have to be careful in how you go about it, or you risk
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
236 %leaving unneeded---or worse, misleading or destabilising---traces of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
237 %your missteps and errors in the permanent revision record.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
238
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
239 $BEAE}E*$J%j%S%8%g%s%3%s%H%m!<%k%D!<%k$O!$9T$J$C$?A`:n$N1J5WE*$GIT2D5UE*$J(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
240 $B5-O?$r;D$9!%$3$l$K$OBg$-$J2ACM$,$"$k0lJ}$G!$5g6~$K46$8$k$3$H$b$"$k!%$b$7(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
241 $B2a7c$J<B83$r$9$k$N$G$"$l$P!$$I$N$h$&$K?J$a$k$+?5=E$K$9$kI,MW$,$"$k!%$5$b(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
242 $B$J$1$l$P!$ITMW$J!$$"$k$$$O8m2r$r>7$$$?$j!$0BDj@-$rB;$J$&%H%l!<%9$H%(%i!<(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
243 $B$r1J5WE*$J%j%S%8%g%sMzNr$K;D$9$3$H$K$J$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
244
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
245 %By contrast, MQ's marriage of distributed revision control with
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
246 %patches makes it much easier to isolate your work. Your patches live
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
247 %on top of normal revision history, and you can make them disappear or
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
248 %reappear at will. If you don't like a patch, you can drop it. If a
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
249 %patch isn't quite as you want it to be, simply fix it---as many times
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
250 %as you need to, until you have refined it into the form you desire.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
251
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
252 $BBP>NE*$K!$(BMQ$B$K$h$kJ,;6%j%S%8%g%s%3%s%H%m!<%k$H%Q%C%A$N7k9g$O!$:n6H$r3VN%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
253 $B$9$k$3$H$rMZ$+$KMF0W$K$9$k!%%Q%C%A$ODL>o$N%j%S%8%g%sMzNr$N>e$K>h$C$F$*$j!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
254 $BK>$`$h$&$K>CLG$5$;$?$j:F8=$5$;$k$3$H$,$G$-$k!%%Q%C%A$r5$$KF~$i$J$1$l$P!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
255 $B$3$l$r4~5Q$9$k$3$H$b$G$-$k!%%Q%C%A$,$"$J$?$NK>$`$h$&$J$b$N$G$J$1$l$P!$4u(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
256 $BK>DL$j$K$J$k$^$G2?EY$G$b4JC1$K=$@5$9$k$3$H$,$G$-$k!%(B
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
257
324
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
258 %As an example, the integration of patches with revision control makes
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
259 %understanding patches and debugging their effects---and their
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
260 %interplay with the code they're based on---\emph{enormously} easier.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
261 %Since every applied patch has an associated changeset, you can use
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
262 %\hgcmdargs{log}{\emph{filename}} to see which changesets and patches
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
263 %affected a file. You can use the \hgext{bisect} command to
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
264 %binary-search through all changesets and applied patches to see where
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
265 %a bug got introduced or fixed. You can use the \hgcmd{annotate}
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
266 %command to see which changeset or patch modified a particular line of
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
267 %a source file. And so on.
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
268
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
269 $BNc$($P!$%j%S%8%g%s%3%s%H%m!<%k$X$N%Q%C%A$NE}9g$O!$%Q%C%A$rM}2r$7!$$=$N1F(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
270 $B6A!$0M$C$FN)$D%Y!<%9%3!<%I$H$NAj8_:nMQ$r%G%P%C%0$9$k$3$H$r2DG=$K$9$k!%E,(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
271 $BMQ$5$l$?%Q%C%A$O!$4XO"$E$1$i$l$?%A%'%s%8%;%C%H$r;}$D$?$a!$(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
272 \hgcmdargs{log}{\emph{filename}}$B$K$h$C$F$I$N%A%'%s%8%;%C%H$H%Q%C%A$,%U%!(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
273 $B%$%k$K1F6A$rM?$($F$$$k$+D4$Y$k$3$H$,$G$-$k!%(B\hgext{bisect}$B%3%^%s%I$GA4$F(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
274 $B$N%A%'%s%8%;%C%H$HE,MQ$5$l$?%Q%C%A$KBP$7$F%P%$%J%j%5!<%A$r9T$J$$!$$I$3$G(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
275 $B%P%0$,:.F~$7$?$+!$$"$k$$$O=$@5$5$l$?$+$rD4$Y$k$3$H$,$G$-$k!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
276 \hgcmd{annotate}$B%3%^%s%I$G$I$N%A%'%s%8%;%C%H$+%Q%C%A$,%=!<%9%U%!%$%k$NFC(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
277 $BDj$N9T$rJQ99$7$?$+8+$k$3$H$,$G$-$k!%(B
7dc8a24c70f4 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 323
diff changeset
278
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
279
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
280 %\section{Understanding patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
281 \section{$B%Q%C%A$H$O2?$+(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
282 \label{sec:mq:patch}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
283
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
284 %Because MQ doesn't hide its patch-oriented nature, it is helpful to
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
285 %understand what patches are, and a little about the tools that work
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
286 %with them.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
287
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
288 MQ$B$O%Q%C%A;X8~$G$"$k@-<A$r1#JC$7$F$$$J$$$N$G!$%Q%C%A$,2?$G$"$k$+!$%D!<%k(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
289 $B$,%Q%C%A$r$I$&07$&$+$rM}2r$9$k$N$O$?$d$9$$!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
290
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
291 %The traditional Unix \command{diff} command compares two files, and
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
292 %prints a list of differences between them. The \command{patch} command
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
293 %understands these differences as \emph{modifications} to make to a
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
294 %file. Take a look at figure~\ref{ex:mq:diff} for a simple example of
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
295 %these commands in action.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
296
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
297 Unix$B$NEAE}E*$J(B\command{diff}$B%3%^%s%I$O(B2$B$D$N%U%!%$%k$rHf3S$7!$:9J,$N%j%9(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
298 $B%H$r=PNO$9$k!%(B\command{patch}$B%3%^%s%I$O$3$N:9J,$rJQ99$H2r<a$7!$%U%!%$%k(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
299 $B$K5Z$\$9!%?^(B~\ref{ex:mq:diff}$B$K$3$l$i$N%3%^%s%I$NF0:n$r<($9!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
300
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
301 \begin{figure}[ht]
46
dd657c4d3a47 Rename mq.diff to mq.dodiff Emacs won't screw up the syntax highlighting.
Bryan O'Sullivan <bos@serpentine.com>
parents: 35
diff changeset
302 \interaction{mq.dodiff.diff}
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
303 % \caption{Simple uses of the \command{diff} and \command{patch}
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
304 % commands}
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
305 \caption{\command{diff}$B%3%^%s%I$H(B\command{patch}$B%3%^%s%I$NC1=c$J;HMQNc(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
306 \label{ex:mq:diff}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
307 \end{figure}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
308
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
309 %The type of file that \command{diff} generates (and \command{patch}
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
310 %takes as input) is called a ``patch'' or a ``diff''; there is no
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
311 %difference between a patch and a diff. (We'll use the term ``patch'',
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
312 %since it's more commonly used.)
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
313
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
314 \command{diff}$B$,@8@.$9$k!J$^$?(B\command{patch}$B$,F~NO$K<h$k!K%U%!%$%k$N<o(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
315 $BN`$O(B``patch''$B$^$?$O(B``diff''$B$H8F$P$l!$$3$l$i$N4V$K$O0c$$$O$J$$!%!J0J2<$G(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
316 $B$O!$$h$jB?$/;H$o$l$F$$$k(B``patch''$B$H$$$&8@MU$r;H$&$3$H$K$9$k!%!K(B
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
317
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
318 %A patch file can start with arbitrary text; the \command{patch}
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
319 %command ignores this text, but MQ uses it as the commit message when
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
320 %creating changesets. To find the beginning of the patch content,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
321 %\command{patch} searches for the first line that starts with the
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
322 %string ``\texttt{diff~-}''.
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
323
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
324 $B%Q%C%A%U%!%$%k$OG$0U$N%F%-%9%H$G;O$^$k!%(B\command{patch}$B%3%^%s%I$O$3$N%F(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
325 $B%-%9%H$rL5;k$9$k$,!$(BMQ$B$O%A%'%s%8%;%C%H$r:n$k:]$N%3%_%C%H%a%C%;!<%8$H$7$F(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
326 $BMxMQ$9$k!%%Q%C%AFbMF$N@hF,$r8+$D$1$k$?$a$K(B\command{patch}$B$O(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
327 ``\texttt{diff~-}''$B$G;O$^$k:G=i$N9T$r%5!<%A$9$k!%(B
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
328
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
329 %MQ works with \emph{unified} diffs (\command{patch} can accept several
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
330 %other diff formats, but MQ doesn't). A unified diff contains two
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
331 %kinds of header. The \emph{file header} describes the file being
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
332 %modified; it contains the name of the file to modify. When
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
333 %\command{patch} sees a new file header, it looks for a file with that
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
334 %name to start modifying.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
335
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
336 MQ\emph{unified} diffs$B7A<0$r;H$&!%!J(B\command{patch}$B%3%^%s%I$O$3$l0J30$K2?(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
337 $B<oN`$+$N(Bdiff$B%U%)!<%^%C%H$r<u$1IU$1$k$,!$(BMQ$B$G$OMxMQ$G$-$J$$!%!K(Bunified
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
338 diff$B$O(B2$B<oN`$N%X%C%@$r;}$D!%(B\emph{file $B%X%C%@(B}$B$OJQ99$5$l$F$$$k%U%!%$%k$r5-(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
339 $B=R$9$k!%(B\command{patch}$B%3%^%s%I$O!$?7$7$$%U%!%$%k%X%C%@$r8+$D$1$k$H!$$=$3(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
340 $B$K5-=R$5$l$F$$$k%U%!%$%kL>$r;}$D%U%!%$%k$rC5$9!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
341
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
342 %After the file header comes a series of \emph{hunks}. Each hunk starts
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
343 %with a header; this identifies the range of line numbers within the file
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
344 %that the hunk should modify. Following the header, a hunk starts and
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
345 %ends with a few (usually three) lines of text from the unmodified file;
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
346 %these are called the \emph{context} for the hunk.If
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
347 %there's only a small amount of context between successive hunks,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
348 %\command{diff} doesn't print a new hunk header; it just runs the hunks
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
349 %together, with a few lines of context between modifications.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
350
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
351 $B%U%!%$%k%X%C%@$N8e$K$O0lO"$N(B\emph{hunks}$B$,B3$/!%3F!9$N(Bhunk$B$O%X%C%@$G;O$^(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
352 $B$k!%$3$N%X%C%@$O%U%!%$%kFb$G(Bhunk$B$,2~JQ$9$Y$-9THV9f$NHO0O$r<1JL$9$k$N$K;H(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
353 $B$o$l$k!%%X%C%@$KB3$-!$(Bhunk$B$O?t9T!JDL>o(B3$B!K$N2~JQ$5$l$F$$$J$$%U%!%$%k$+$i$N(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
354 $B9T$,$"$k!%$3$l$i$O(Bhunk$B$N(B\emph{$B%3%s%F%-%9%H(B}$B$H8F$P$l$k!%$b$7O"B3$9$k(Bhunk$B$N(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
355 $B4V$K%3%s%F%-%9%H$,>/$7$7$+$J$1$l$P!$(B\command{diff}$B$O?7$?$J(Bhunk$B%X%C%@$r=P(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
356 $BNO$;$:!$3F!9$N(Bhunk$B$H4V$N%3%s%F%-%9%H$r9g$o$;$F=PNO$9$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
357
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
358 %Each line of context begins with a space character. Within the hunk,
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
359 %a line that begins with ``\texttt{-}'' means ``remove this line,''
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
360 %while a line that begins with ``\texttt{+}'' means ``insert this
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
361 %line.'' For example, a line that is modified is represented by one
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
362 %deletion and one insertion.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
363
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
364 $B%3%s%F%-%9%H$N3F9T$O!$6uGrJ8;z$G;O$^$k!%(Bhunk$BFb$G$O9T$O(B``\texttt{-}''$B$G;O(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
365 $B$^$k!%$3$l$O(B``$B$3$N9T$r:o=|$;$h(B''$B$r0UL#$9$k!%(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
366 $B0lJ}!$(B``\texttt{+}''$B$G;O$^$k9T$O!$(B``$B$3$N9T$rA^F~$;$h(B''$B$r0UL#$9$k!%Nc$r5s(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
367 $B$2$k$H!$JQ99$5$l$?9T$O(B1$B$D$N:o=|$H(B1$B$D$NA^F~$GI=$5$l$k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
368
329
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
369 %We will return to some of the more subtle aspects of patches later (in
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
370 %section~\ref{sec:mq:adv-patch}), but you should have enough information
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
371 %now to use MQ.
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
372
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
373 $B%Q%C%A$N:3:Y$JE@$K$D$$$F$O8e$G!J(B~\ref{sec:mq:adv-patch}$B!K$^$??($l$k$,!$(B
d520107e32e7 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 328
diff changeset
374 $B$3$l$^$G$G!$(BMQ$B$r;H$&$N$K==J,$J>pJs$O=R$Y$?!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
375
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
376 %\section{Getting started with Mercurial Queues}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
377 \section{Mercurial Queues$B$r;H$C$F$_$k(B}
2
379a802c0210 Add bibliography.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1
diff changeset
378 \label{sec:mq:start}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
379
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
380 %Because MQ is implemented as an extension, you must explicitly enable
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
381 %before you can use it. (You don't need to download anything; MQ ships
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
382 %with the standard Mercurial distribution.) To enable MQ, edit your
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
383 %\tildefile{.hgrc} file, and add the lines in figure~\ref{ex:mq:config}.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
384
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
385 MQ$B$O%(%/%9%F%s%7%g%s$H$7$F<BAu$5$l$F$$$k$N$G!$;H$&A0$KL@<(E*$KM-8z$K$9$k(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
386 $BI,MW$,$"$k!%!J2?$b%@%&%s%m!<%I$9$kI,MW$O$J$$!%(BMQ$B$ODL>o$N(BMercurial$B$KF1:-$5(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
387 $B$l$F$$$k!K(BMQ$B$rM-8z$K$9$k$K$O(B\tildefile{.hgrc}$B%U%!%$%k$rJT=8$7!$(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
388 $B?^(B~\ref{ex:mq:config}$B$N$h$&$K@_Dj$rDI2C$9$k!%(B
2
379a802c0210 Add bibliography.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1
diff changeset
389
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
390 \begin{figure}[ht]
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
391 \begin{codesample4}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
392 [extensions]
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
393 hgext.mq =
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
394 \end{codesample4}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
395 \label{ex:mq:config}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
396 % \caption{Contents to add to \tildefile{.hgrc} to enable the MQ
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
397 % extension}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
398 \caption{MQ$B%(%/%9%F%s%7%g%s$rM-8z$K$9$k$?$a$K(B\tildefile{.hgrc}$B$KDI2C$9$kFbMF(B}
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
399 \end{figure}
3
906d9021f9e5 Making progress on autogenerated example output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 2
diff changeset
400
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
401 %Once the extension is enabled, it will make a number of new commands
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
402 %available. To verify that the extension is working, you can use
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
403 %\hgcmd{help} to see if the \hgxcmd{mq}{qinit} command is now available; see
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
404 %the example in figure~\ref{ex:mq:enabled}.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
405
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
406 $B%(%/%9%F%s%7%g%s$,M-8z2=$5$l$k$H0lO"$N%3%^%s%I$,MxMQ2DG=$K$J$k!%%(%/%9%F(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
407 $B%s%7%g%s$,M-8z$G$"$k$3$H$r3NG'$9$k$?$a$K$O!$(B\hgcmd{help}$B$G(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
408 \hgxcmd{mq}{qinit}$B$,$"$k$3$H$r3NG'$9$k!%?^(B~\ref{ex:mq:enabled}$B$NNc$r;2>H(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
409 $B$5$l$?$$!%(B
3
906d9021f9e5 Making progress on autogenerated example output.
Bryan O'Sullivan <bos@serpentine.com>
parents: 2
diff changeset
410
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
411 \begin{figure}[ht]
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
412 \interaction{mq.qinit-help.help}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
413 % \caption{How to verify that MQ is enabled}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
414 \caption{MQ$B$,M-8z$G$"$k$3$H$N3NG'K!(B}
4
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
415 \label{ex:mq:enabled}
33a2e7b9978d Make it possible to include example input and output from real programs.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3
diff changeset
416 \end{figure}
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
417
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
418 %You can use MQ with \emph{any} Mercurial repository, and its commands
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
419 %only operate within that repository. To get started, simply prepare
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
420 %the repository using the \hgxcmd{mq}{qinit} command (see
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
421 %figure~\ref{ex:mq:qinit}). This command creates an empty directory
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
422 %called \sdirname{.hg/patches}, where MQ will keep its metadata. As
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
423 %with many Mercurial commands, the \hgxcmd{mq}{qinit} command prints nothing
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
424 %if it succeeds.
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
425
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
426 MQ$B$O(B\emph{$B$"$i$f$k(B}Mercurial$B%j%]%8%H%j$G;H$&$3$H$,$G$-!$$=$N%3%^%s%I$O3F!9(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
427 $B$N%j%]%8%H%j$NCf$K$@$1:nMQ$9$k!%;O$a$k$?$a$K(B\hgxcmd{mq}{qinit}$B%3%^%s%I$G(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
428 $B%j%]%8%H%j$rMQ0U$9$k!%!J?^(B~\ref{ex:mq:qinit}$B$r;2>H!K(B $B$3$N%3%^%s%I$O(BMQ$B$,%a(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
429 $B%?%G!<%?$rJ]B8$9$k$?$a$N(B\sdirname{.hg/patches}$B$H$$$&L>A0$N6u$N%G%#%l%/%H(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
430 $B%j$r:n@.$9$k!%B>$N(BMercurial$B%3%^%s%I$HF1MM$K!$(B\hgxcmd{mq}{qinit}$B%3%^%s%I(B
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
431 $B$b@.8y$9$k$H2?$bI=<($7$J$$!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
432
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
433 \begin{figure}[ht]
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
434 \interaction{mq.tutorial.qinit}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
435 % \caption{Preparing a repository for use with MQ}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
436 \caption{MQ$B$r;H$&$?$a$K%j%]%8%H%j$r=`Hw$9$k(B}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
437 \label{ex:mq:qinit}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
438 \end{figure}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
439
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
440 \begin{figure}[ht]
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
441 \interaction{mq.tutorial.qnew}
330
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
442 % \caption{Creating a new patch}
cadfd8bf5f15 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 329
diff changeset
443 \caption{$B?7$7$$%Q%C%A$N:n@.(B}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
444 \label{ex:mq:qnew}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
445 \end{figure}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
446
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
447 %\subsection{Creating a new patch}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
448 \subsection{$B?7$7$$%Q%C%A$N:n@.(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
449
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
450 %To begin work on a new patch, use the \hgxcmd{mq}{qnew} command. This
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
451 %command takes one argument, the name of the patch to create. MQ will
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
452 %use this as the name of an actual file in the \sdirname{.hg/patches}
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
453 %directory, as you can see in figure~\ref{ex:mq:qnew}.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
454
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
455 $B?7$7$$%Q%C%A$r07$&;~$O(B\hgxcmd{mq}{qnew}$B%3%^%s%I$r;H$&!%$3$N%3%^%s%I$O:n@.(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
456 $B$5$l$k%Q%C%A$NL>A0$H$7$F0z?t$r(B1$B$D<h$k!%?^(B~\ref{ex:mq:qnew}$B$N$h$&$K!$(BMQ$B$O(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
457 $B$3$l$r(B\sdirname{.hg/patches} $B%G%#%l%/%H%jFb$N<B:]$N%U%!%$%kL>$H$7$FMxMQ$9(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
458 $B$k!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
459
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
460 %Also newly present in the \sdirname{.hg/patches} directory are two
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
461 %other files, \sfilename{series} and \sfilename{status}. The
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
462 %\sfilename{series} file lists all of the patches that MQ knows about
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
463 %for this repository, with one patch per line.Mercurial uses the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
464 %\sfilename{status} file for internal book-keeping; it tracks all of the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
465 %patches that MQ has \emph{applied} in this repository.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
466
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
467 \sdirname{.hg/patches}$B%G%#%l%/%H%j$NCf$K$O!$(B\sfilename{series}$B$H(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
468 \sfilename{status}$B$H$$$&(B2$B$D$N%U%!%$%k$b?7$7$/:n$i$l$k!%(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
469 \sfilename{series}$B$U$!$$$k$O(BMQ$B$,4XCN$9$k!$$3$N%j%]%8%H%jFb$NA4$F$N%Q%C%A(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
470 $B$N%j%9%H$,$"$j!$0l9T$K0l$D$N%Q%C%A$,5-=R$5$l$F$$$k!%(BMercurial$B$O(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
471 \sfilename{status}$B%U%!%$%k$rFbIt$N4IM}$KMQ$$$k!%$3$N%U%!%$%k$O%j%]%8%H%j(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
472 $BFb$G(BMQ$B$,E,MQ$7$?A4$F$N%Q%C%A$,5-O?$5$l$F$$$k!%(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
473
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
474 %\begin{note}
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
475 % You may sometimes want to edit the \sfilename{series} file by hand;
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
476 % for example, to change the sequence in which some patches are
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
477 % applied. However, manually editing the \sfilename{status} file is
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
478 % almost always a bad idea, as it's easy to corrupt MQ's idea of what
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
479 % is happening.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
480 %\end{note}
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
481
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
482 \begin{note}
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
483 $BNc$($P!$J#?t$N%Q%C%A$,E,MQ$5$l$k<j=g$rJQ99$9$k$J$I$NL\E*$G(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
484 \sfilename{series}$B%U%!%$%k$r<j$GJT=8$7$?$/$J$k$3$H$,$"$k$+$b$7$l$J$$!%(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
485 $B$7$+$7(B\sfilename{status}$B$r<j$GJT=8$9$k$N$O$[$H$s$I$N>l9gNI$/$J$$9M$($G!$(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
486 MQ$B$N>uBVDI@W$r4JC1$K68$o$;$F$7$^$&!%(B
7
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
487 \end{note}
339e75288632 More progress on MQ chapter and general support.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4
diff changeset
488
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
489 %Once you have created your new patch, you can edit files in the
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
490 %working directory as you usually would. All of the normal Mercurial
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
491 %commands, such as \hgcmd{diff} and \hgcmd{annotate}, work exactly as
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
492 %they did before.
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
493
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
494 $B?7$7$$%Q%C%A$r:n$C$?8e!$%o!<%-%s%0%G%#%l%/%H%jFb$N%U%!%$%k$rDL>oDL$jJT=8(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
495 $B$9$k$3$H$,$G$-$k!%(B\hgcmd{diff}$B$d(B\hgcmd{annotate}$B$N$h$&$JA4$F$NDL>o$N(B
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
496 Mercurial$B%3%^%s%I$,A4$/F1$8$h$&$K;H$($k!%(B
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
497
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
498 %\subsection{Refreshing a patch}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
499 \subsection{$B%Q%C%A$N:F@8(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
500
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
501 %When you reach a point where you want to save your work, use the
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
502 %\hgxcmd{mq}{qrefresh} command (figure~\ref{ex:mq:qnew}) to update the patch
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
503 %you are working on. This command folds the changes you have made in
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
504 %the working directory into your patch, and updates its corresponding
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
505 %changeset to contain those changes.
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
506
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
507 $B:n6HFbMF$r%;!<%V$9$k%]%$%s%H$K:9$7$+$+$C$?$i!$(B\hgxcmd{mq}{qrefresh}$B%3%^(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
508 $B%s%I$r;H$C$F!J?^(B~\ref{ex:mq:qnew}$B!K:n6HCf$N%Q%C%A$r99?7$9$k!%$3$N%3%^%s(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
509 $B%I$O%o!<%-%s%0%G%#%l%/%H%j$N:9J,$r%Q%C%A$K<h$j9~$_!$%A%'%s%8%;%C%H$,JQ99(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
510 $B$r4^$`$h$&$K99?7$9$k!%(B
331
110ebf968d3f more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 330
diff changeset
511
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
512 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
513 \interaction{mq.tutorial.qrefresh}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
514 % \caption{Refreshing a patch}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
515 \caption{$B%Q%C%A$N%j%U%l%C%7%e(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
516 \label{ex:mq:qrefresh}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
517 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
518
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
519 %You can run \hgxcmd{mq}{qrefresh} as often as you like, so it's a good way
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
520 %to ``checkpoint'' your work. Refresh your patch at an opportune
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
521 %time; try an experiment; and if the experiment doesn't work out,
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
522 %\hgcmd{revert} your modifications back to the last time you refreshed.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
523
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
524 \hgxcmd{mq}{qrefresh}$B$O$$$D$G$b9%$-$J;~$K<B9T$G$-!$:n6H$N>uBVJ]B8$r$9$k(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
525 $B$N$K$b;H$($k!%%Q%C%A$N%j%U%l%C%7%e$OET9g$N$h$$;~$K9T$($P$h$$!%<B83E*$J%3!<(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
526 $B%I$rF0$+$9>l9g!$;vA0$K%j%U%l%C%7%e$r$7$F$*$1$P!$<B83$N7k2L%3!<%I$,F0$+$J(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
527 $B$/$F$b!$(B\hgcmd{revert}$B$9$l$P!$JQ99$O85$KLa$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
528
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
529 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
530 \interaction{mq.tutorial.qrefresh2}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
531 % \caption{Refresh a patch many times to accumulate changes}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
532 \caption{$B%Q%C%A$N%j%U%l%C%7%e$GJQ99$rC_@Q$9$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
533 \label{ex:mq:qrefresh2}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
534 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
535
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
536 %\subsection{Stacking and tracking patches}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
537 \subsection{$B%Q%C%A$N%9%?%C%/$HDI@W(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
538
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
539 %Once you have finished working on a patch, or need to work on another,
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
540 %you can use the \hgxcmd{mq}{qnew} command again to create a new patch.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
541 %Mercurial will apply this patch on top of your existing patch. See
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
542 %figure~\ref{ex:mq:qnew2} for an example. Notice that the patch
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
543 %contains the changes in our prior patch as part of its context (you
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
544 %can see this more clearly in the output of \hgcmd{annotate}).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
545
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
546 $B%Q%C%A$X$N:n6H$,=*N;$7$?$j!$B>$N:n6H$r$r$9$kI,MW$,$"$k>l9g!$(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
547 \hgxcmd{mq}{qnew}$B%3%^%s%I$r<B9T$7!$?7$7$$%Q%C%A$r:n$k$3$H$,$G$-$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
548 Mercurial$B$O$3$N%Q%C%A$r4{B8$N%Q%C%A$N>e$+$iE,MQ$9$k!%?^(B~\ref{ex:mq:qnew2}$B$r(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
549 $B;2>H$N$3$H!%%Q%C%A$O@h9T$9$k%Q%C%A$NJQ99$r%3%s%F%-%9%H$H$7$F;}$D!%!J(B\hgcmd{annotate}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
550 $B$N=PNO$G$h$jL@NF$K3NG'$9$k$3$H$,$G$-$k!%!K(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
551
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
552 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
553 \interaction{mq.tutorial.qnew2}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
554 % \caption{Stacking a second patch on top of the first}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
555 \caption{$B:G=i$N%Q%C%A$N>e$K(B2$BHVL\$N%Q%C%A$r%9%?%C%/$9$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
556 \label{ex:mq:qnew2}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
557 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
558
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
559 %So far, with the exception of \hgxcmd{mq}{qnew} and
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
560 %\hgxcmd{mq}{qrefresh}, we've been careful to only use regular Mercurial
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
561 %commands. However, MQ provides many commands that are easier to use
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
562 %when you are thinking about patches, as illustrated in
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
563 %figure~\ref{ex:mq:qseries}:
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
564
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
565 $B$3$l$^$G$O(B\hgxcmd{mq}{qnew}$B$H(B\hgxcmd{mq}{qrefresh}$B$r=|$$$F!$DL>o$N(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
566 Mercurial$B%3%^%s%I$N$_$r;H$&$h$&$KCm0U$7$F$-$?!%$7$+$7(BMQ$B$O%Q%C%A$r07$&>l(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
567 $B9g!$?^(B~\ref{ex:mq:qseries}$B$K<($9$h$&$J$h$j4JC1$J%3%^%s%I$rMQ0U$7$F$$$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
568
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
569 %\begin{itemize}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
570 %\item The \hgxcmd{mq}{qseries} command lists every patch that MQ knows
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
571 % about in this repository, from oldest to newest (most recently
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
572 % \emph{created}).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
573 %\item The \hgxcmd{mq}{qapplied} command lists every patch that MQ has
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
574 % \emph{applied} in this repository, again from oldest to newest (most
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
575 % recently applied).
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
576 %\end{itemize}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
577
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
578 \begin{itemize}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
579 \item \hgxcmd{mq}{qseries}$B%3%^%s%I$O(BMQ$B$,4XCN$9$k%j%]%8%H%jFb$N%Q%C%AA4$F(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
580 $B$r8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
581 \item \hgxcmd{mq}{qapplied}$B%3%^%s%I$O(BMQ$B$,(B\emph{$BE,MQ$7$?(B}$B%j%]%8%H%jFb$N(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
582 $B%Q%C%AA4$F$r$d$O$j8E$$$b$N$+$i?7$7$/(B\emph{$B:n@.$5$l$?(B}$B$b$N$N=g$K%j%9%HI=<($9$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
583 \end{itemize}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
584
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
585 \begin{figure}[ht]
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
586 \interaction{mq.tutorial.qseries}
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
587 % \caption{Understanding the patch stack with \hgxcmd{mq}{qseries} and
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
588 % \hgxcmd{mq}{qapplied}}
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
589 \caption{\hgxcmd{mq}{qseries}$B$H(B\hgxcmd{mq}{qapplied}$B$G%Q%C%A%9%?%C%/$r(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
590 $BD4$Y$k(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
591 \label{ex:mq:qseries}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
592 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
593
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
594
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
595 %\subsection{Manipulating the patch stack}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
596 \subsection{$B%Q%C%A%9%?%C%/$NA`:n(B}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
597
332
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
598 %The previous discussion implied that there must be a difference
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
599 %between ``known'' and ``applied'' patches, and there is. MQ can
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
600 %manage a patch without it being applied in the repository.
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
601
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
602 $B$3$l$^$G$N5DO@$O(B``known''$B$H(B``applied''$B%Q%C%A$K0c$$$,$"$k$3$H$r0EL[$K2>Dj(B
9ad5d69c4a37 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 331
diff changeset
603 $B$7$F$$$?!%(BMQ$B$O:90[$N$J$$%Q%C%A$r%j%]%8%H%j$KBP$7$FE,MQ$9$k$3$H$b$G$-$k!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
604
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
605 %An \emph{applied} patch has a corresponding changeset in the
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
606 %repository, and the effects of the patch and changeset are visible in
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
607 %the working directory. You can undo the application of a patch using
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
608 %the \hgxcmd{mq}{qpop} command. MQ still \emph{knows about}, or manages, a
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
609 %popped patch, but the patch no longer has a corresponding changeset in
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
610 %the repository, and the working directory does not contain the changes
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
611 %made by the patch. Figure~\ref{fig:mq:stack} illustrates the
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
612 %difference between applied and tracked patches.
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
613
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
614 \emph{$BE,MQ$5$l$?(B}$B%Q%C%A$O%j%]%8%H%jFb$KBP1~$9$k%A%'%s%8%;%C%H$r;}$A!$%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
615 $B%A$N8z2L$H%A%'%s%8%;%C%H$O%o!<%-%s%0%G%#%l%/%H%jFb$G8+$k$3$H$,$G$-$k!%%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
616 $B%A$NE,MQ$O(B\hgxcmd{mq}{qpop}$B%3%^%s%I$G<h$j>C$9$3$H$,$G$-$k!%%]%C%W$5$l$?%Q%C(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
617 $B%A$OBP1~$9$k%A%'%s%8%;%C%H$r;}$?$:!$JQ99$b%o!<%-%s%0%G%#%l%/%H%j$K;D$C$F(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
618 $B$$$J$$$,!$(BMQ$B$O%]%C%W$5$l$?%Q%C%A$r0MA3$H$7$F5-21$7!$4IM}$7$F$$$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
619 $B?^(B~\ref{fig:mq:stack}$B$OE,MQ$5$l$?%Q%C%A$H4IM}$5$l$F$$$k%Q%C%A$N0c$$$r<((B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
620 $B$9!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
621
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
622 \begin{figure}[ht]
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
623 \centering
35
e68f4a96c16e Fixed the \grafix macro to work for PDFs again.
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents: 30
diff changeset
624 \grafix{mq-stack}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
625 % \caption{Applied and unapplied patches in the MQ patch stack}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
626 \caption{MQ$B%Q%C%A%9%?%C%/$NCf$NE,MQ$5$l$?%Q%C%A$HE,MQ$5$l$J$$%Q%C%A(B}
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
627 \label{fig:mq:stack}
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
628 \end{figure}
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
629
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
630 %You can reapply an unapplied, or popped, patch using the \hgxcmd{mq}{qpush}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
631 %command. This creates a new changeset to correspond to the patch, and
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
632 %the patch's changes once again become present in the working
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
633 %directory. See figure~\ref{ex:mq:qpop} for examples of \hgxcmd{mq}{qpop}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
634 %and \hgxcmd{mq}{qpush} in action. Notice that once we have popped a patch
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
635 %or two patches, the output of \hgxcmd{mq}{qseries} remains the same, while
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
636 %that of \hgxcmd{mq}{qapplied} has changed.
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
637
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
638 $BE,MQ$r30$7$?%Q%C%A$d%]%C%W$7$?%Q%C%A$r(B\hgxcmd{mq}{qpush}$B%3%^%s%I$G:FE,MQ(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
639 $B$9$k$3$H$,$G$-$k!%$3$N%3%^%s%I$O!$%Q%C%A$KBP1~$7$??7$7$$%A%'%s%8%;%C%H$r(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
640 $B:n$j!$%Q%C%A$K$h$kJQ99$O$b$&0lEY%o!<%-%s%0%G%#%l%/%H%j$K8=$l$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
641 \hgxcmd{mq}{qpop}$B$H(B\hgxcmd{mq}{qpush}$B$N;HMQNc$r?^(B~\ref{ex:mq:qpop}$B$K<($9!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
642 1$B$D$^$?$OJ#?t$N%Q%C%A$r%]%C%W$9$k$H(B\hgxcmd{mq}{qapplied}$B$N=PNO$OJQ2=$9$k(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
643 $B$,!$(B\hgxcmd{mq}{qseries}$B$N=PNO$OF1$8$^$^;D$k$N$KCm0U$5$l$?$$!%(B
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
644
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
645 \begin{figure}[ht]
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
646 \interaction{mq.tutorial.qpop}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
647 % \caption{Modifying the stack of applied patches}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
648 \caption{$BE,MQ$5$l$?%Q%C%A$N%9%?%C%/$rJQ99$9$k(B}
12
1f692024d438 More text for MQ chapter.
Bryan O'Sullivan <bos@serpentine.com>
parents: 11
diff changeset
649 \label{ex:mq:qpop}
11
e9d5b4c3d16b First SVG image!
Bryan O'Sullivan <bos@serpentine.com>
parents: 8
diff changeset
650 \end{figure}
e9d5b4c3d16b First SVG image!
Bryan O'Sullivan <bos@serpentine.com>
parents: 8
diff changeset
651
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
652 %\subsection{Pushing and popping many patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
653 \subsection{$B%Q%C%A$N%W%C%7%e$H%]%C%W(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
654
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
655 %While \hgxcmd{mq}{qpush} and \hgxcmd{mq}{qpop} each operate on a single patch at
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
656 %a time by default, you can push and pop many patches in one go. The
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
657 %\hgxopt{mq}{qpush}{-a} option to \hgxcmd{mq}{qpush} causes it to push all
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
658 %unapplied patches, while the \hgxopt{mq}{qpop}{-a} option to \hgxcmd{mq}{qpop}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
659 %causes it to pop all applied patches. (For some more ways to push and
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
660 %pop many patches, see section~\ref{sec:mq:perf} below.)
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
661
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
662 \hgxcmd{mq}{qpush}$B$H(B\hgxcmd{mq}{qpop}$B$O0lEY$K3F!9$N%Q%C%A0l$D$:$D$rA`:n$9(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
663 $B$k!J$3$l$O%G%U%)%k%HF0:n$G$"$k!K0lJ}!$J#?t$N%Q%C%A$r0lEY$K%]%C%W!&%W%C%7%e(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
664 $B$9$kA`:n$b$"$k!%(B\hgxcmd{mq}{qpush}$B%3%^%s%I$N(B\hgxopt{mq}{qpush}{-a}$B%*%W%7%g(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
665 $B%s$O!$L$E,MQ$N%Q%C%AA4BN$r%W%C%7%e$7!$(B\hgxcmd{mq}{qpop}$B%3%^%s%I$N(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
666 \hgxopt{mq}{qpop}{-a} $B%*%W%7%g%s$OE,MQ:Q$_$N%Q%C%AA4BN$r%]%C%W$9$k!%(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
667 $B!JB>$NJ#?t$N%Q%C%A$rF1;~$K%W%C%7%e!&%]%C%W$9$kJ}K!$K$D$$$F$O2<(B
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
668 $B$N(B~\ref{sec:mq:perf}$B$r;2>H$N$3$H!K(B
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
669
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
670 \begin{figure}[ht]
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
671 \interaction{mq.tutorial.qpush-a}
333
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
672 % \caption{Pushing all unapplied patches}
db3aa48f2f73 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 332
diff changeset
673 \caption{$BE,MQ$5$l$F$$$J$$%Q%C%A$rA4$F%W%C%7%e$9$k(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
674 \label{ex:mq:qpush-a}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
675 \end{figure}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
676
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
677 %\subsection{Safety checks, and overriding them}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
678 \subsection{$B0BA4@-%A%'%C%/$H%*!<%P%i%$%I(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
679
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
680 Several MQ commands check the working directory before they do
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
681 anything, and fail if they find any modifications. They do this to
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
682 ensure that you won't lose any changes that you have made, but not yet
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
683 incorporated into a patch. Figure~\ref{ex:mq:add} illustrates this;
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
684 the \hgxcmd{mq}{qnew} command will not create a new patch if there are
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
685 outstanding changes, caused in this case by the \hgcmd{add} of
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
686 \filename{file3}.
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
687
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
688 \begin{figure}[ht]
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
689 \interaction{mq.tutorial.add}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
690 \caption{Forcibly creating a patch}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
691 \label{ex:mq:add}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
692 \end{figure}
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
693
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
694 Commands that check the working directory all take an ``I know what
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
695 I'm doing'' option, which is always named \option{-f}. The exact
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
696 meaning of \option{-f} depends on the command. For example,
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
697 \hgcmdargs{qnew}{\hgxopt{mq}{qnew}{-f}} will incorporate any outstanding
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
698 changes into the new patch it creates, but
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
699 \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-f}} will revert modifications to any
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
700 files affected by the patch that it is popping. Be sure to read the
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
701 documentation for a command's \option{-f} option before you use it!
8
a25335b56825 Progress on MQ tutorial.
Bryan O'Sullivan <bos@serpentine.com>
parents: 7
diff changeset
702
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
703 %\subsection{Working on several patches at once}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
704 \subsection{$BJ#?t$N%Q%C%A$r0lEY$K07$&(B}
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
705
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
706 The \hgxcmd{mq}{qrefresh} command always refreshes the \emph{topmost}
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
707 applied patch. This means that you can suspend work on one patch (by
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
708 refreshing it), pop or push to make a different patch the top, and
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
709 work on \emph{that} patch for a while.
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
710
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
711 Here's an example that illustrates how you can use this ability.
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
712 Let's say you're developing a new feature as two patches. The first
18
e6f4088ebe52 Generate a PDF file with a feedback link on each paragraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 17
diff changeset
713 is a change to the core of your software, and the second---layered on
e6f4088ebe52 Generate a PDF file with a feedback link on each paragraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 17
diff changeset
714 top of the first---changes the user interface to use the code you just
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
715 added to the core. If you notice a bug in the core while you're
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
716 working on the UI patch, it's easy to fix the core. Simply
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
717 \hgxcmd{mq}{qrefresh} the UI patch to save your in-progress changes, and
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
718 \hgxcmd{mq}{qpop} down to the core patch. Fix the core bug,
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
719 \hgxcmd{mq}{qrefresh} the core patch, and \hgxcmd{mq}{qpush} back to the UI
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
720 patch to continue where you left off.
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
721
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
722 %\section{More about patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
723 \section{$B$5$i$K%Q%C%A$K$D$$$F(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
724 \label{sec:mq:adv-patch}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
725
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
726 MQ uses the GNU \command{patch} command to apply patches, so it's
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
727 helpful to know a few more detailed aspects of how \command{patch}
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
728 works, and about patches themselves.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
729
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
730 %\subsection{The strip count}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
731 \subsection{$B%9%H%j%C%W%+%&%s%H(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
732
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
733 If you look at the file headers in a patch, you will notice that the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
734 pathnames usually have an extra component on the front that isn't
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
735 present in the actual path name. This is a holdover from the way that
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
736 people used to generate patches (people still do this, but it's
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
737 somewhat rare with modern revision control tools).
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
738
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
739 Alice would unpack a tarball, edit her files, then decide that she
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
740 wanted to create a patch. So she'd rename her working directory,
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
741 unpack the tarball again (hence the need for the rename), and use the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
742 \cmdopt{diff}{-r} and \cmdopt{diff}{-N} options to \command{diff} to
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
743 recursively generate a patch between the unmodified directory and the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
744 modified one. The result would be that the name of the unmodified
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
745 directory would be at the front of the left-hand path in every file
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
746 header, and the name of the modified directory would be at the front
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
747 of the right-hand path.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
748
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
749 Since someone receiving a patch from the Alices of the net would be
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
750 unlikely to have unmodified and modified directories with exactly the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
751 same names, the \command{patch} command has a \cmdopt{patch}{-p}
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
752 option that indicates the number of leading path name components to
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
753 strip when trying to apply a patch. This number is called the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
754 \emph{strip count}.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
755
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
756 An option of ``\texttt{-p1}'' means ``use a strip count of one''. If
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
757 \command{patch} sees a file name \filename{foo/bar/baz} in a file
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
758 header, it will strip \filename{foo} and try to patch a file named
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
759 \filename{bar/baz}. (Strictly speaking, the strip count refers to the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
760 number of \emph{path separators} (and the components that go with them
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
761 ) to strip. A strip count of one will turn \filename{foo/bar} into
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
762 \filename{bar}, but \filename{/foo/bar} (notice the extra leading
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
763 slash) into \filename{foo/bar}.)
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
764
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
765 The ``standard'' strip count for patches is one; almost all patches
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
766 contain one leading path name component that needs to be stripped.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
767 Mercurial's \hgcmd{diff} command generates path names in this form,
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
768 and the \hgcmd{import} command and MQ expect patches to have a strip
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
769 count of one.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
770
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
771 If you receive a patch from someone that you want to add to your patch
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
772 queue, and the patch needs a strip count other than one, you cannot
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
773 just \hgxcmd{mq}{qimport} the patch, because \hgxcmd{mq}{qimport} does not yet
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
774 have a \texttt{-p} option (see~\bug{311}). Your best bet is to
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
775 \hgxcmd{mq}{qnew} a patch of your own, then use \cmdargs{patch}{-p\emph{N}}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
776 to apply their patch, followed by \hgcmd{addremove} to pick up any
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
777 files added or removed by the patch, followed by \hgxcmd{mq}{qrefresh}.
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
778 This complexity may become unnecessary; see~\bug{311} for details.
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
779
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
780 %\subsection{Strategies for applying a patch}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
781 \subsection{$B%Q%C%AE,MQ$N$?$a$N@oN,(B}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
782
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
783 When \command{patch} applies a hunk, it tries a handful of
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
784 successively less accurate strategies to try to make the hunk apply.
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
785 This falling-back technique often makes it possible to take a patch
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
786 that was generated against an old version of a file, and apply it
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
787 against a newer version of that file.
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
788
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
789 First, \command{patch} tries an exact match, where the line numbers,
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
790 the context, and the text to be modified must apply exactly. If it
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
791 cannot make an exact match, it tries to find an exact match for the
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
792 context, without honouring the line numbering information. If this
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
793 succeeds, it prints a line of output saying that the hunk was applied,
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
794 but at some \emph{offset} from the original line number.
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
795
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
796 If a context-only match fails, \command{patch} removes the first and
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
797 last lines of the context, and tries a \emph{reduced} context-only
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
798 match. If the hunk with reduced context succeeds, it prints a message
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
799 saying that it applied the hunk with a \emph{fuzz factor} (the number
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
800 after the fuzz factor indicates how many lines of context
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
801 \command{patch} had to trim before the patch applied).
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
802
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
803 When neither of these techniques works, \command{patch} prints a
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
804 message saying that the hunk in question was rejected. It saves
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
805 rejected hunks (also simply called ``rejects'') to a file with the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
806 same name, and an added \sfilename{.rej} extension. It also saves an
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
807 unmodified copy of the file with a \sfilename{.orig} extension; the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
808 copy of the file without any extensions will contain any changes made
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
809 by hunks that \emph{did} apply cleanly. If you have a patch that
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
810 modifies \filename{foo} with six hunks, and one of them fails to
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
811 apply, you will have: an unmodified \filename{foo.orig}, a
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
812 \filename{foo.rej} containing one hunk, and \filename{foo}, containing
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
813 the changes made by the five successful five hunks.
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
814
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
815 %\subsection{Some quirks of patch representation}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
816 \subsection{$B%Q%C%AI=8=$N4qL/$JE@(B}
25
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
817
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
818 There are a few useful things to know about how \command{patch} works
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
819 with files.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
820 \begin{itemize}
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
821 \item This should already be obvious, but \command{patch} cannot
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
822 handle binary files.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
823 \item Neither does it care about the executable bit; it creates new
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
824 files as readable, but not executable.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
825 \item \command{patch} treats the removal of a file as a diff between
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
826 the file to be removed and the empty file. So your idea of ``I
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
827 deleted this file'' looks like ``every line of this file was
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
828 deleted'' in a patch.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
829 \item It treats the addition of a file as a diff between the empty
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
830 file and the file to be added. So in a patch, your idea of ``I
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
831 added this file'' looks like ``every line of this file was added''.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
832 \item It treats a renamed file as the removal of the old name, and the
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
833 addition of the new name. This means that renamed files have a big
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
834 footprint in patches. (Note also that Mercurial does not currently
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
835 try to infer when files have been renamed or copied in a patch.)
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
836 \item \command{patch} cannot represent empty files, so you cannot use
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
837 a patch to represent the notion ``I added this empty file to the
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
838 tree''.
9d5b6d303ef5 Make it 2/3 through documenting MQ commands.
Bryan O'Sullivan <bos@serpentine.com>
parents: 19
diff changeset
839 \end{itemize}
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
840
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
841 %\subsection{Beware the fuzz}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
842 \subsection{$B[#Kf$JE@$K$D$$$F(B}
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
843
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
844 While applying a hunk at an offset, or with a fuzz factor, will often
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
845 be completely successful, these inexact techniques naturally leave
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
846 open the possibility of corrupting the patched file. The most common
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
847 cases typically involve applying a patch twice, or at an incorrect
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
848 location in the file. If \command{patch} or \hgxcmd{mq}{qpush} ever
14
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
849 mentions an offset or fuzz factor, you should make sure that the
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
850 modified files are correct afterwards.
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
851
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
852 It's often a good idea to refresh a patch that has applied with an
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
853 offset or fuzz factor; refreshing the patch generates new context
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
854 information that will make it apply cleanly. I say ``often,'' not
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
855 ``always,'' because sometimes refreshing a patch will make it fail to
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
856 apply against a different revision of the underlying files. In some
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
857 cases, such as when you're maintaining a patch that must sit on top of
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
858 multiple versions of a source tree, it's acceptable to have a patch
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
859 apply with some fuzz, provided you've verified the results of the
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
860 patching process in such cases.
e2aa527bafa0 Describe unified diffs
Bryan O'Sullivan <bos@serpentine.com>
parents: 13
diff changeset
861
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
862 %\subsection{Handling rejection}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
863 \subsection{$B%j%8%'%/%H$N<h$j07$$(B}
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
864
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
865 If \hgxcmd{mq}{qpush} fails to apply a patch, it will print an error
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
866 message and exit. If it has left \sfilename{.rej} files behind, it is
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
867 usually best to fix up the rejected hunks before you push more patches
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
868 or do any further work.
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
869
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
870 If your patch \emph{used to} apply cleanly, and no longer does because
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
871 you've changed the underlying code that your patches are based on,
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
872 Mercurial Queues can help; see section~\ref{sec:mq:merge} for details.
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
873
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
874 Unfortunately, there aren't any great techniques for dealing with
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
875 rejected hunks. Most often, you'll need to view the \sfilename{.rej}
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
876 file and edit the target file, applying the rejected hunks by hand.
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
877
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
878 If you're feeling adventurous, Neil Brown, a Linux kernel hacker,
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
879 wrote a tool called \command{wiggle}~\cite{web:wiggle}, which is more
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
880 vigorous than \command{patch} in its attempts to make a patch apply.
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
881
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
882 Another Linux kernel hacker, Chris Mason (the author of Mercurial
254
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
883 Queues), wrote a similar tool called
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
884 \command{mpatch}~\cite{web:mpatch}, which takes a simple approach to
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
885 automating the application of hunks rejected by \command{patch}. The
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
886 \command{mpatch} command can help with four common reasons that a hunk
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
887 may be rejected:
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
888
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
889 \begin{itemize}
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
890 \item The context in the middle of a hunk has changed.
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
891 \item A hunk is missing some context at the beginning or end.
18
e6f4088ebe52 Generate a PDF file with a feedback link on each paragraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 17
diff changeset
892 \item A large hunk might apply better---either entirely or in
e6f4088ebe52 Generate a PDF file with a feedback link on each paragraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 17
diff changeset
893 part---if it was broken up into smaller hunks.
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
894 \item A hunk removes lines with slightly different content than those
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
895 currently present in the file.
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
896 \end{itemize}
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
897
254
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
898 If you use \command{wiggle} or \command{mpatch}, you should be doubly
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
899 careful to check your results when you're done. In fact,
254
7301e64c362e Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
Bryan O'Sullivan <bos@serpentine.com>
parents: 241
diff changeset
900 \command{mpatch} enforces this method of double-checking the tool's
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
901 output, by automatically dropping you into a merge program when it has
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
902 done its job, so that you can verify its work and finish off any
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
903 remaining merges.
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
904
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
905 %\section{Getting the best performance out of MQ}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
906 \section{MQ$B$r:GBg8B$K3hMQ$9$k(B}
27
535e87792eb1 More MQ content and examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 26
diff changeset
907 \label{sec:mq:perf}
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
908
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
909 MQ is very efficient at handling a large number of patches. I ran
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
910 some performance experiments in mid-2006 for a talk that I gave at the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
911 2006 EuroPython conference~\cite{web:europython}. I used as my data
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
912 set the Linux 2.6.17-mm1 patch series, which consists of 1,738
66
81a2f7a639ed Fix typos
Guy Brand <gb@isis.u-strasbg.fr>
parents: 55
diff changeset
913 patches. I applied these on top of a Linux kernel repository
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
914 containing all 27,472 revisions between Linux 2.6.12-rc2 and Linux
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
915 2.6.17.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
916
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
917 On my old, slow laptop, I was able to
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
918 \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}} all 1,738 patches in 3.5 minutes,
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
919 and \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}} them all in 30 seconds. (On a
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
920 newer laptop, the time to push all patches dropped to two minutes.) I
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
921 could \hgxcmd{mq}{qrefresh} one of the biggest patches (which made 22,779
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
922 lines of changes to 287 files) in 6.6 seconds.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
923
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
924 Clearly, MQ is well suited to working in large trees, but there are a
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
925 few tricks you can use to get the best performance of it.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
926
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
927 First of all, try to ``batch'' operations together. Every time you
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
928 run \hgxcmd{mq}{qpush} or \hgxcmd{mq}{qpop}, these commands scan the working
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
929 directory once to make sure you haven't made some changes and then
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
930 forgotten to run \hgxcmd{mq}{qrefresh}. On a small tree, the time that
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
931 this scan takes is unnoticeable. However, on a medium-sized tree
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
932 (containing tens of thousands of files), it can take a second or more.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
933
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
934 The \hgxcmd{mq}{qpush} and \hgxcmd{mq}{qpop} commands allow you to push and pop
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
935 multiple patches at a time. You can identify the ``destination
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
936 patch'' that you want to end up at. When you \hgxcmd{mq}{qpush} with a
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
937 destination specified, it will push patches until that patch is at the
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
938 top of the applied stack. When you \hgxcmd{mq}{qpop} to a destination, MQ
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
939 will pop patches until the destination patch is at the top.
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
940
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
941 You can identify a destination patch using either the name of the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
942 patch, or by number. If you use numeric addressing, patches are
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
943 counted from zero; this means that the first patch is zero, the second
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
944 is one, and so on.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
945
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
946 %\section{Updating your patches when the underlying code changes}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
947 \section{$B2<0L%3!<%I$NJQ2=$K9g$o$;$F%Q%C%A$r99?7$9$k(B}
15
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
948 \label{sec:mq:merge}
b8ac9f312a47 Document wiggle and rej
Bryan O'Sullivan <bos@serpentine.com>
parents: 14
diff changeset
949
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
950 It's common to have a stack of patches on top of an underlying
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
951 repository that you don't modify directly. If you're working on
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
952 changes to third-party code, or on a feature that is taking longer to
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
953 develop than the rate of change of the code beneath, you will often
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
954 need to sync up with the underlying code, and fix up any hunks in your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
955 patches that no longer apply. This is called \emph{rebasing} your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
956 patch series.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
957
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
958 The simplest way to do this is to \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}}
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
959 your patches, then \hgcmd{pull} changes into the underlying
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
960 repository, and finally \hgcmdargs{qpush}{\hgxopt{mq}{qpop}{-a}} your
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
961 patches again. MQ will stop pushing any time it runs across a patch
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
962 that fails to apply during conflicts, allowing you to fix your
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
963 conflicts, \hgxcmd{mq}{qrefresh} the affected patch, and continue pushing
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
964 until you have fixed your entire stack.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
965
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
966 This approach is easy to use and works well if you don't expect
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
967 changes to the underlying code to affect how well your patches apply.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
968 If your patch stack touches code that is modified frequently or
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
969 invasively in the underlying repository, however, fixing up rejected
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
970 hunks by hand quickly becomes tiresome.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
971
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
972 It's possible to partially automate the rebasing process. If your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
973 patches apply cleanly against some revision of the underlying repo, MQ
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
974 can use this information to help you to resolve conflicts between your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
975 patches and a different revision.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
976
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
977 The process is a little involved.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
978 \begin{enumerate}
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
979 \item To begin, \hgcmdargs{qpush}{-a} all of your patches on top of
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
980 the revision where you know that they apply cleanly.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
981 \item Save a backup copy of your patch directory using
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
982 \hgcmdargs{qsave}{\hgxopt{mq}{qsave}{-e} \hgxopt{mq}{qsave}{-c}}. This prints
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
983 the name of the directory that it has saved the patches in. It will
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
984 save the patches to a directory called
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
985 \sdirname{.hg/patches.\emph{N}}, where \texttt{\emph{N}} is a small
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
986 integer. It also commits a ``save changeset'' on top of your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
987 applied patches; this is for internal book-keeping, and records the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
988 states of the \sfilename{series} and \sfilename{status} files.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
989 \item Use \hgcmd{pull} to bring new changes into the underlying
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
990 repository. (Don't run \hgcmdargs{pull}{-u}; see below for why.)
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
991 \item Update to the new tip revision, using
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
992 \hgcmdargs{update}{\hgopt{update}{-C}} to override the patches you
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
993 have pushed.
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
994 \item Merge all patches using \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m}
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
995 \hgxopt{mq}{qpush}{-a}}. The \hgxopt{mq}{qpush}{-m} option to \hgxcmd{mq}{qpush}
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
996 tells MQ to perform a three-way merge if the patch fails to apply.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
997 \end{enumerate}
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
998
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
999 During the \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-m}}, each patch in the
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1000 \sfilename{series} file is applied normally. If a patch applies with
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1001 fuzz or rejects, MQ looks at the queue you \hgxcmd{mq}{qsave}d, and
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1002 performs a three-way merge with the corresponding changeset. This
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1003 merge uses Mercurial's normal merge machinery, so it may pop up a GUI
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1004 merge tool to help you to resolve problems.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1005
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1006 When you finish resolving the effects of a patch, MQ refreshes your
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1007 patch based on the result of the merge.
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1008
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1009 At the end of this process, your repository will have one extra head
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1010 from the old patch queue, and a copy of the old patch queue will be in
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1011 \sdirname{.hg/patches.\emph{N}}. You can remove the extra head using
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1012 \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a} \hgxopt{mq}{qpop}{-n} patches.\emph{N}}
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1013 or \hgcmd{strip}. You can delete \sdirname{.hg/patches.\emph{N}} once
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1014 you are sure that you no longer need it as a backup.
13
5c3966f6991b Add a parapgraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 12
diff changeset
1015
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1016 %\section{Identifying patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1017 \section{$B%Q%C%A$N<1JL(B}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1018
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1019 MQ commands that work with patches let you refer to a patch either by
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1020 using its name or by a number. By name is obvious enough; pass the
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1021 name \filename{foo.patch} to \hgxcmd{mq}{qpush}, for example, and it will
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1022 push patches until \filename{foo.patch} is applied.
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1023
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1024 As a shortcut, you can refer to a patch using both a name and a
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1025 numeric offset; \texttt{foo.patch-2} means ``two patches before
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1026 \texttt{foo.patch}'', while \texttt{bar.patch+4} means ``four patches
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1027 after \texttt{bar.patch}''.
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1028
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1029 Referring to a patch by index isn't much different. The first patch
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1030 printed in the output of \hgxcmd{mq}{qseries} is patch zero (yes, it's one
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1031 of those start-at-zero counting systems); the second is patch one; and
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1032 so on
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1033
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1034 MQ also makes it easy to work with patches when you are using normal
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1035 Mercurial commands. Every command that accepts a changeset ID will
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1036 also accept the name of an applied patch. MQ augments the tags
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1037 normally in the repository with an eponymous one for each applied
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1038 patch. In addition, the special tags \index{tags!special tag
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1039 names!\texttt{qbase}}\texttt{qbase} and \index{tags!special tag
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1040 names!\texttt{qtip}}\texttt{qtip} identify the ``bottom-most'' and
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1041 topmost applied patches, respectively.
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1042
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1043 These additions to Mercurial's normal tagging capabilities make
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1044 dealing with patches even more of a breeze.
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1045 \begin{itemize}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1046 \item Want to patchbomb a mailing list with your latest series of
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1047 changes?
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1048 \begin{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1049 hg email qbase:qtip
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1050 \end{codesample4}
231
28ddbf9f3729 Use new \hgxcmd and \hgxopt commands in a few places.
Bryan O'Sullivan <bos@serpentine.com>
parents: 224
diff changeset
1051 (Don't know what ``patchbombing'' is? See
28ddbf9f3729 Use new \hgxcmd and \hgxopt commands in a few places.
Bryan O'Sullivan <bos@serpentine.com>
parents: 224
diff changeset
1052 section~\ref{sec:hgext:patchbomb}.)
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1053 \item Need to see all of the patches since \texttt{foo.patch} that
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1054 have touched files in a subdirectory of your tree?
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1055 \begin{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1056 hg log -r foo.patch:qtip \emph{subdir}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1057 \end{codesample4}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1058 \end{itemize}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1059
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1060 Because MQ makes the names of patches available to the rest of
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1061 Mercurial through its normal internal tag machinery, you don't need to
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1062 type in the entire name of a patch when you want to identify it by
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1063 name.
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1064
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1065 \begin{figure}[ht]
155
914babdc99c8 run-example: better error if bogus section name found.
Bryan O'Sullivan <bos@serpentine.com>
parents: 106
diff changeset
1066 \interaction{mq.id.output}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1067 \caption{Using MQ's tag features to work with patches}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1068 \label{ex:mq:id}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1069 \end{figure}
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1070
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1071 Another nice consequence of representing patch names as tags is that
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1072 when you run the \hgcmd{log} command, it will display a patch's name
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1073 as a tag, simply as part of its normal output. This makes it easy to
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1074 visually distinguish applied patches from underlying ``normal''
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1075 revisions. Figure~\ref{ex:mq:id} shows a few normal Mercurial
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1076 commands in use with applied patches.
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1077
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1078 %\section{Useful things to know about}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1079 \section{$BCN$C$F$*$/$Y$-$$$/$D$+$NE@(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1080
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1081 There are a number of aspects of MQ usage that don't fit tidily into
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1082 sections of their own, but that are good to know. Here they are, in
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1083 one place.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1084
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1085 \begin{itemize}
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1086 \item Normally, when you \hgxcmd{mq}{qpop} a patch and \hgxcmd{mq}{qpush} it
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1087 again, the changeset that represents the patch after the pop/push
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1088 will have a \emph{different identity} than the changeset that
224
34943a3d50d6 Start writing up extensions. Begin with inotify.
Bryan O'Sullivan <bos@serpentine.com>
parents: 155
diff changeset
1089 represented the hash beforehand. See
34943a3d50d6 Start writing up extensions. Begin with inotify.
Bryan O'Sullivan <bos@serpentine.com>
parents: 155
diff changeset
1090 section~\ref{sec:mqref:cmd:qpush} for information as to why this is.
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1091 \item It's not a good idea to \hgcmd{merge} changes from another
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1092 branch with a patch changeset, at least if you want to maintain the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1093 ``patchiness'' of that changeset and changesets below it on the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1094 patch stack. If you try to do this, it will appear to succeed, but
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1095 MQ will become confused.
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1096 \end{itemize}
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1097
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1098 %\section{Managing patches in a repository}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1099 \section{$B%j%]%8%H%jFb$G$N%Q%C%A$N4IM}(B}
106
9cbc5d0db542 Finish off advanced MQ chapter (maybe).
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
1100 \label{sec:mq:repo}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1101
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1102 Because MQ's \sdirname{.hg/patches} directory resides outside a
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1103 Mercurial repository's working directory, the ``underlying'' Mercurial
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1104 repository knows nothing about the management or presence of patches.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1105
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1106 This presents the interesting possibility of managing the contents of
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1107 the patch directory as a Mercurial repository in its own right. This
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1108 can be a useful way to work. For example, you can work on a patch for
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1109 a while, \hgxcmd{mq}{qrefresh} it, then \hgcmd{commit} the current state of
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1110 the patch. This lets you ``roll back'' to that version of the patch
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1111 later on.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1112
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1113 You can then share different versions of the same patch stack among
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1114 multiple underlying repositories. I use this when I am developing a
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1115 Linux kernel feature. I have a pristine copy of my kernel sources for
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1116 each of several CPU architectures, and a cloned repository under each
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1117 that contains the patches I am working on. When I want to test a
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1118 change on a different architecture, I push my current patches to the
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1119 patch repository associated with that kernel tree, pop and push all of
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1120 my patches, and build and test that kernel.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1121
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1122 Managing patches in a repository makes it possible for multiple
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1123 developers to work on the same patch series without colliding with
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1124 each other, all on top of an underlying source base that they may or
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1125 may not control.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1126
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1127 %\subsection{MQ support for patch repositories}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1128 \subsection{MQ$B$K$h$k%Q%C%A%j%]%8%H%j%5%]!<%H(B}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1129
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1130 MQ helps you to work with the \sdirname{.hg/patches} directory as a
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1131 repository; when you prepare a repository for working with patches
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1132 using \hgxcmd{mq}{qinit}, you can pass the \hgxopt{mq}{qinit}{-c} option to
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1133 create the \sdirname{.hg/patches} directory as a Mercurial repository.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1134
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1135 \begin{note}
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1136 If you forget to use the \hgxopt{mq}{qinit}{-c} option, you can simply go
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1137 into the \sdirname{.hg/patches} directory at any time and run
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1138 \hgcmd{init}. Don't forget to add an entry for the
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1139 \sfilename{status} file to the \sfilename{.hgignore} file, though
104
32bf9a5f22c0 Refactor MQ chapter into three.
Bryan O'Sullivan <bos@serpentine.com>
parents: 66
diff changeset
1140
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1141 (\hgcmdargs{qinit}{\hgxopt{mq}{qinit}{-c}} does this for you
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1142 automatically); you \emph{really} don't want to manage the
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1143 \sfilename{status} file.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1144 \end{note}
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1145
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1146 As a convenience, if MQ notices that the \dirname{.hg/patches}
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1147 directory is a repository, it will automatically \hgcmd{add} every
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1148 patch that you create and import.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1149
283
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1150 MQ provides a shortcut command, \hgxcmd{mq}{qcommit}, that runs
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1151 \hgcmd{commit} in the \sdirname{.hg/patches} directory. This saves
283
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1152 some bothersome typing.
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1153
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1154 Finally, as a convenience to manage the patch directory, you can
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1155 define the alias \command{mq} on Unix systems. For example, on Linux
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1156 systems using the \command{bash} shell, you can include the following
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1157 snippet in your \tildefile{.bashrc}.
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1158
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1159 \begin{codesample2}
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1160 alias mq=`hg -R \$(hg root)/.hg/patches'
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1161 \end{codesample2}
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1162
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1163 You can then issue commands of the form \cmdargs{mq}{pull} from
4ed483f08e33 Mention how to define mq alias.
Faheem Mitha <faheem@email.unc.edu>
parents: 282
diff changeset
1164 the main repository.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1165
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1166 %\subsection{A few things to watch out for}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1167 \subsection{$B4F;k$7$F$*$/$Y$-$$$/$D$+$NE@(B}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1168
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1169 MQ's support for working with a repository full of patches is limited
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1170 in a few small respects.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1171
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1172 MQ cannot automatically detect changes that you make to the patch
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1173 directory. If you \hgcmd{pull}, manually edit, or \hgcmd{update}
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1174 changes to patches or the \sfilename{series} file, you will have to
234
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1175 \hgcmdargs{qpop}{\hgxopt{mq}{qpop}{-a}} and then
30e97616d808 Tag all MQ command options as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 233
diff changeset
1176 \hgcmdargs{qpush}{\hgxopt{mq}{qpush}{-a}} in the underlying repository to
17
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1177 see those changes show up there. If you forget to do this, you can
2668e15c76e9 MQ: write up patch rebasing.
Bryan O'Sullivan <bos@serpentine.com>
parents: 16
diff changeset
1178 confuse MQ's idea of which patches are applied.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1179
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1180 %\section{Third party tools for working with patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1181 \section{$B%Q%C%A8~$1%5!<%I%Q!<%F%#%D!<%k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1182 \label{sec:mq:tools}
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1183
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1184 Once you've been working with patches for a while, you'll find
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1185 yourself hungry for tools that will help you to understand and
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1186 manipulate the patches you're dealing with.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1187
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1188 The \command{diffstat} command~\cite{web:diffstat} generates a
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1189 histogram of the modifications made to each file in a patch. It
18
e6f4088ebe52 Generate a PDF file with a feedback link on each paragraph.
Bryan O'Sullivan <bos@serpentine.com>
parents: 17
diff changeset
1190 provides a good way to ``get a sense of'' a patch---which files it
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1191 affects, and how much change it introduces to each file and as a
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1192 whole. (I find that it's a good idea to use \command{diffstat}'s
241
09d5897ad935 Fix a few more errors in the index.
Bryan O'Sullivan <bos@serpentine.com>
parents: 235
diff changeset
1193 \cmdopt{diffstat}{-p} option as a matter of course, as otherwise it
09d5897ad935 Fix a few more errors in the index.
Bryan O'Sullivan <bos@serpentine.com>
parents: 235
diff changeset
1194 will try to do clever things with prefixes of file names that
09d5897ad935 Fix a few more errors in the index.
Bryan O'Sullivan <bos@serpentine.com>
parents: 235
diff changeset
1195 inevitably confuse at least me.)
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1196
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1197 \begin{figure}[ht]
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1198 \interaction{mq.tools.tools}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1199 \caption{The \command{diffstat}, \command{filterdiff}, and \command{lsdiff} commands}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1200 \label{ex:mq:tools}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1201 \end{figure}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1202
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1203 The \package{patchutils} package~\cite{web:patchutils} is invaluable.
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1204 It provides a set of small utilities that follow the ``Unix
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1205 philosophy;'' each does one useful thing with a patch. The
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1206 \package{patchutils} command I use most is \command{filterdiff}, which
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1207 extracts subsets from a patch file. For example, given a patch that
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1208 modifies hundreds of files across dozens of directories, a single
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1209 invocation of \command{filterdiff} can generate a smaller patch that
106
9cbc5d0db542 Finish off advanced MQ chapter (maybe).
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
1210 only touches files whose names match a particular glob pattern. See
9cbc5d0db542 Finish off advanced MQ chapter (maybe).
Bryan O'Sullivan <bos@serpentine.com>
parents: 104
diff changeset
1211 section~\ref{mq-collab:tips:interdiff} for another example.
16
81454425eee9 Progress on a few fronts, mainly indexing and MQ chapter content
Bryan O'Sullivan <bos@serpentine.com>
parents: 15
diff changeset
1212
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1213 %\section{Good ways to work with patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1214 \section{$B9%$^$7$$%Q%C%A<h$j07$$J}K!(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1215
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1216 Whether you are working on a patch series to submit to a free software
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1217 or open source project, or a series that you intend to treat as a
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1218 sequence of regular changesets when you're done, you can use some
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1219 simple techniques to keep your work well organised.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1220
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1221 Give your patches descriptive names. A good name for a patch might be
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1222 \filename{rework-device-alloc.patch}, because it will immediately give
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1223 you a hint what the purpose of the patch is. Long names shouldn't be
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1224 a problem; you won't be typing the names often, but you \emph{will} be
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1225 running commands like \hgxcmd{mq}{qapplied} and \hgxcmd{mq}{qtop} over and over.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1226 Good naming becomes especially important when you have a number of
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1227 patches to work with, or if you are juggling a number of different
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1228 tasks and your patches only get a fraction of your attention.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1229
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1230 Be aware of what patch you're working on. Use the \hgxcmd{mq}{qtop}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1231 command and skim over the text of your patches frequently---for
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1232 example, using \hgcmdargs{tip}{\hgopt{tip}{-p}})---to be sure of where
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1233 you stand. I have several times worked on and \hgxcmd{mq}{qrefresh}ed a
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1234 patch other than the one I intended, and it's often tricky to migrate
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1235 changes into the right patch after making them in the wrong one.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1236
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1237 For this reason, it is very much worth investing a little time to
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1238 learn how to use some of the third-party tools I described in
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1239 section~\ref{sec:mq:tools}, particularly \command{diffstat} and
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1240 \command{filterdiff}. The former will give you a quick idea of what
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1241 changes your patch is making, while the latter makes it easy to splice
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1242 hunks selectively out of one patch and into another.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1243
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1244 %\section{MQ cookbook}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1245 \section{MQ$B%/%C%/%V%C%/(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1246
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1247 %\subsection{Manage ``trivial'' patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1248 \subsection{``$B%H%j%S%"%k(B''$B$J%Q%C%A$N4IM}(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1249
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1250 Because the overhead of dropping files into a new Mercurial repository
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1251 is so low, it makes a lot of sense to manage patches this way even if
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1252 you simply want to make a few changes to a source tarball that you
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1253 downloaded.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1254
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1255 Begin by downloading and unpacking the source tarball,
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1256 and turning it into a Mercurial repository.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1257 \interaction{mq.tarball.download}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1258
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1259 Continue by creating a patch stack and making your changes.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1260 \interaction{mq.tarball.qinit}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1261
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1262 Let's say a few weeks or months pass, and your package author releases
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1263 a new version. First, bring their changes into the repository.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1264 \interaction{mq.tarball.newsource}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1265 The pipeline starting with \hgcmd{locate} above deletes all files in
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1266 the working directory, so that \hgcmd{commit}'s
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1267 \hgopt{commit}{--addremove} option can actually tell which files have
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1268 really been removed in the newer version of the source.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1269
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1270 Finally, you can apply your patches on top of the new tree.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1271 \interaction{mq.tarball.repush}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1272
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1273 %\subsection{Combining entire patches}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1274 \subsection{$B%Q%C%AF1;N$r7k9g$9$k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1275 \label{sec:mq:combine}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1276
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1277 MQ provides a command, \hgxcmd{mq}{qfold} that lets you combine entire
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1278 patches. This ``folds'' the patches you name, in the order you name
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1279 them, into the topmost applied patch, and concatenates their
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1280 descriptions onto the end of its description. The patches that you
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1281 fold must be unapplied before you fold them.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1282
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1283 The order in which you fold patches matters. If your topmost applied
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1284 patch is \texttt{foo}, and you \hgxcmd{mq}{qfold} \texttt{bar} and
55
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1285 \texttt{quux} into it, you will end up with a patch that has the same
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1286 effect as if you applied first \texttt{foo}, then \texttt{bar},
3f0176046fdc Document qfold.
Bryan O'Sullivan <bos@serpentine.com>
parents: 53
diff changeset
1287 followed by \texttt{quux}.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1288
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1289 %\subsection{Merging part of one patch into another}
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1290 \subsection{$B%Q%C%A$N0lItJ,$rJL$N%Q%C%A$X%^!<%8$9$k(B}
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1291
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1292 Merging \emph{part} of one patch into another is more difficult than
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1293 combining entire patches.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1294
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1295 If you want to move changes to entire files, you can use
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1296 \command{filterdiff}'s \cmdopt{filterdiff}{-i} and
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1297 \cmdopt{filterdiff}{-x} options to choose the modifications to snip
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1298 out of one patch, concatenating its output onto the end of the patch
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1299 you want to merge into. You usually won't need to modify the patch
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1300 you've merged the changes from. Instead, MQ will report some rejected
233
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1301 hunks when you \hgxcmd{mq}{qpush} it (from the hunks you moved into the
696b1e0c01df Tag all MQ commands as belonging to the mq extension.
Bryan O'Sullivan <bos@serpentine.com>
parents: 231
diff changeset
1302 other patch), and you can simply \hgxcmd{mq}{qrefresh} the patch to drop
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1303 the duplicate hunks.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1304
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1305 If you have a patch that has multiple hunks modifying a file, and you
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1306 only want to move a few of those hunks, the job becomes more messy,
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1307 but you can still partly automate it. Use \cmdargs{lsdiff}{-nvv} to
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1308 print some metadata about the patch.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1309 \interaction{mq.tools.lsdiff}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1310
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1311 This command prints three different kinds of number:
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1312 \begin{itemize}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1313 \item (in the first column) a \emph{file number} to identify each file
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1314 modified in the patch;
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1315 \item (on the next line, indented) the line number within a modified
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1316 file where a hunk starts; and
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1317 \item (on the same line) a \emph{hunk number} to identify that hunk.
19
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1318 \end{itemize}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1319
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1320 You'll have to use some visual inspection, and reading of the patch,
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1321 to identify the file and hunk numbers you'll want, but you can then
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1322 pass them to to \command{filterdiff}'s \cmdopt{filterdiff}{--files}
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1323 and \cmdopt{filterdiff}{--hunks} options, to select exactly the file
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1324 and hunk you want to extract.
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1325
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1326 Once you have this hunk, you can concatenate it onto the end of your
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1327 destination patch and continue with the remainder of
187702df428b Piles of new content for MQ chapter - cookbook stuff.
Bryan O'Sullivan <bos@serpentine.com>
parents: 18
diff changeset
1328 section~\ref{sec:mq:combine}.
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1329
322
4301500fca37 started mq.tex. it's a quite massive chank.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 293
diff changeset
1330 %\section{Differences between quilt and MQ}
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1331 \section{quilt$B$H(BMQ$B$N0c$$(B}
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1332
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1333 %If you are already familiar with quilt, MQ provides a similar command
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1334 %set. There are a few differences in the way that it works.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1335
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1336 $B$9$G$K(Bquilt$B$KFk@w$s$G$$$k%f!<%6$N$?$a$K!$(BMQ$B$OF1MM$N%3%^%s%I%;%C%H$rMQ0U(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1337 $B$7$F$$$k!%%3%^%s%I$N5sF0$K$O2?E@$+0c$$$,$"$k!%(B
26
1bc6c1f0192a More MQ content.
Bryan O'Sullivan <bos@serpentine.com>
parents: 25
diff changeset
1338
325
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1339 %You will already have noticed that most quilt commands have MQ
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1340 %counterparts that simply begin with a ``\texttt{q}''. The exceptions
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1341 %are quilt's \texttt{add} and \texttt{remove} commands, the
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1342 %counterparts for which are the normal Mercurial \hgcmd{add} and
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1343 %\hgcmd{remove} commands. There is no MQ equivalent of the quilt
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1344 %\texttt{edit} command.
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1345
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1346 $B$9$G$K$[$H$s$I$N(Bquilt$B%3%^%s%I$K$O!$BP1~$9$k(B``\texttt{q}''$B$G;O$^$k(BMQ$B%3%^%s(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1347 $B%I$,$"$k$3$H$K5$$E$$$F$$$k$3$H$H;W$&!%Nc30$O!$(Bquilt$B$N(B\texttt{add}$B%3%^%s%I(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1348 $B$H(B\texttt{remove}$B%3%^%s%I$G!$$3$l$i$K$O$=$l$>$lDL>o$N(BMercurial$B%3%^%s%I$N(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1349 \hgcmd{add}$B$H(B\hgcmd{remove}$B$,BP1~$9$k!%$^$?!$(Bquilt$B$N(B\texttt{edit}$B%3%^%s%I(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1350 $B$KBP1~$9$k(BMQ$B%3%^%s%I$O$J$$!%(B
a8269a1b9164 more mq.tex
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 324
diff changeset
1351
50
8b0d389cf6e0 Update MQ chapter to match recent bug fixes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 46
diff changeset
1352
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1353 %%% Local Variables:
293
3b1291f24c0d - replaved latex-mode to yatex-mode
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents: 290
diff changeset
1354 %%% mode: yatex
1
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1355 %%% TeX-master: "00book"
04e469de601e Early content for chapter on MQ.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1356 %%% End: