Mercurial: tests/test-subrepo-recursion.t annotate

annotate tests/test-subrepo-recursion.t @ 25397:0b6dee81ebb7

test-import: sync with 6084926366b9 for platforms without execbit

author	Matt Harbison <matt_harbison@yahoo.com>
date	Mon, 01 Jun 2015 22:41:07 -0400
parents	d78dea2248b1
children	95f490136e75

rev	line source
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	1 Create test repository:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	2
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	3 $ hg init repo
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	4 $ cd repo
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	5 $ echo x1 > x.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	6
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	7 $ hg init foo
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	8 $ cd foo
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	9 $ echo y1 > y.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	10
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	11 $ hg init bar
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	12 $ cd bar
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	13 $ echo z1 > z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	14
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	15 $ cd ..
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	16 $ echo 'bar = bar' > .hgsub
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	17
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	18 $ cd ..
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	19 $ echo 'foo = foo' > .hgsub
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	20
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	21 Add files --- .hgsub files must go first to trigger subrepos:
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	22
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	23 $ hg add -S .hgsub
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	24 $ hg add -S foo/.hgsub
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	25 $ hg add -S foo/bar
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	26 adding foo/bar/z.txt (glob)
12270 166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	27 $ hg add -S
166b9866580a add: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12175 diff changeset	28 adding x.txt
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	29 adding foo/y.txt (glob)
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	30
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	31 Test recursive status without committing anything:
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	32
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	33 $ hg status -S
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	34 A .hgsub
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	35 A foo/.hgsub
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	36 A foo/bar/z.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	37 A foo/y.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	38 A x.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	39
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	40 Test recursive diff without committing anything:
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	41
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	42 $ hg diff --nodates -S foo
12175 c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	43 diff -r 000000000000 foo/.hgsub
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	44 --- /dev/null
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	45 +++ b/foo/.hgsub
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	46 @@ -0,0 +1,1 @@
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	47 +bar = bar
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	48 diff -r 000000000000 foo/y.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	49 --- /dev/null
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	50 +++ b/foo/y.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	51 @@ -0,0 +1,1 @@
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	52 +y1
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	53 diff -r 000000000000 foo/bar/z.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	54 --- /dev/null
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	55 +++ b/foo/bar/z.txt
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	56 @@ -0,0 +1,1 @@
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	57 +z1
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	58
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	59 Commits:
c0a8f9dea0f6 subrepos: handle modified but uncommitted .hgsub Martin Geisler <mg@lazybytes.net> parents: 12167 diff changeset	60
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	61 $ hg commit -m fails
24470 76b0b0fed2e3 subrepo: add dirtyreason to centralize composing dirty reason message FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24464 diff changeset	62 abort: uncommitted changes in subrepository 'foo'
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	63 (use --subrepos for recursive commit)
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	64 [255]
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	65
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	66 The --subrepos flag overwrite the config setting:
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	67
e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	68 $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	69 committing subrepository foo
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	70 committing subrepository foo/bar (glob)
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	71
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	72 $ cd foo
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	73 $ echo y2 >> y.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	74 $ hg commit -m 0-1-0
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	75
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	76 $ cd bar
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	77 $ echo z2 >> z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	78 $ hg commit -m 0-1-1
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	79
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	80 $ cd ..
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	81 $ hg commit -m 0-2-1
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	82
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	83 $ cd ..
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	84 $ hg commit -m 1-2-1
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	85
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	86 Change working directory:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	87
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	88 $ echo y3 >> foo/y.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	89 $ echo z3 >> foo/bar/z.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	90 $ hg status -S
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	91 M foo/bar/z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	92 M foo/y.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	93 $ hg diff --nodates -S
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	94 diff -r d254738c5f5e foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	95 --- a/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	96 +++ b/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	97 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	98 y1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	99 y2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	100 +y3
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	101 diff -r 9647f22de499 foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	102 --- a/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	103 +++ b/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	104 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	105 z1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	106 z2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	107 +z3
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	108
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	109 Status call crossing repository boundaries:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	110
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	111 $ hg status -S foo/bar/z.txt
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	112 M foo/bar/z.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	113 $ hg status -S -I 'foo/?.txt'
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	114 M foo/y.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	115 $ hg status -S -I '**/?.txt'
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	116 M foo/bar/z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	117 M foo/y.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	118 $ hg diff --nodates -S -I '**/?.txt'
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	119 diff -r d254738c5f5e foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	120 --- a/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	121 +++ b/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	122 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	123 y1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	124 y2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	125 +y3
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	126 diff -r 9647f22de499 foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	127 --- a/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	128 +++ b/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	129 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	130 z1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	131 z2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	132 +z3
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	133
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	134 Status from within a subdirectory:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	135
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	136 $ mkdir dir
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	137 $ cd dir
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	138 $ echo a1 > a.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	139 $ hg status -S
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	140 M foo/bar/z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	141 M foo/y.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	142 ? dir/a.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	143 $ hg diff --nodates -S
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	144 diff -r d254738c5f5e foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	145 --- a/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	146 +++ b/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	147 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	148 y1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	149 y2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	150 +y3
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	151 diff -r 9647f22de499 foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	152 --- a/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	153 +++ b/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	154 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	155 z1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	156 z2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	157 +z3
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	158
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	159 Status with relative path:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	160
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	161 $ hg status -S ..
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	162 M ../foo/bar/z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	163 M ../foo/y.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	164 ? a.txt
23958 df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	165
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	166 XXX: filtering lfilesrepo.status() in 3.3-rc causes these files to be listed as
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	167 added instead of modified.
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	168 $ hg status -S .. --config extensions.largefiles=
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	169 M ../foo/bar/z.txt
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	170 M ../foo/y.txt
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	171 ? a.txt
df463ca0adef largefiles: revert to lfilesrepo.status() being an unfiltered method Matt Harbison <matt_harbison@yahoo.com> parents: 18109 diff changeset	172
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	173 $ hg diff --nodates -S ..
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	174 diff -r d254738c5f5e foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	175 --- a/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	176 +++ b/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	177 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	178 y1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	179 y2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	180 +y3
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	181 diff -r 9647f22de499 foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	182 --- a/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	183 +++ b/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	184 @@ -1,2 +1,3 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	185 z1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	186 z2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	187 +z3
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	188 $ cd ..
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	189
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	190 Cleanup and final commit:
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	191
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	192 $ rm -r dir
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	193 $ hg commit --subrepos -m 2-3-2
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	194 committing subrepository foo
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	195 committing subrepository foo/bar (glob)
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	196
15910 2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	197 Test explicit path commands within subrepos: add/forget
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	198 $ echo z1 > foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	199 $ hg status -S
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	200 ? foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	201 $ hg add foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	202 $ hg status -S
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	203 A foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	204 $ hg forget foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	205 $ hg status -S
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	206 ? foo/bar/z2.txt
16070 f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	207 $ hg forget foo/bar/z2.txt
16540 4fe8eb4a6e2c tests: add missing accept of native pathname separator Mads Kiilerich <mads@kiilerich.com> parents: 16351 diff changeset	208 not removing foo/bar/z2.txt: file is already untracked (glob)
16070 f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	209 [1]
f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	210 $ hg status -S
f11eee00c652 forget: show warning messages for forgetting in subrepo correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15912 diff changeset	211 ? foo/bar/z2.txt
15910 2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	212 $ rm foo/bar/z2.txt
2b8d5c55ae67 tests: add subrepo recursion tests for add/forget with explicit paths David M. Carr <david@carrclan.us> parents: 15520 diff changeset	213
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	214 Log with the relationships between repo and its subrepo:
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	215
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	216 $ hg log --template '{rev}:{node\|short} {desc}\n'
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	217 2:1326fa26d0c0 2-3-2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	218 1:4b3c9ff4f66b 1-2-1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	219 0:23376cbba0d8 0-0-0
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	220
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	221 $ hg -R foo log --template '{rev}:{node\|short} {desc}\n'
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	222 3:65903cebad86 2-3-2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	223 2:d254738c5f5e 0-2-1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	224 1:8629ce7dcc39 0-1-0
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	225 0:af048e97ade2 0-0-0
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	226
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	227 $ hg -R foo/bar log --template '{rev}:{node\|short} {desc}\n'
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	228 2:31ecbdafd357 2-3-2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	229 1:9647f22de499 0-1-1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	230 0:4904098473f9 0-0-0
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	231
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	232 Status between revisions:
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	233
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	234 $ hg status -S
41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	235 $ hg status -S --rev 0:1
12166 441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	236 M .hgsubstate
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	237 M foo/.hgsubstate
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	238 M foo/bar/z.txt
441a74b8def1 status: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: diff changeset	239 M foo/y.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	240 $ hg diff --nodates -S -I '**/?.txt' --rev 0:1
12167 d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	241 diff -r af048e97ade2 -r d254738c5f5e foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	242 --- a/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	243 +++ b/foo/y.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	244 @@ -1,1 +1,2 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	245 y1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	246 +y2
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	247 diff -r 4904098473f9 -r 9647f22de499 foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	248 --- a/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	249 +++ b/foo/bar/z.txt
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	250 @@ -1,1 +1,2 @@
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	251 z1
d2c5b0927c28 diff: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12166 diff changeset	252 +z2
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	253
13144 aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	254 Enable progress extension for archive tests:
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	255
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	256 $ cp $HGRCPATH $HGRCPATH.no-progress
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	257 $ cat >> $HGRCPATH <<EOF
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	258 > [extensions]
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	259 > progress =
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	260 > [progress]
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	261 > assume-tty = 1
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	262 > delay = 0
24612 30fc7cf43063 test-subrepo-recursion: set progress.changedelay really high Augie Fackler <augie@google.com> parents: 24470 diff changeset	263 > # set changedelay really large so we don't see nested topics
30fc7cf43063 test-subrepo-recursion: set progress.changedelay really high Augie Fackler <augie@google.com> parents: 24470 diff changeset	264 > changedelay = 30000
13149 735dd8e8a208 progress using tests: disable time estimates to avoid flakiness Augie Fackler <durin42@gmail.com> parents: 13144 diff changeset	265 > format = topic bar number
13144 aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	266 > refresh = 0
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	267 > width = 60
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	268 > EOF
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	269
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	270 Test archiving to a directory tree (the doubled lines in the output
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	271 only show up in the test output, not in real usage):
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	272
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	273 $ hg archive --subrepos ../archive
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	274 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	275 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	276 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	277 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	278 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	279 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	280 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	281 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	282 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	283 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	284 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	285 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	286 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	287 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	288 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	289 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	290 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	291 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	292 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	293 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	294 \r (no-eol) (esc)
17779 f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	295 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	296 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	297 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	298 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	299 \r (no-eol) (esc)
12363 8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	300 $ find ../archive \| sort
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	301 ../archive
12363 8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	302 ../archive/.hg_archival.txt
8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	303 ../archive/.hgsub
8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	304 ../archive/.hgsubstate
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	305 ../archive/foo
12363 8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	306 ../archive/foo/.hgsub
8a5b6383ba02 test-subrepo-recursion: sort archive output for portability Patrick Mezard <pmezard@gmail.com> parents: 12339 diff changeset	307 ../archive/foo/.hgsubstate
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	308 ../archive/foo/bar
f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	309 ../archive/foo/bar/z.txt
f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	310 ../archive/foo/y.txt
f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	311 ../archive/x.txt
f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	312
12339 f85338f509e4 tests: fixup tests using unzip -l Matt Mackall <mpm@selenic.com> parents: 12323 diff changeset	313 Test archiving to zip file (unzip output is unstable):
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	314
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	315 $ hg archive --subrepos --prefix '.' ../archive.zip
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	316 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	317 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	318 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	319 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	320 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	321 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	322 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	323 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	324 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	325 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	326 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	327 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	328 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	329 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	330 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	331 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	332 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	333 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	334 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	335 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	336 \r (no-eol) (esc)
17779 f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	337 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	338 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	339 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	340 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	341 \r (no-eol) (esc)
24963 d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	342
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	343 (unzip date formating is unstable, we do not care about it and glob it out)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	344
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	345 $ unzip -l ../archive.zip
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	346 Archive: ../archive.zip
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	347 Length Date Time Name
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	348 --------- ---------- ----- ----
24963 d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	349 172 ?????????? 00:00 .hg_archival.txt (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	350 10 ?????????? 00:00 .hgsub (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	351 45 ?????????? 00:00 .hgsubstate (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	352 3 ?????????? 00:00 x.txt (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	353 10 ?????????? 00:00 foo/.hgsub (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	354 45 ?????????? 00:00 foo/.hgsubstate (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	355 9 ?????????? 00:00 foo/y.txt (glob)
d78dea2248b1 test-subrepo-recursion: glob out all the date listed by unzip -l Pierre-Yves David <pierre-yves.david@fb.com> parents: 24953 diff changeset	356 9 ?????????? 00:00 foo/bar/z.txt (glob)
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	357 --------- -------
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	358 303 8 files
13144 aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	359
15286 4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	360 Test archiving a revision that references a subrepo that is not yet
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	361 cloned:
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	362
24613 f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	363 #if hardlink
15286 4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	364 $ hg clone -U . ../empty
24440 27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	365 \r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	366 linking [ <=> ] 1\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	367 linking [ <=> ] 2\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	368 linking [ <=> ] 3\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	369 linking [ <=> ] 4\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	370 linking [ <=> ] 5\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	371 linking [ <=> ] 6\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	372 linking [ <=> ] 7\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	373 linking [ <=> ] 8\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	374 \r (no-eol) (esc)
24613 f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	375 #else
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	376 $ hg clone -U . ../empty
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	377 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	378 linking [ <=> ] 1 (no-eol)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	379 #endif
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	380
15286 4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	381 $ cd ../empty
24613 f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	382 #if hardlink
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	383 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	384 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	385 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	386 archiving [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	387 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	388 archiving [=============> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	389 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	390 archiving [===========================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	391 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	392 archiving [==========================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	393 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	394 \r (no-eol) (esc)
24440 27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	395 linking [ <=> ] 1\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	396 linking [ <=> ] 2\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	397 linking [ <=> ] 3\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	398 linking [ <=> ] 4\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	399 linking [ <=> ] 5\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	400 linking [ <=> ] 6\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	401 linking [ <=> ] 7\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	402 linking [ <=> ] 8\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	403 \r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	404 \r (no-eol) (esc)
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	405 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	406 archiving (foo) [ ] 0/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	407 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	408 archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	409 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	410 archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	411 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	412 archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	413 \r (no-eol) (esc)
6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	414 \r (no-eol) (esc)
24440 27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	415 linking [ <=> ] 1\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	416 linking [ <=> ] 2\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	417 linking [ <=> ] 3\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	418 linking [ <=> ] 4\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	419 linking [ <=> ] 5\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	420 linking [ <=> ] 6\r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	421 \r (no-eol) (esc)
27ad6b91f5c2 clone: add progress support to hardlink clones (issue3059) Augie Fackler <augie@google.com> parents: 23958 diff changeset	422 \r (no-eol) (esc)
17779 f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	423 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	424 archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	425 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
f38e2873b48d test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows Mads Kiilerich <mads@kiilerich.com> parents: 17743 diff changeset	426 archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	427 \r (no-eol) (esc)
15286 4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	428 cloning subrepo foo from $TESTTMP/repo/foo
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	429 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
24613 f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	430 #else
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	431 Note there's a slight output glitch on non-hardlink systems: the last
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	432 "linking" progress topic never gets closed, leading to slight output corruption on that platform.
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	433 $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
24613 f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	434 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	435 archiving [ ] 0/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	436 archiving [ ] 0/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	437 archiving [=============> ] 1/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	438 archiving [=============> ] 1/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	439 archiving [===========================> ] 2/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	440 archiving [===========================> ] 2/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	441 archiving [==========================================>] 3/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	442 archiving [==========================================>] 3/3\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	443 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	444 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	445 linking [ <=> ] 1\r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	446 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	447 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	448 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	449 \r (no-eol) (esc)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	450 linking [ <=> ] 1cloning subrepo foo from $TESTTMP/repo/foo
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	451 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
f8bc3de9b343 test-subrepo-recursion: fix output on non-hardlink systems Augie Fackler <augie@google.com> parents: 24612 diff changeset	452 #endif
17743 6047947afb6b tests: drop filtercr.py and use the very explicit '\r (no-eol) (esc)' markup Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	453
24924 41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24613 diff changeset	454 Archive + subrepos uses '/' for all component separators
41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24613 diff changeset	455
41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24613 diff changeset	456 $ tar -tzf ../archive.tar.gz \| sort
24953 5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	457 .hg_archival.txt
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	458 .hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	459 .hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	460 foo/.hgsub
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	461 foo/.hgsubstate
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	462 foo/bar/z.txt
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	463 foo/y.txt
5115d03440f4 archive: drop the leading '.' path component from the prefix (issue4634) Matt Harbison <matt_harbison@yahoo.com> parents: 24924 diff changeset	464 x.txt
24924 41cd8171e58f archive: always use portable path component separators with subrepos Matt Harbison <matt_harbison@yahoo.com> parents: 24613 diff changeset	465
15286 4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	466 The newly cloned subrepos contain no working copy:
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	467
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	468 $ hg -R foo summary
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	469 parent: -1:000000000000 (no revision checked out)
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	470 branch: default
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	471 commit: (clean)
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	472 update: 4 new changesets (update)
4be845e3932c subrepo: pull revisions on demand when archiving hg subrepos Martin Geisler <mg@aragost.com> parents: 14281 diff changeset	473
13144 aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	474 Disable progress extension and cleanup:
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	475
aae2d5cbde64 subrepo: add progress bar support to archive Martin Geisler <mg@aragost.com> parents: 12640 diff changeset	476 $ mv $HGRCPATH.no-progress $HGRCPATH
12323 f00953d9533c subrepo: add support for 'hg archive' Martin Geisler <mg@aragost.com> parents: 12316 diff changeset	477
15287 b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	478 Test archiving when there is a directory in the way for a subrepo
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	479 created by archive:
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	480
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	481 $ hg clone -U . ../almost-empty
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	482 $ cd ../almost-empty
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	483 $ mkdir foo
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	484 $ echo f > foo/f
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	485 $ hg archive --subrepos -r tip archive
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	486 cloning subrepo foo from $TESTTMP/empty/foo
18109 9e3910db4e78 subrepo: append subrepo path to subrepo error messages Angel Ezquerra <angel.ezquerra@gmail.com> parents: 17779 diff changeset	487 abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo) (glob)
15287 b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	488 [255]
b3e19c355ca7 subrepo: abort in hgsubrepo._get if the destination is obstructed Martin Geisler <mg@aragost.com> parents: 15286 diff changeset	489
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	490 Clone and test outgoing:
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	491
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	492 $ cd ..
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	493 $ hg clone repo repo2
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	494 updating to branch default
14281 ccb7240acf32 subrepo: create subrepos using clone instead of pull Martin Geisler <mg@aragost.com> parents: 13343 diff changeset	495 cloning subrepo foo from $TESTTMP/repo/foo
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	496 cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	497 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	498 $ cd repo2
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	499 $ hg outgoing -S
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	500 comparing with $TESTTMP/repo (glob)
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	501 searching for changes
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	502 no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	503 comparing with $TESTTMP/repo/foo
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	504 searching for changes
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	505 no changes found
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	506 comparing with $TESTTMP/repo/foo/bar
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	507 searching for changes
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	508 no changes found
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12275 diff changeset	509 [1]
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	510
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	511 Make nested change:
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	512
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	513 $ echo y4 >> foo/y.txt
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	514 $ hg diff --nodates -S
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	515 diff -r 65903cebad86 foo/y.txt
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	516 --- a/foo/y.txt
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	517 +++ b/foo/y.txt
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	518 @@ -1,3 +1,4 @@
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	519 y1
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	520 y2
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	521 y3
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	522 +y4
15321 e174353e8cda subrepos: abort commit by default if a subrepo is dirty (BC) Martin Geisler <mg@lazybytes.net> parents: 15287 diff changeset	523 $ hg commit --subrepos -m 3-4-2
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	524 committing subrepository foo
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	525 $ hg outgoing -S
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	526 comparing with $TESTTMP/repo (glob)
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	527 searching for changes
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	528 changeset: 3:2655b8ecc4ee
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	529 tag: tip
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	530 user: test
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	531 date: Thu Jan 01 00:00:00 1970 +0000
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	532 summary: 3-4-2
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	533
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	534 comparing with $TESTTMP/repo/foo
12272 42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	535 searching for changes
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	536 changeset: 4:e96193d6cb36
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	537 tag: tip
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	538 user: test
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	539 date: Thu Jan 01 00:00:00 1970 +0000
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	540 summary: 3-4-2
42ecd56399d7 outgoing: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12270 diff changeset	541
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	542 comparing with $TESTTMP/repo/foo/bar
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	543 searching for changes
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	544 no changes found
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	545
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	546
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	547 Switch to original repo and setup default path:
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	548
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	549 $ cd ../repo
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	550 $ echo '[paths]' >> .hg/hgrc
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	551 $ echo 'default = ../repo2' >> .hg/hgrc
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	552
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	553 Test incoming:
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	554
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	555 $ hg incoming -S
15520 d6d7b56ec346 tests: add missing '(glob)'s to match '\' in paths in test output on windows Mads Kiilerich <mads@kiilerich.com> parents: 15447 diff changeset	556 comparing with $TESTTMP/repo2 (glob)
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	557 searching for changes
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	558 changeset: 3:2655b8ecc4ee
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	559 tag: tip
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	560 user: test
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	561 date: Thu Jan 01 00:00:00 1970 +0000
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	562 summary: 3-4-2
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	563
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	564 comparing with $TESTTMP/repo2/foo
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	565 searching for changes
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	566 changeset: 4:e96193d6cb36
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	567 tag: tip
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	568 user: test
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	569 date: Thu Jan 01 00:00:00 1970 +0000
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	570 summary: 3-4-2
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	571
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12591 diff changeset	572 comparing with $TESTTMP/repo2/foo/bar
12400 40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	573 searching for changes
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	574 no changes found
40852b4b910c incoming/outgoing: Fix recursion on sub repositories Erik Zielke <ez@aragost.com> parents: 12376 diff changeset	575
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	576 $ hg incoming -S --bundle incoming.hg
c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	577 abort: cannot combine --bundle and --subrepos
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12275 diff changeset	578 [255]
12274 c02e1ed3d407 incoming: recurse into subrepositories with --subrepos/-S flag Martin Geisler <mg@lazybytes.net> parents: 12272 diff changeset	579
12275 88a42bf5fa46 test-subrepo-recursion: test missing subrepo Martin Geisler <mg@lazybytes.net> parents: 12274 diff changeset	580 Test missing subrepo:
88a42bf5fa46 test-subrepo-recursion: test missing subrepo Martin Geisler <mg@lazybytes.net> parents: 12274 diff changeset	581
88a42bf5fa46 test-subrepo-recursion: test missing subrepo Martin Geisler <mg@lazybytes.net> parents: 12274 diff changeset	582 $ rm -r foo
12588 41fa32a6b6f8 test-subrepo-recursion: deleted default arguments Erik Zielke <ez@aragost.com> parents: 12587 diff changeset	583 $ hg status -S
12503 b4711585a455 subrepo: improve lookup error messages Wagner Bruna <wbruna@softwareexpress.com.br> parents: 12400 diff changeset	584 warning: error "unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'" in subrepository "foo"
13339 22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	585
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	586 Issue2619: IndexError: list index out of range on hg add with subrepos
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	587 The subrepo must sorts after the explicit filename.
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	588
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	589 $ cd ..
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	590 $ hg init test
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	591 $ cd test
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	592 $ hg init x
24464 30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	593 $ echo abc > abc.txt
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	594 $ hg ci -Am "abc"
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	595 adding abc.txt
13339 22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	596 $ echo "x = x" >> .hgsub
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	597 $ hg add .hgsub
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	598 $ touch a x/a
22167be007ed subrepo: fix pruning of subrepo filenames in dirstate (issue2619) trbs <trbs@trbs.net> parents: 12640 diff changeset	599 $ hg add a x/a
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	600
24464 30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	601 $ hg ci -Sm "added x"
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	602 committing subrepository x
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	603 $ echo abc > x/a
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	604 $ hg revert --rev '.^' "set:subrepo('glob:x*')"
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	605 abort: subrepository 'x' does not exist in 25ac2c9b3180!
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	606 [255]
30ddc3cf76df revert: evaluate subrepos to revert against the working directory Matt Harbison <matt_harbison@yahoo.com> parents: 24440 diff changeset	607
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16540 diff changeset	608 $ cd ..

Mercurial > hg

annotate tests/test-subrepo-recursion.t @ 25397:0b6dee81ebb7