comparison tests/test-subrepo-recursion.t @ 25482:95f490136e75

progress: stop double-wrapping of ui class We were wrapping the ui class again and again (uisetup, reposetup, subrepo setup, remote repo setup, etc). We now avoid that. This has impact on tests that were double-printing data because of this.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 07 Jun 2015 18:11:23 -0700
parents d78dea2248b1
children f7b8b4ae2d25
comparison
equal deleted inserted replaced
25481:6de96cb31176 25482:95f490136e75
271 only show up in the test output, not in real usage): 271 only show up in the test output, not in real usage):
272 272
273 $ hg archive --subrepos ../archive 273 $ hg archive --subrepos ../archive
274 \r (no-eol) (esc) 274 \r (no-eol) (esc)
275 archiving [ ] 0/3\r (no-eol) (esc) 275 archiving [ ] 0/3\r (no-eol) (esc)
276 archiving [ ] 0/3\r (no-eol) (esc)
277 archiving [=============> ] 1/3\r (no-eol) (esc)
278 archiving [=============> ] 1/3\r (no-eol) (esc) 276 archiving [=============> ] 1/3\r (no-eol) (esc)
279 archiving [===========================> ] 2/3\r (no-eol) (esc) 277 archiving [===========================> ] 2/3\r (no-eol) (esc)
280 archiving [===========================> ] 2/3\r (no-eol) (esc)
281 archiving [==========================================>] 3/3\r (no-eol) (esc) 278 archiving [==========================================>] 3/3\r (no-eol) (esc)
282 archiving [==========================================>] 3/3\r (no-eol) (esc) 279 \r (no-eol) (esc)
283 \r (no-eol) (esc) 280 \r (no-eol) (esc)
284 \r (no-eol) (esc)
285 archiving (foo) [ ] 0/3\r (no-eol) (esc)
286 archiving (foo) [ ] 0/3\r (no-eol) (esc) 281 archiving (foo) [ ] 0/3\r (no-eol) (esc)
287 archiving (foo) [===========> ] 1/3\r (no-eol) (esc) 282 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
288 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
289 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
290 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc) 283 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
291 archiving (foo) [====================================>] 3/3\r (no-eol) (esc) 284 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
292 archiving (foo) [====================================>] 3/3\r (no-eol) (esc) 285 \r (no-eol) (esc)
293 \r (no-eol) (esc) 286 \r (no-eol) (esc)
294 \r (no-eol) (esc) 287 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
295 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc) 288 archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
296 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
297 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
298 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
299 \r (no-eol) (esc) 289 \r (no-eol) (esc)
300 $ find ../archive | sort 290 $ find ../archive | sort
301 ../archive 291 ../archive
302 ../archive/.hg_archival.txt 292 ../archive/.hg_archival.txt
303 ../archive/.hgsub 293 ../archive/.hgsub
313 Test archiving to zip file (unzip output is unstable): 303 Test archiving to zip file (unzip output is unstable):
314 304
315 $ hg archive --subrepos --prefix '.' ../archive.zip 305 $ hg archive --subrepos --prefix '.' ../archive.zip
316 \r (no-eol) (esc) 306 \r (no-eol) (esc)
317 archiving [ ] 0/3\r (no-eol) (esc) 307 archiving [ ] 0/3\r (no-eol) (esc)
318 archiving [ ] 0/3\r (no-eol) (esc)
319 archiving [=============> ] 1/3\r (no-eol) (esc)
320 archiving [=============> ] 1/3\r (no-eol) (esc) 308 archiving [=============> ] 1/3\r (no-eol) (esc)
321 archiving [===========================> ] 2/3\r (no-eol) (esc) 309 archiving [===========================> ] 2/3\r (no-eol) (esc)
322 archiving [===========================> ] 2/3\r (no-eol) (esc)
323 archiving [==========================================>] 3/3\r (no-eol) (esc) 310 archiving [==========================================>] 3/3\r (no-eol) (esc)
324 archiving [==========================================>] 3/3\r (no-eol) (esc) 311 \r (no-eol) (esc)
325 \r (no-eol) (esc) 312 \r (no-eol) (esc)
326 \r (no-eol) (esc)
327 archiving (foo) [ ] 0/3\r (no-eol) (esc)
328 archiving (foo) [ ] 0/3\r (no-eol) (esc) 313 archiving (foo) [ ] 0/3\r (no-eol) (esc)
329 archiving (foo) [===========> ] 1/3\r (no-eol) (esc) 314 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
330 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
331 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
332 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc) 315 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
333 archiving (foo) [====================================>] 3/3\r (no-eol) (esc) 316 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
334 archiving (foo) [====================================>] 3/3\r (no-eol) (esc) 317 \r (no-eol) (esc)
335 \r (no-eol) (esc) 318 \r (no-eol) (esc)
336 \r (no-eol) (esc) 319 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
337 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc) 320 archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
338 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
339 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
340 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
341 \r (no-eol) (esc) 321 \r (no-eol) (esc)
342 322
343 (unzip date formating is unstable, we do not care about it and glob it out) 323 (unzip date formating is unstable, we do not care about it and glob it out)
344 324
345 $ unzip -l ../archive.zip 325 $ unzip -l ../archive.zip
381 $ cd ../empty 361 $ cd ../empty
382 #if hardlink 362 #if hardlink
383 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz 363 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
384 \r (no-eol) (esc) 364 \r (no-eol) (esc)
385 archiving [ ] 0/3\r (no-eol) (esc) 365 archiving [ ] 0/3\r (no-eol) (esc)
386 archiving [ ] 0/3\r (no-eol) (esc)
387 archiving [=============> ] 1/3\r (no-eol) (esc)
388 archiving [=============> ] 1/3\r (no-eol) (esc) 366 archiving [=============> ] 1/3\r (no-eol) (esc)
389 archiving [===========================> ] 2/3\r (no-eol) (esc) 367 archiving [===========================> ] 2/3\r (no-eol) (esc)
390 archiving [===========================> ] 2/3\r (no-eol) (esc)
391 archiving [==========================================>] 3/3\r (no-eol) (esc)
392 archiving [==========================================>] 3/3\r (no-eol) (esc) 368 archiving [==========================================>] 3/3\r (no-eol) (esc)
393 \r (no-eol) (esc) 369 \r (no-eol) (esc)
394 \r (no-eol) (esc) 370 \r (no-eol) (esc)
395 linking [ <=> ] 1\r (no-eol) (esc) 371 linking [ <=> ] 1\r (no-eol) (esc)
396 linking [ <=> ] 2\r (no-eol) (esc) 372 linking [ <=> ] 2\r (no-eol) (esc)
401 linking [ <=> ] 7\r (no-eol) (esc) 377 linking [ <=> ] 7\r (no-eol) (esc)
402 linking [ <=> ] 8\r (no-eol) (esc) 378 linking [ <=> ] 8\r (no-eol) (esc)
403 \r (no-eol) (esc) 379 \r (no-eol) (esc)
404 \r (no-eol) (esc) 380 \r (no-eol) (esc)
405 archiving (foo) [ ] 0/3\r (no-eol) (esc) 381 archiving (foo) [ ] 0/3\r (no-eol) (esc)
406 archiving (foo) [ ] 0/3\r (no-eol) (esc)
407 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
408 archiving (foo) [===========> ] 1/3\r (no-eol) (esc) 382 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
409 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc) 383 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
410 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
411 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
412 archiving (foo) [====================================>] 3/3\r (no-eol) (esc) 384 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
413 \r (no-eol) (esc) 385 \r (no-eol) (esc)
414 \r (no-eol) (esc) 386 \r (no-eol) (esc)
415 linking [ <=> ] 1\r (no-eol) (esc) 387 linking [ <=> ] 1\r (no-eol) (esc)
416 linking [ <=> ] 2\r (no-eol) (esc) 388 linking [ <=> ] 2\r (no-eol) (esc)
418 linking [ <=> ] 4\r (no-eol) (esc) 390 linking [ <=> ] 4\r (no-eol) (esc)
419 linking [ <=> ] 5\r (no-eol) (esc) 391 linking [ <=> ] 5\r (no-eol) (esc)
420 linking [ <=> ] 6\r (no-eol) (esc) 392 linking [ <=> ] 6\r (no-eol) (esc)
421 \r (no-eol) (esc) 393 \r (no-eol) (esc)
422 \r (no-eol) (esc) 394 \r (no-eol) (esc)
423 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc) 395 archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
424 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc) 396 archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
425 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
426 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
427 \r (no-eol) (esc) 397 \r (no-eol) (esc)
428 cloning subrepo foo from $TESTTMP/repo/foo 398 cloning subrepo foo from $TESTTMP/repo/foo
429 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) 399 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
430 #else 400 #else
431 Note there's a slight output glitch on non-hardlink systems: the last 401 Note there's a slight output glitch on non-hardlink systems: the last