equal
deleted
inserted
replaced
1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
2 .. Logilab SA <contact@logilab.fr> |
2 .. Logilab SA <contact@logilab.fr> |
3 |
3 |
4 ------------------------------------------- |
4 ----------------------------------- |
5 From MQ To Evolve, The Refugee Book |
5 From MQ To Evolve, The Refugee Book |
6 ------------------------------------------- |
6 ----------------------------------- |
7 |
7 |
8 Cheat sheet |
8 Cheat sheet |
9 ------------- |
9 ----------- |
10 |
10 |
11 ============================== ============================================ |
11 ============================== ============================================ |
12 mq command new equivalent |
12 mq command new equivalent |
13 ============================== ============================================ |
13 ============================== ============================================ |
14 qseries ``log`` |
14 qseries ``log`` |
26 qimport -- |
26 qimport -- |
27 ============================== ============================================ |
27 ============================== ============================================ |
28 |
28 |
29 |
29 |
30 Replacement details |
30 Replacement details |
31 --------------------- |
31 ------------------- |
32 |
32 |
33 hg qseries |
33 hg qseries |
34 ``````````` |
34 `````````` |
35 |
35 |
36 All your work in progress is now in real changesets all the time. |
36 All your work in progress is now in real changesets all the time. |
37 |
37 |
38 You can use the standard log command to display them. You can use the |
38 You can use the standard log command to display them. You can use the |
39 phase revset to display unfinished work only, and use templates to have |
39 phase revset to display unfinished work only, and use templates to have |
43 |
43 |
44 [alias] |
44 [alias] |
45 wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' |
45 wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' |
46 |
46 |
47 hg qnew |
47 hg qnew |
48 ```````` |
48 ``````` |
49 |
49 |
50 With evolve you handle standard changesets without an additional overlay. |
50 With evolve you handle standard changesets without an additional overlay. |
51 |
51 |
52 Standard changeset are created using hg commit as usual:: |
52 Standard changeset are created using hg commit as usual:: |
53 |
53 |
64 |
64 |
65 [phases] |
65 [phases] |
66 new-commit=secret |
66 new-commit=secret |
67 |
67 |
68 hg qref |
68 hg qref |
69 ```````` |
69 ``````` |
70 |
70 |
71 A new command from evolution will allow you to rewrite the changeset you are |
71 A new command from evolution will allow you to rewrite the changeset you are |
72 currently on. Just call: |
72 currently on. Just call: |
73 |
73 |
74 $ hg amend |
74 $ hg amend |
88 .. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' |
88 .. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' |
89 |
89 |
90 .. note: refresh is an alias for amend |
90 .. note: refresh is an alias for amend |
91 |
91 |
92 hg qref --exclude |
92 hg qref --exclude |
93 ````````````````````` |
93 ````````````````` |
94 |
94 |
95 To remove changes from your current commit use:: |
95 To remove changes from your current commit use:: |
96 |
96 |
97 $ hg uncommit not-ready.txt |
97 $ hg uncommit not-ready.txt |
98 |
98 |
99 |
99 |
100 hg qpop |
100 hg qpop |
101 ````````` |
101 ``````` |
102 |
102 |
103 The following command emulates the behavior of hg qpop: |
103 The following command emulates the behavior of hg qpop: |
104 |
104 |
105 $ hg gdown |
105 $ hg gdown |
106 |
106 |
134 note: using graft allows you to pick the changeset you want next as the --move |
134 note: using graft allows you to pick the changeset you want next as the --move |
135 option of qpush do. |
135 option of qpush do. |
136 |
136 |
137 |
137 |
138 hg qrm |
138 hg qrm |
139 ``````` |
139 `````` |
140 |
140 |
141 evolution introduce a new command to mark a changeset as "not wanted anymore".:: |
141 evolution introduce a new command to mark a changeset as "not wanted anymore".:: |
142 |
142 |
143 $ hg prune <revset> |
143 $ hg prune <revset> |
144 |
144 |
145 hg qfold |
145 hg qfold |
146 ````````` |
146 ```````` |
147 |
147 |
148 |
148 |
149 :: |
149 :: |
150 |
150 |
151 $ hg fold first::last |
151 $ hg fold first::last |
152 |
152 |
153 hg qdiff |
153 hg qdiff |
154 ````````` |
154 ```````` |
155 |
155 |
156 ``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ. |
156 ``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ. |
157 |
157 |
158 |
158 |
159 |
159 |
160 hg qfinish and hg qimport |
160 hg qfinish and hg qimport |
161 ```````````````````````````` |
161 ````````````````````````` |
162 |
162 |
163 These are not necessary anymore. If you want to control the |
163 These are not necessary anymore. If you want to control the |
164 mutability of changesets, see the phase feature. |
164 mutability of changesets, see the phase feature. |
165 |
165 |
166 |
166 |
167 |
167 |
168 hg qcommit |
168 hg qcommit |
169 ``````````````` |
169 `````````` |
170 |
170 |
171 If you really need to send patches through versioned mq patches, you should |
171 If you really need to send patches through versioned mq patches, you should |
172 look at the qsync extension. |
172 look at the qsync extension. |