Mercurial > hg
comparison tests/test-convert-git.t @ 24327:f7c0556d22d7
test-convert-git: show insane progress bar with octopus merge (issue4169)
This is done as a separate change from the fix so that it's obvious
what is corrected by the bugfix.
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 12 Mar 2015 21:31:52 -0400 |
parents | c63a09b6b337 |
children | 603a8d09e12d |
comparison
equal
deleted
inserted
replaced
24326:637da5711122 | 24327:f7c0556d22d7 |
---|---|
168 > hg -R "$repo" manifest --debug | 168 > hg -R "$repo" manifest --debug |
169 > } | 169 > } |
170 | 170 |
171 full conversion | 171 full conversion |
172 | 172 |
173 $ hg -q convert --datesort git-repo2 fullrepo | 173 $ hg convert --datesort git-repo2 fullrepo \ |
174 > --config extensions.progress= --config progress.assume-tty=1 \ | |
175 > --config progress.delay=0 --config progress.changedelay=0 \ | |
176 > --config progress.refresh=0 --config progress.width=60 | |
177 \r (no-eol) (esc) | |
178 scanning [===> ] 1/9\r (no-eol) (esc) | |
179 scanning [========> ] 2/9\r (no-eol) (esc) | |
180 scanning [=============> ] 3/9\r (no-eol) (esc) | |
181 scanning [==================> ] 4/9\r (no-eol) (esc) | |
182 scanning [=======================> ] 5/9\r (no-eol) (esc) | |
183 scanning [============================> ] 6/9\r (no-eol) (esc) | |
184 scanning [=================================> ] 7/9\r (no-eol) (esc) | |
185 scanning [======================================> ] 8/9\r (no-eol) (esc) | |
186 scanning [===========================================>] 9/9\r (no-eol) (esc) | |
187 \r (no-eol) (esc) | |
188 \r (no-eol) (esc) | |
189 converting [ ] 0/9\r (no-eol) (esc) | |
190 getting files [======================================>] 1/1\r (no-eol) (esc) | |
191 \r (no-eol) (esc) | |
192 \r (no-eol) (esc) | |
193 converting [===> ] 1/9\r (no-eol) (esc) | |
194 getting files [======================================>] 1/1\r (no-eol) (esc) | |
195 \r (no-eol) (esc) | |
196 \r (no-eol) (esc) | |
197 converting [========> ] 2/9\r (no-eol) (esc) | |
198 getting files [======================================>] 1/1\r (no-eol) (esc) | |
199 \r (no-eol) (esc) | |
200 \r (no-eol) (esc) | |
201 converting [=============> ] 3/9\r (no-eol) (esc) | |
202 getting files [======================================>] 1/1\r (no-eol) (esc) | |
203 \r (no-eol) (esc) | |
204 \r (no-eol) (esc) | |
205 converting [=================> ] 4/9\r (no-eol) (esc) | |
206 getting files [======================================>] 1/1\r (no-eol) (esc) | |
207 \r (no-eol) (esc) | |
208 \r (no-eol) (esc) | |
209 converting [======================> ] 5/9\r (no-eol) (esc) | |
210 getting files [========> ] 1/4\r (no-eol) (esc) | |
211 getting files [==================> ] 2/4\r (no-eol) (esc) | |
212 getting files [============================> ] 3/4\r (no-eol) (esc) | |
213 getting files [======================================>] 4/4\r (no-eol) (esc) | |
214 getting files [ <=> ] 5/4\r (no-eol) (esc) | |
215 getting files [ <=> ] 6/4\r (no-eol) (esc) | |
216 getting files [ <=> ] 7/4\r (no-eol) (esc) | |
217 getting files [ <=> ] 8/4\r (no-eol) (esc) | |
218 \r (no-eol) (esc) | |
219 \r (no-eol) (esc) | |
220 converting [===========================> ] 6/9\r (no-eol) (esc) | |
221 getting files [======================================>] 1/1\r (no-eol) (esc) | |
222 \r (no-eol) (esc) | |
223 \r (no-eol) (esc) | |
224 converting [===============================> ] 7/9\r (no-eol) (esc) | |
225 getting files [======================================>] 1/1\r (no-eol) (esc) | |
226 \r (no-eol) (esc) | |
227 \r (no-eol) (esc) | |
228 converting [====================================> ] 8/9\r (no-eol) (esc) | |
229 getting files [==================> ] 1/2\r (no-eol) (esc) | |
230 getting files [======================================>] 2/2\r (no-eol) (esc) | |
231 \r (no-eol) (esc) | |
232 initializing destination fullrepo repository | |
233 scanning source... | |
234 sorting... | |
235 converting... | |
236 8 add foo | |
237 7 change foo | |
238 6 add quux | |
239 5 add bar | |
240 4 add baz | |
241 3 Octopus merge | |
242 2 change bar | |
243 1 change foo | |
244 0 Discard change to foo | |
245 updating bookmarks | |
174 $ hg up -q -R fullrepo | 246 $ hg up -q -R fullrepo |
175 $ glog -R fullrepo | 247 $ glog -R fullrepo |
176 @ 9 "Discard change to foo" files: foo | 248 @ 9 "Discard change to foo" files: foo |
177 |\ | 249 |\ |
178 | o 8 "change foo" files: foo | 250 | o 8 "change foo" files: foo |