|
1 Test Evolve progress output |
|
2 =========================== |
|
3 |
|
4 $ . "$TESTDIR/testlib/common.sh" |
|
5 $ cat >> $HGRCPATH <<EOF |
|
6 > [extensions] |
|
7 > evolve= |
|
8 > EOF |
|
9 |
|
10 $ hg init progress |
|
11 $ cd progress |
|
12 $ echo a > a |
|
13 $ hg ci -Aqm first |
|
14 $ echo a2 > a |
|
15 $ hg ci -m second |
|
16 $ echo b > b |
|
17 $ hg ci -Aqm third |
|
18 $ echo b2 > b |
|
19 $ hg ci -m fourth |
|
20 |
|
21 Test progress with --all |
|
22 $ hg co -q 'desc("first")' |
|
23 $ hg amend -m 'first v2' |
|
24 3 new orphan changesets |
|
25 $ hg evolve --config progress.debug=yes --debug |
|
26 evolve: 1/3 changesets (33.33%) |
|
27 move:[1] second |
|
28 atop:[4] first v2 |
|
29 evolve: 1/3 changesets (33.33%) |
|
30 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
|
31 evolve: 1/3 changesets (33.33%) |
|
32 resolving manifests |
|
33 branchmerge: True, force: True, partial: False |
|
34 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
|
35 a: remote is newer -> g |
|
36 getting a |
|
37 updating: a 1/1 files (100.00%) |
|
38 committing files: |
|
39 a |
|
40 committing manifest |
|
41 committing changelog |
|
42 updating the branch cache |
|
43 obscache is out of date |
|
44 evolve: 2/3 changesets (66.67%) |
|
45 move:[2] third |
|
46 evolve: 2/3 changesets (66.67%) |
|
47 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
|
48 evolve: 2/3 changesets (66.67%) |
|
49 unmatched files in other: |
|
50 b |
|
51 resolving manifests |
|
52 branchmerge: True, force: True, partial: False |
|
53 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
|
54 b: remote created -> g |
|
55 getting b |
|
56 updating: b 1/1 files (100.00%) |
|
57 committing files: |
|
58 b |
|
59 committing manifest |
|
60 committing changelog |
|
61 updating the branch cache |
|
62 obscache is out of date |
|
63 evolve: 3/3 changesets (100.00%) |
|
64 move:[3] fourth |
|
65 evolve: 3/3 changesets (100.00%) |
|
66 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
|
67 evolve: 3/3 changesets (100.00%) |
|
68 resolving manifests |
|
69 branchmerge: True, force: True, partial: False |
|
70 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
|
71 b: remote is newer -> g |
|
72 getting b |
|
73 updating: b 1/1 files (100.00%) |
|
74 committing files: |
|
75 b |
|
76 committing manifest |
|
77 committing changelog |
|
78 updating the branch cache |
|
79 obscache is out of date |
|
80 invalid branchheads cache (served): tip differs |
|
81 evolve: 4/3 changesets (133.33%) |
|
82 resolving manifests |
|
83 branchmerge: False, force: False, partial: False |
|
84 ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 |
|
85 b: other deleted -> r |
|
86 removing b |
|
87 updating: b 1/2 files (50.00%) |
|
88 a: remote is newer -> g |
|
89 getting a |
|
90 updating: a 2/2 files (100.00%) |
|
91 |
|
92 Test progress with -r |
|
93 $ hg co -q 'desc("first")' |
|
94 $ hg amend -m 'first v3' |
|
95 3 new orphan changesets |
|
96 $ hg evolve -r 'desc("second")' --config progress.debug=yes --debug |
|
97 evolve: 1/1 changesets (100.00%) |
|
98 move:[5] second |
|
99 atop:[8] first v3 |
|
100 evolve: 1/1 changesets (100.00%) |
|
101 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
|
102 evolve: 1/1 changesets (100.00%) |
|
103 resolving manifests |
|
104 branchmerge: True, force: True, partial: False |
|
105 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
|
106 a: remote is newer -> g |
|
107 getting a |
|
108 updating: a 1/1 files (100.00%) |
|
109 committing files: |
|
110 a |
|
111 committing manifest |
|
112 committing changelog |
|
113 updating the branch cache |
|
114 obscache is out of date |
|
115 evolve: 2/1 changesets (200.00%) |
|
116 resolving manifests |
|
117 branchmerge: False, force: False, partial: False |
|
118 ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b |
|
119 a: remote is newer -> g |
|
120 getting a |
|
121 updating: a 1/1 files (100.00%) |
|
122 |
|
123 Test progress with --continue |
|
124 $ hg co -q 'desc("first")' |
|
125 $ echo conflict > a |
|
126 $ hg amend -m 'first v4' |
|
127 1 new orphan changesets |
|
128 $ hg evolve --all --config progress.debug=yes --debug |
|
129 evolve: 1/3 changesets (33.33%) |
|
130 move:[9] second |
|
131 atop:[10] first v4 |
|
132 evolve: 1/3 changesets (33.33%) |
|
133 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
|
134 evolve: 1/3 changesets (33.33%) |
|
135 resolving manifests |
|
136 branchmerge: True, force: True, partial: False |
|
137 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
|
138 preserving a for resolve of a |
|
139 a: versions differ -> m (premerge) |
|
140 updating: a 1/1 files (100.00%) |
|
141 picked tool ':merge' for a (binary False symlink False changedelete False) |
|
142 merging a |
|
143 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
|
144 a: versions differ -> m (merge) |
|
145 updating: a 2/2 files (100.00%) |
|
146 picked tool ':merge' for a (binary False symlink False changedelete False) |
|
147 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
|
148 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
149 fix conflicts and see `hg help evolve.interrupted` |
|
150 [1] |
|
151 $ echo resolved > a |
|
152 $ hg resolve -m a |
|
153 (no more unresolved files) |
|
154 continue: hg evolve --continue |
|
155 $ hg evolve --continue --config progress.debug=yes --debug --no-all |
|
156 evolving 9:df5d742141b0 "second" |
|
157 committing files: |
|
158 a |
|
159 committing manifest |
|
160 committing changelog |
|
161 updating the branch cache |
|
162 obscache is out of date |
|
163 move:[6] third |
|
164 atop:[11] second |
|
165 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
|
166 unmatched files in other: |
|
167 b |
|
168 resolving manifests |
|
169 branchmerge: True, force: True, partial: False |
|
170 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
|
171 b: remote created -> g |
|
172 getting b |
|
173 updating: b 1/1 files (100.00%) |
|
174 committing files: |
|
175 b |
|
176 committing manifest |
|
177 committing changelog |
|
178 updating the branch cache |
|
179 obscache is out of date |
|
180 invalid branchheads cache (served): tip differs |
|
181 move:[7] fourth |
|
182 hg rebase -r 385376d04062 -d b2de95304e32 |
|
183 resolving manifests |
|
184 branchmerge: True, force: True, partial: False |
|
185 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
|
186 b: remote is newer -> g |
|
187 getting b |
|
188 updating: b 1/1 files (100.00%) |
|
189 committing files: |
|
190 b |
|
191 committing manifest |
|
192 committing changelog |
|
193 updating the branch cache |
|
194 obscache is out of date |
|
195 invalid branchheads cache (served): tip differs |
|
196 resolving manifests |
|
197 branchmerge: False, force: False, partial: False |
|
198 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 |
|
199 b: other deleted -> r |
|
200 removing b |
|
201 updating: b 1/2 files (50.00%) |
|
202 a: remote is newer -> g |
|
203 getting a |
|
204 updating: a 2/2 files (100.00%) |
|
205 working directory is now at f8d7d38c0a88 |
|
206 |
|
207 $ cd .. |