Mercurial > hg

comparison tests/test-subrepo-recursion.t @ 15520:d6d7b56ec346

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add missing '(glob)'s to match '\' in paths in test output on windows
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 16 Nov 2011 03:45:14 +0100
parents 9910f60a37ee
children 2b8d5c55ae67
comparison
equal deleted inserted replaced
15519:bb9ad375b51c 15520:d6d7b56ec346
21 Add files --- .hgsub files must go first to trigger subrepos: 21 Add files --- .hgsub files must go first to trigger subrepos:
22 22
23 $ hg add -S .hgsub 23 $ hg add -S .hgsub
24 $ hg add -S foo/.hgsub 24 $ hg add -S foo/.hgsub
25 $ hg add -S foo/bar 25 $ hg add -S foo/bar
26 adding foo/bar/z.txt 26 adding foo/bar/z.txt (glob)
27 $ hg add -S 27 $ hg add -S
28 adding x.txt 28 adding x.txt
29 adding foo/y.txt 29 adding foo/y.txt (glob)
30 30
31 Test recursive status without committing anything: 31 Test recursive status without committing anything:
32 32
33 $ hg status -S 33 $ hg status -S
34 A .hgsub 34 A .hgsub
65 65
66 The --subrepos flag overwrite the config setting: 66 The --subrepos flag overwrite the config setting:
67 67
68 $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos 68 $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
69 committing subrepository foo 69 committing subrepository foo
70 committing subrepository foo/bar 70 committing subrepository foo/bar (glob)
71 71
72 $ cd foo 72 $ cd foo
73 $ echo y2 >> y.txt 73 $ echo y2 >> y.txt
74 $ hg commit -m 0-1-0 74 $ hg commit -m 0-1-0
75 75
184 Cleanup and final commit: 184 Cleanup and final commit:
185 185
186 $ rm -r dir 186 $ rm -r dir
187 $ hg commit --subrepos -m 2-3-2 187 $ hg commit --subrepos -m 2-3-2
188 committing subrepository foo 188 committing subrepository foo
189 committing subrepository foo/bar 189 committing subrepository foo/bar (glob)
190 190
191 Log with the relationships between repo and its subrepo: 191 Log with the relationships between repo and its subrepo:
192 192
193 $ hg log --template '{rev}:{node|short} {desc}\n' 193 $ hg log --template '{rev}:{node|short} {desc}\n'
194 2:1326fa26d0c0 2-3-2 194 2:1326fa26d0c0 2-3-2
340 archiving (foo/bar) [ ] 0/1 (glob) 340 archiving (foo/bar) [ ] 0/1 (glob)
341 archiving (foo/bar) [================================>] 1/1 (glob) 341 archiving (foo/bar) [================================>] 1/1 (glob)
342 archiving (foo/bar) [================================>] 1/1 (glob) 342 archiving (foo/bar) [================================>] 1/1 (glob)
343 343
344 cloning subrepo foo from $TESTTMP/repo/foo 344 cloning subrepo foo from $TESTTMP/repo/foo
345 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar 345 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
346 346
347 The newly cloned subrepos contain no working copy: 347 The newly cloned subrepos contain no working copy:
348 348
349 $ hg -R foo summary 349 $ hg -R foo summary
350 parent: -1:000000000000 (no revision checked out) 350 parent: -1:000000000000 (no revision checked out)
363 $ cd ../almost-empty 363 $ cd ../almost-empty
364 $ mkdir foo 364 $ mkdir foo
365 $ echo f > foo/f 365 $ echo f > foo/f
366 $ hg archive --subrepos -r tip archive 366 $ hg archive --subrepos -r tip archive
367 cloning subrepo foo from $TESTTMP/empty/foo 367 cloning subrepo foo from $TESTTMP/empty/foo
368 abort: destination '$TESTTMP/almost-empty/foo' is not empty 368 abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob)
369 [255] 369 [255]
370 370
371 Clone and test outgoing: 371 Clone and test outgoing:
372 372
373 $ cd .. 373 $ cd ..
374 $ hg clone repo repo2 374 $ hg clone repo repo2
375 updating to branch default 375 updating to branch default
376 cloning subrepo foo from $TESTTMP/repo/foo 376 cloning subrepo foo from $TESTTMP/repo/foo
377 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar 377 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
378 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 378 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
379 $ cd repo2 379 $ cd repo2
380 $ hg outgoing -S 380 $ hg outgoing -S
381 comparing with $TESTTMP/repo 381 comparing with $TESTTMP/repo (glob)
382 searching for changes 382 searching for changes
383 no changes found 383 no changes found
384 comparing with $TESTTMP/repo/foo 384 comparing with $TESTTMP/repo/foo
385 searching for changes 385 searching for changes
386 no changes found 386 no changes found
402 y3 402 y3
403 +y4 403 +y4
404 $ hg commit --subrepos -m 3-4-2 404 $ hg commit --subrepos -m 3-4-2
405 committing subrepository foo 405 committing subrepository foo
406 $ hg outgoing -S 406 $ hg outgoing -S
407 comparing with $TESTTMP/repo 407 comparing with $TESTTMP/repo (glob)
408 searching for changes 408 searching for changes
409 changeset: 3:2655b8ecc4ee 409 changeset: 3:2655b8ecc4ee
410 tag: tip 410 tag: tip
411 user: test 411 user: test
412 date: Thu Jan 01 00:00:00 1970 +0000 412 date: Thu Jan 01 00:00:00 1970 +0000
432 $ echo 'default = ../repo2' >> .hg/hgrc 432 $ echo 'default = ../repo2' >> .hg/hgrc
433 433
434 Test incoming: 434 Test incoming:
435 435
436 $ hg incoming -S 436 $ hg incoming -S
437 comparing with $TESTTMP/repo2 437 comparing with $TESTTMP/repo2 (glob)
438 searching for changes 438 searching for changes
439 changeset: 3:2655b8ecc4ee 439 changeset: 3:2655b8ecc4ee
440 tag: tip 440 tag: tip
441 user: test 441 user: test
442 date: Thu Jan 01 00:00:00 1970 +0000 442 date: Thu Jan 01 00:00:00 1970 +0000