Show More
@@ -530,20 +530,22 b' def rematch(el, l):' | |||
|
530 | 530 | return False |
|
531 | 531 | |
|
532 | 532 | def globmatch(el, l): |
|
533 |
# The only supported special characters are * and ? |
|
|
534 | # supported. | |
|
533 | # The only supported special characters are * and ? plus / which also | |
|
534 | # matches \ on windows. Escaping of these caracters is supported. | |
|
535 | 535 | i, n = 0, len(el) |
|
536 | 536 | res = '' |
|
537 | 537 | while i < n: |
|
538 | 538 | c = el[i] |
|
539 | 539 | i += 1 |
|
540 | if c == '\\' and el[i] in '*?\\': | |
|
540 | if c == '\\' and el[i] in '*?\\/': | |
|
541 | 541 | res += el[i - 1:i + 1] |
|
542 | 542 | i += 1 |
|
543 | 543 | elif c == '*': |
|
544 | 544 | res += '.*' |
|
545 | 545 | elif c == '?': |
|
546 | 546 | res += '.' |
|
547 | elif c == '/' and os.name == 'nt': | |
|
548 | res += '[/\\\\]' | |
|
547 | 549 | else: |
|
548 | 550 | res += re.escape(c) |
|
549 | 551 | return rematch(res, l) |
@@ -81,7 +81,7 b' Issue1527: repeated addremove causes uti' | |||
|
81 | 81 | $ hg addremove -s80 |
|
82 | 82 | removing d/a |
|
83 | 83 | adding d/b |
|
84 | recording removal of d/a as rename to d/b (100% similar) | |
|
84 | recording removal of d/a as rename to d/b (100% similar) (glob) | |
|
85 | 85 | $ hg debugstate |
|
86 | 86 | r 0 0 1970-01-01 00:00:00 d/a |
|
87 | 87 | a 0 -1 unset d/b |
@@ -91,10 +91,10 b' Issue1527: repeated addremove causes uti' | |||
|
91 | 91 | no copies found here (since the target isn't in d |
|
92 | 92 | |
|
93 | 93 | $ hg addremove -s80 d |
|
94 | removing d/b | |
|
94 | removing d/b (glob) | |
|
95 | 95 | |
|
96 | 96 | copies here |
|
97 | 97 | |
|
98 | 98 | $ hg addremove -s80 |
|
99 | 99 | adding c |
|
100 | recording removal of d/a as rename to c (100% similar) | |
|
100 | recording removal of d/a as rename to c (100% similar) (glob) |
@@ -5,7 +5,7 b'' | |||
|
5 | 5 | should fail |
|
6 | 6 | |
|
7 | 7 | $ hg add .hg/00changelog.i |
|
8 | abort: path contains illegal component: .hg/00changelog.i | |
|
8 | abort: path contains illegal component: .hg/00changelog.i (glob) | |
|
9 | 9 | [255] |
|
10 | 10 | |
|
11 | 11 | $ mkdir a |
@@ -18,7 +18,7 b' should fail' | |||
|
18 | 18 | should fail |
|
19 | 19 | |
|
20 | 20 | $ hg add b/b |
|
21 | abort: path 'b/b' traverses symbolic link 'b' | |
|
21 | abort: path 'b/b' traverses symbolic link 'b' (glob) | |
|
22 | 22 | [255] |
|
23 | 23 | |
|
24 | 24 | should succeed |
@@ -28,7 +28,7 b' should succeed' | |||
|
28 | 28 | should still fail - maybe |
|
29 | 29 | |
|
30 | 30 | $ hg add b/b |
|
31 | abort: path 'b/b' traverses symbolic link 'b' | |
|
31 | abort: path 'b/b' traverses symbolic link 'b' (glob) | |
|
32 | 32 | [255] |
|
33 | 33 | |
|
34 | 34 | unbundle tampered bundle |
@@ -45,7 +45,7 b' commit added file that has been deleted' | |||
|
45 | 45 | $ mkdir dir |
|
46 | 46 | $ echo boo > dir/file |
|
47 | 47 | $ hg add |
|
48 | adding dir/file | |
|
48 | adding dir/file (glob) | |
|
49 | 49 | $ hg -v commit -m commit-9 dir |
|
50 | 50 | dir/file |
|
51 | 51 | committed changeset 2:d2a76177cb42 |
@@ -115,8 +115,8 b' partial subdir commit test' | |||
|
115 | 115 | $ mkdir bar |
|
116 | 116 | $ echo bar > bar/bar |
|
117 | 117 | $ hg add |
|
118 | adding bar/bar | |
|
119 | adding foo/foo | |
|
118 | adding bar/bar (glob) | |
|
119 | adding foo/foo (glob) | |
|
120 | 120 | $ hg ci -m commit-subdir-1 foo |
|
121 | 121 | $ hg ci -m commit-subdir-2 bar |
|
122 | 122 |
@@ -107,7 +107,7 b' Compare repos:' | |||
|
107 | 107 | Test shrink-revlog: |
|
108 | 108 | $ cd repo-a |
|
109 | 109 | $ hg --config extensions.shrink=$CONTRIBDIR/shrink-revlog.py shrink |
|
110 | shrinking $TESTTMP/repo-a/.hg/store/00manifest.i | |
|
110 | shrinking $TESTTMP/repo-a/.hg/store/00manifest.i (glob) | |
|
111 | 111 | reading revs |
|
112 | 112 | sorting revs |
|
113 | 113 | writing revs |
@@ -115,8 +115,8 b' Test shrink-revlog:' | |||
|
115 | 115 | new file size: 324 bytes ( 0.0 MiB) |
|
116 | 116 | shrinkage: 0.0% (1.0x) |
|
117 | 117 | note: old revlog saved in: |
|
118 | $TESTTMP/repo-a/.hg/store/00manifest.i.old | |
|
119 | $TESTTMP/repo-a/.hg/store/00manifest.d.old | |
|
118 | $TESTTMP/repo-a/.hg/store/00manifest.i.old (glob) | |
|
119 | $TESTTMP/repo-a/.hg/store/00manifest.d.old (glob) | |
|
120 | 120 | (You can delete those files when you are satisfied that your |
|
121 | 121 | repository is still sane. Running 'hg verify' is strongly recommended.) |
|
122 | 122 | $ hg verify |
@@ -27,7 +27,7 b' Explicit --authors' | |||
|
27 | 27 | sorting... |
|
28 | 28 | converting... |
|
29 | 29 | 0 foo |
|
30 | Writing author map file $TESTTMP/new/.hg/authormap | |
|
30 | Writing author map file $TESTTMP/new/.hg/authormap (glob) | |
|
31 | 31 | $ cat new/.hg/authormap |
|
32 | 32 | user name=Long User Name |
|
33 | 33 | $ hg -Rnew log |
@@ -44,7 +44,7 b' Implicit .hg/authormap' | |||
|
44 | 44 | $ hg init new |
|
45 | 45 | $ mv authormap.txt new/.hg/authormap |
|
46 | 46 | $ hg convert orig new |
|
47 | Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored | |
|
47 | Ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob) | |
|
48 | 48 | scanning source... |
|
49 | 49 | sorting... |
|
50 | 50 | converting... |
@@ -18,7 +18,7 b'' | |||
|
18 | 18 | Push should push to 'default' when 'default-push' not set: |
|
19 | 19 | |
|
20 | 20 | $ hg --cwd b push |
|
21 | pushing to $TESTTMP/a | |
|
21 | pushing to $TESTTMP/a (glob) | |
|
22 | 22 | searching for changes |
|
23 | 23 | adding changesets |
|
24 | 24 | adding manifests |
@@ -29,7 +29,7 b" Push should push to 'default-push' when " | |||
|
29 | 29 | |
|
30 | 30 | $ echo 'default-push = ../c' >> b/.hg/hgrc |
|
31 | 31 | $ hg --cwd b push |
|
32 | pushing to $TESTTMP/c | |
|
32 | pushing to $TESTTMP/c (glob) | |
|
33 | 33 | searching for changes |
|
34 | 34 | adding changesets |
|
35 | 35 | adding manifests |
@@ -11,9 +11,9 b'' | |||
|
11 | 11 | adding a/b/c/d/y |
|
12 | 12 | adding a/b/c/d/z |
|
13 | 13 | $ hg mv a z |
|
14 | moving a/b/c/d/x to z/b/c/d/x | |
|
15 | moving a/b/c/d/y to z/b/c/d/y | |
|
16 | moving a/b/c/d/z to z/b/c/d/z | |
|
14 | moving a/b/c/d/x to z/b/c/d/x (glob) | |
|
15 | moving a/b/c/d/y to z/b/c/d/y (glob) | |
|
16 | moving a/b/c/d/z to z/b/c/d/z (glob) | |
|
17 | 17 | $ cd .. |
|
18 | 18 | |
|
19 | 19 | Issue1790: dirstate entry locked into unset if file mtime is set into |
@@ -473,7 +473,7 b' Broken disabled extension and command:' | |||
|
473 | 473 | > cmdtable = None |
|
474 | 474 | > EOF |
|
475 | 475 | $ hg --config extensions.path=./path.py help foo > /dev/null |
|
476 | warning: error finding commands in $TESTTMP/hgext/forest.py | |
|
476 | warning: error finding commands in $TESTTMP/hgext/forest.py (glob) | |
|
477 | 477 | hg: unknown command 'foo' |
|
478 | warning: error finding commands in $TESTTMP/hgext/forest.py | |
|
478 | warning: error finding commands in $TESTTMP/hgext/forest.py (glob) | |
|
479 | 479 | [255] |
@@ -14,7 +14,7 b' Testing a.i/b:' | |||
|
14 | 14 | $ mkdir a.i |
|
15 | 15 | $ echo "some other text" > a.i/b |
|
16 | 16 | $ hg add |
|
17 | adding a.i/b | |
|
17 | adding a.i/b (glob) | |
|
18 | 18 | $ hg ci -m second |
|
19 | 19 | $ cat .hg/store/fncache | sort |
|
20 | 20 | data/a.i |
@@ -25,7 +25,7 b' Testing a.i.hg/c:' | |||
|
25 | 25 | $ mkdir a.i.hg |
|
26 | 26 | $ echo "yet another text" > a.i.hg/c |
|
27 | 27 | $ hg add |
|
28 | adding a.i.hg/c | |
|
28 | adding a.i.hg/c (glob) | |
|
29 | 29 | $ hg ci -m third |
|
30 | 30 | $ cat .hg/store/fncache | sort |
|
31 | 31 | data/a.i |
@@ -44,7 +44,7 b' Should display baz only:' | |||
|
44 | 44 | |
|
45 | 45 | $ echo "*.o" > .hgignore |
|
46 | 46 | $ hg status |
|
47 | abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o | |
|
47 | abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob) | |
|
48 | 48 | [255] |
|
49 | 49 | |
|
50 | 50 | $ echo ".*\.o" > .hgignore |
@@ -88,7 +88,7 b' Check it does not ignore the current dir' | |||
|
88 | 88 | |
|
89 | 89 | $ echo "syntax: invalid" > .hgignore |
|
90 | 90 | $ hg status |
|
91 | $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' | |
|
91 | $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob) | |
|
92 | 92 | A dir/b.o |
|
93 | 93 | ? .hgignore |
|
94 | 94 | ? a.c |
@@ -26,12 +26,12 b" Issue1199: Can't use '%' in hgrc (eg url" | |||
|
26 | 26 | $ cd foobar |
|
27 | 27 | $ cat .hg/hgrc |
|
28 | 28 | [paths] |
|
29 | default = $TESTTMP/foo%bar | |
|
29 | default = $TESTTMP/foo%bar (glob) | |
|
30 | 30 | $ hg paths |
|
31 | default = $TESTTMP/foo%bar | |
|
31 | default = $TESTTMP/foo%bar (glob) | |
|
32 | 32 | $ hg showconfig |
|
33 | bundle.mainreporoot=$TESTTMP/foobar | |
|
34 | paths.default=$TESTTMP/foo%bar | |
|
33 | bundle.mainreporoot=$TESTTMP/foobar (glob) | |
|
34 | paths.default=$TESTTMP/foo%bar (glob) | |
|
35 | 35 | $ cd .. |
|
36 | 36 | |
|
37 | 37 | issue1829: wrong indentation |
@@ -1,8 +1,8 b'' | |||
|
1 | 1 | hg debuginstall |
|
2 | 2 | $ hg debuginstall |
|
3 | 3 | Checking encoding (ascii)... |
|
4 |
Checking installed modules (* |
|
|
5 |
Checking templates (* |
|
|
4 | Checking installed modules (*mercurial)... (glob) | |
|
5 | Checking templates (*mercurial?templates)... (glob) | |
|
6 | 6 | Checking commit editor... |
|
7 | 7 | Checking username... |
|
8 | 8 | No problems detected |
@@ -10,8 +10,8 b' hg debuginstall' | |||
|
10 | 10 | hg debuginstall with no username |
|
11 | 11 | $ HGUSER= hg debuginstall |
|
12 | 12 | Checking encoding (ascii)... |
|
13 |
Checking installed modules (* |
|
|
14 |
Checking templates (* |
|
|
13 | Checking installed modules (*mercurial)... (glob) | |
|
14 | Checking templates (*mercurial?templates)... (glob) | |
|
15 | 15 | Checking commit editor... |
|
16 | 16 | Checking username... |
|
17 | 17 | no username supplied (see "hg help config") |
@@ -7,7 +7,7 b' http://mercurial.selenic.com/bts/issue10' | |||
|
7 | 7 | adding a/b |
|
8 | 8 | |
|
9 | 9 | $ hg rm a |
|
10 | removing a/b | |
|
10 | removing a/b (glob) | |
|
11 | 11 | $ hg ci -m m a |
|
12 | 12 | |
|
13 | 13 | $ mkdir a b |
@@ -16,7 +16,7 b' http://mercurial.selenic.com/bts/issue10' | |||
|
16 | 16 | adding a/b |
|
17 | 17 | |
|
18 | 18 | $ hg rm a |
|
19 | removing a/b | |
|
19 | removing a/b (glob) | |
|
20 | 20 | $ cd b |
|
21 | 21 | |
|
22 | 22 | Relative delete: |
@@ -13,7 +13,7 b' Initialize repository' | |||
|
13 | 13 | $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" |
|
14 | 14 | $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" |
|
15 | 15 | $ hg -R foo1 pull -u |
|
16 | pulling from $TESTTMP/foo | |
|
16 | pulling from $TESTTMP/foo (glob) | |
|
17 | 17 | searching for changes |
|
18 | 18 | adding changesets |
|
19 | 19 | adding manifests |
@@ -29,7 +29,7 b' Pull. Bookmark should not jump to new he' | |||
|
29 | 29 | |
|
30 | 30 | $ echo "there" >> foo/a && hg -R foo commit -m "edited a again" |
|
31 | 31 | $ hg -R foo1 pull |
|
32 | pulling from $TESTTMP/foo | |
|
32 | pulling from $TESTTMP/foo (glob) | |
|
33 | 33 | searching for changes |
|
34 | 34 | adding changesets |
|
35 | 35 | adding manifests |
@@ -7,7 +7,7 b' http://mercurial.selenic.com/bts/issue61' | |||
|
7 | 7 | adding src/a.c |
|
8 | 8 | |
|
9 | 9 | $ hg mv src source |
|
10 | moving src/a.c to source/a.c | |
|
10 | moving src/a.c to source/a.c (glob) | |
|
11 | 11 | |
|
12 | 12 | $ hg ci -Ammove |
|
13 | 13 |
@@ -67,9 +67,9 b' Revert all - should succeed:' | |||
|
67 | 67 | |
|
68 | 68 | $ hg revert --all |
|
69 | 69 | undeleting a |
|
70 | forgetting a/a | |
|
70 | forgetting a/a (glob) | |
|
71 | 71 | forgetting b |
|
72 | undeleting b/b | |
|
72 | undeleting b/b (glob) | |
|
73 | 73 | |
|
74 | 74 | $ hg st |
|
75 | 75 |
@@ -210,7 +210,7 b' Pull from bundle and trigger notify' | |||
|
210 | 210 | Message-Id: <hg.a2392c293916*> (glob) |
|
211 | 211 | To: Test |
|
212 | 212 | |
|
213 | changeset a2392c293916 in $TESTTMP/Test | |
|
213 | changeset a2392c293916 in $TESTTMP/Test (glob) | |
|
214 | 214 | details: $TESTTMP/Test?cmd=changeset;node=a2392c293916 |
|
215 | 215 | description: |
|
216 | 216 | addsym |
@@ -233,7 +233,7 b' Pull from bundle and trigger notify' | |||
|
233 | 233 | Message-Id: <hg.ef63ca68695b*> (glob) |
|
234 | 234 | To: Test |
|
235 | 235 | |
|
236 | changeset ef63ca68695b in $TESTTMP/Test | |
|
236 | changeset ef63ca68695b in $TESTTMP/Test (glob) | |
|
237 | 237 | details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b |
|
238 | 238 | description: |
|
239 | 239 | absym |
@@ -799,7 +799,7 b' Clone to test incoming' | |||
|
799 | 799 | > default = ../Test |
|
800 | 800 | > EOF |
|
801 | 801 | $ hg incoming |
|
802 | comparing with $TESTTMP/Test | |
|
802 | comparing with $TESTTMP/Test (glob) | |
|
803 | 803 | searching for changes |
|
804 | 804 | changeset: 2:bb948857c743 |
|
805 | 805 | tag: tip |
@@ -185,8 +185,8 b' Corner cases for adding largefiles.' | |||
|
185 | 185 | $ echo large6 > sub2/large6 |
|
186 | 186 | $ echo large7 > sub2/large7 |
|
187 | 187 | $ hg add --large sub2 |
|
188 | adding sub2/large6 as a largefile | |
|
189 | adding sub2/large7 as a largefile | |
|
188 | adding sub2/large6 as a largefile (glob) | |
|
189 | adding sub2/large7 as a largefile (glob) | |
|
190 | 190 | $ hg st |
|
191 | 191 | M large3 |
|
192 | 192 | A large5 |
@@ -350,7 +350,7 b' revisions (this was a very bad bug that ' | |||
|
350 | 350 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
351 | 351 | getting changed largefiles |
|
352 | 352 | 1 largefiles updated, 0 removed |
|
353 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg | |
|
353 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) | |
|
354 | 354 | nothing to rebase |
|
355 | 355 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
356 | 356 | 9:598410d3eb9a modify normal file largefile in repo d |
@@ -385,7 +385,7 b' revisions (this was a very bad bug that ' | |||
|
385 | 385 | $ hg rebase |
|
386 | 386 | getting changed largefiles |
|
387 | 387 | 1 largefiles updated, 0 removed |
|
388 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg | |
|
388 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) | |
|
389 | 389 | $ hg log |
|
390 | 390 | changeset: 9:598410d3eb9a |
|
391 | 391 | tag: tip |
@@ -555,8 +555,8 b' Now "update check" is happy.' | |||
|
555 | 555 | # XXX we don't really want to report that we're reverting the standin; |
|
556 | 556 | # that's just an implementation detail. But I don't see an obvious fix. ;-( |
|
557 | 557 | $ hg revert sub |
|
558 | reverting .hglf/sub/large4 | |
|
559 | reverting sub/normal4 | |
|
558 | reverting .hglf/sub/large4 (glob) | |
|
559 | reverting sub/normal4 (glob) | |
|
560 | 560 | $ hg status |
|
561 | 561 | M normal3 |
|
562 | 562 | A sub2/large8 |
@@ -568,8 +568,8 b' Now "update check" is happy.' | |||
|
568 | 568 | $ cat sub/large4 |
|
569 | 569 | large4-modified |
|
570 | 570 | $ hg revert -a --no-backup |
|
571 | undeleting .hglf/sub2/large6 | |
|
572 | forgetting .hglf/sub2/large8 | |
|
571 | undeleting .hglf/sub2/large6 (glob) | |
|
572 | forgetting .hglf/sub2/large8 (glob) | |
|
573 | 573 | reverting normal3 |
|
574 | 574 | $ hg status |
|
575 | 575 | ? sub/large4.orig |
@@ -583,11 +583,11 b' Now "update check" is happy.' | |||
|
583 | 583 | |
|
584 | 584 | revert some files to an older revision |
|
585 | 585 | $ hg revert --no-backup -r 8 sub2 |
|
586 | reverting .hglf/sub2/large6 | |
|
586 | reverting .hglf/sub2/large6 (glob) | |
|
587 | 587 | $ cat sub2/large6 |
|
588 | 588 | large6 |
|
589 | 589 | $ hg revert --no-backup sub2 |
|
590 | reverting .hglf/sub2/large6 | |
|
590 | reverting .hglf/sub2/large6 (glob) | |
|
591 | 591 | $ hg status |
|
592 | 592 | |
|
593 | 593 | "verify --large" actually verifies largefiles |
@@ -83,7 +83,7 b' add some changesets to rename/remove/mer' | |||
|
83 | 83 | $ hg commit -q -m"remove large, normal3" |
|
84 | 84 | $ hg merge |
|
85 | 85 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
|
86 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. | |
|
86 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) | |
|
87 | 87 | merging stuff/maybelarge.dat failed! |
|
88 | 88 | merging sub/normal2 and stuff/normal2 to stuff/normal2 |
|
89 | 89 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
@@ -170,7 +170,7 b' lfconvert with rename, merge, and remove' | |||
|
170 | 170 | $ hg share -q -U bigfile-repo shared |
|
171 | 171 | $ printf 'bogus' > shared/.hg/sharedpath |
|
172 | 172 | $ hg lfconvert shared foo |
|
173 | abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! | |
|
173 | abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob) | |
|
174 | 174 | [255] |
|
175 | 175 | $ hg lfconvert bigfile-repo largefiles-repo |
|
176 | 176 | initializing destination largefiles-repo |
@@ -88,33 +88,33 b' Issue294: hg remove --after dir fails wh' | |||
|
88 | 88 | $ rm -r t |
|
89 | 89 | |
|
90 | 90 | $ hg locate 't/**' |
|
91 | t/b | |
|
92 | t/e.h | |
|
93 | t/x | |
|
91 | t/b (glob) | |
|
92 | t/e.h (glob) | |
|
93 | t/x (glob) | |
|
94 | 94 | |
|
95 | 95 | $ mkdir otherdir |
|
96 | 96 | $ cd otherdir |
|
97 | 97 | |
|
98 | 98 | $ hg locate b |
|
99 | ../b | |
|
100 | ../t/b | |
|
99 | ../b (glob) | |
|
100 | ../t/b (glob) | |
|
101 | 101 | $ hg locate '*.h' |
|
102 | ../t.h | |
|
103 | ../t/e.h | |
|
102 | ../t.h (glob) | |
|
103 | ../t/e.h (glob) | |
|
104 | 104 | $ hg locate path:t/x |
|
105 | ../t/x | |
|
105 | ../t/x (glob) | |
|
106 | 106 | $ hg locate 're:.*\.h$' |
|
107 | ../t.h | |
|
108 | ../t/e.h | |
|
107 | ../t.h (glob) | |
|
108 | ../t/e.h (glob) | |
|
109 | 109 | $ hg locate -r 0 b |
|
110 | ../b | |
|
111 | ../t/b | |
|
110 | ../b (glob) | |
|
111 | ../t/b (glob) | |
|
112 | 112 | $ hg locate -r 0 '*.h' |
|
113 | ../t.h | |
|
114 | ../t/e.h | |
|
113 | ../t.h (glob) | |
|
114 | ../t/e.h (glob) | |
|
115 | 115 | $ hg locate -r 0 path:t/x |
|
116 | ../t/x | |
|
116 | ../t/x (glob) | |
|
117 | 117 | $ hg locate -r 0 're:.*\.h$' |
|
118 | ../t.h | |
|
119 | ../t/e.h | |
|
118 | ../t.h (glob) | |
|
119 | ../t/e.h (glob) | |
|
120 | 120 |
@@ -56,7 +56,7 b' Create a patch removing a:' | |||
|
56 | 56 | Save the patch queue so we can merge it later: |
|
57 | 57 | |
|
58 | 58 | $ hg qsave -c -e |
|
59 | copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 | |
|
59 | copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1 (glob) | |
|
60 | 60 | $ checkundo |
|
61 | 61 | |
|
62 | 62 | Update b and commit in an "update" changeset: |
@@ -76,7 +76,7 b' Update b and commit in an "update" chang' | |||
|
76 | 76 | b |
|
77 | 77 | |
|
78 | 78 | $ hg qpush -a -m |
|
79 | merging with queue at: $TESTTMP/t/.hg/patches.1 | |
|
79 | merging with queue at: $TESTTMP/t/.hg/patches.1 (glob) | |
|
80 | 80 | applying rm_a |
|
81 | 81 | now at: rm_a |
|
82 | 82 | |
@@ -115,14 +115,14 b' Classic MQ merge sequence *with an expli' | |||
|
115 | 115 | Create the reference queue: |
|
116 | 116 | |
|
117 | 117 | $ hg qsave -c -e -n refqueue |
|
118 | copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue | |
|
118 | copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue (glob) | |
|
119 | 119 | $ hg up -C 1 |
|
120 | 120 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
121 | 121 | |
|
122 | 122 | Merge: |
|
123 | 123 | |
|
124 | 124 | $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
|
125 | merging with queue at: $TESTTMP/t2/.hg/refqueue | |
|
125 | merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) | |
|
126 | 126 | applying patcha |
|
127 | 127 | patching file a |
|
128 | 128 | Hunk #1 FAILED at 0 |
@@ -39,7 +39,7 b' qpop/qrefresh on the wrong revision' | |||
|
39 | 39 | abort: popping would remove a revision not managed by this patch queue |
|
40 | 40 | [255] |
|
41 | 41 | $ hg qpop -n patches |
|
42 | using patch queue: $TESTTMP/repo/.hg/patches | |
|
42 | using patch queue: $TESTTMP/repo/.hg/patches (glob) | |
|
43 | 43 | abort: popping would remove a revision not managed by this patch queue |
|
44 | 44 | [255] |
|
45 | 45 | $ hg qrefresh |
@@ -137,7 +137,7 b' qinit -c should create both files if the' | |||
|
137 | 137 | guards |
|
138 | 138 | $ cat .hg/patches/series |
|
139 | 139 | $ hg qinit -c |
|
140 | abort: repository $TESTTMP/d/.hg/patches already exists! | |
|
140 | abort: repository $TESTTMP/d/.hg/patches already exists! (glob) | |
|
141 | 141 | [255] |
|
142 | 142 | $ cd .. |
|
143 | 143 | |
@@ -156,8 +156,8 b' qinit -c should create both files if the' | |||
|
156 | 156 | $ echo status >> .hg/patches/.hgignore |
|
157 | 157 | $ echo bleh >> .hg/patches/.hgignore |
|
158 | 158 | $ hg qinit -c |
|
159 | adding .hg/patches/A | |
|
160 | adding .hg/patches/B | |
|
159 | adding .hg/patches/A (glob) | |
|
160 | adding .hg/patches/B (glob) | |
|
161 | 161 | $ hg -R .hg/patches status |
|
162 | 162 | A .hgignore |
|
163 | 163 | A A |
@@ -1193,7 +1193,7 b' repo with unversioned patch dir' | |||
|
1193 | 1193 | |
|
1194 | 1194 | $ cd qclonesource |
|
1195 | 1195 | $ hg qinit -c |
|
1196 | adding .hg/patches/patch1 | |
|
1196 | adding .hg/patches/patch1 (glob) | |
|
1197 | 1197 | $ hg qci -m checkpoint |
|
1198 | 1198 | $ qlog |
|
1199 | 1199 | main repo: |
@@ -1138,7 +1138,7 b' make a new branch and get diff/status ou' | |||
|
1138 | 1138 | updating to branch default |
|
1139 | 1139 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1140 | 1140 | created new head |
|
1141 | moving x/x to y/x | |
|
1141 | moving x/x to y/x (glob) | |
|
1142 | 1142 | ** directory move ** |
|
1143 | 1143 | ** hg mv x y / add y/x x1 / add y/x x2 |
|
1144 | 1144 | - working to parent: |
@@ -11,16 +11,16 b' Should print nothing:' | |||
|
11 | 11 | Should fail: |
|
12 | 12 | |
|
13 | 13 | $ hg st b/x |
|
14 | abort: path 'b/x' is inside nested repo 'b' | |
|
14 | abort: path 'b/x' is inside nested repo 'b' (glob) | |
|
15 | 15 | [255] |
|
16 | 16 | $ hg add b/x |
|
17 | abort: path 'b/x' is inside nested repo 'b' | |
|
17 | abort: path 'b/x' is inside nested repo 'b' (glob) | |
|
18 | 18 | [255] |
|
19 | 19 | |
|
20 | 20 | Should fail: |
|
21 | 21 | |
|
22 | 22 | $ hg add b b/x |
|
23 | abort: path 'b/x' is inside nested repo 'b' | |
|
23 | abort: path 'b/x' is inside nested repo 'b' (glob) | |
|
24 | 24 | [255] |
|
25 | 25 | $ hg st |
|
26 | 26 | |
@@ -34,7 +34,7 b' Should arguably print nothing:' | |||
|
34 | 34 | Should fail: |
|
35 | 35 | |
|
36 | 36 | $ hg mv a b |
|
37 | abort: path 'b/a' is inside nested repo 'b' | |
|
37 | abort: path 'b/a' is inside nested repo 'b' (glob) | |
|
38 | 38 | [255] |
|
39 | 39 | $ hg st |
|
40 | 40 |
@@ -56,11 +56,11 b' push' | |||
|
56 | 56 | Message-Id: <*> (glob) |
|
57 | 57 | To: baz, foo@bar |
|
58 | 58 | |
|
59 | changeset cb9a9f314b8b in $TESTTMP/a | |
|
59 | changeset cb9a9f314b8b in $TESTTMP/a (glob) | |
|
60 | 60 | details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b |
|
61 | 61 | summary: a |
|
62 | 62 | |
|
63 | changeset ba677d0156c1 in $TESTTMP/a | |
|
63 | changeset ba677d0156c1 in $TESTTMP/a (glob) | |
|
64 | 64 | details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 |
|
65 | 65 | summary: b |
|
66 | 66 | |
@@ -107,11 +107,11 b' unbundle with correct source' | |||
|
107 | 107 | Message-Id: <*> (glob) |
|
108 | 108 | To: baz, foo@bar |
|
109 | 109 | |
|
110 | changeset cb9a9f314b8b in $TESTTMP/a | |
|
110 | changeset cb9a9f314b8b in $TESTTMP/a (glob) | |
|
111 | 111 | details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b |
|
112 | 112 | summary: a |
|
113 | 113 | |
|
114 | changeset ba677d0156c1 in $TESTTMP/a | |
|
114 | changeset ba677d0156c1 in $TESTTMP/a (glob) | |
|
115 | 115 | details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 |
|
116 | 116 | summary: b |
|
117 | 117 |
@@ -173,7 +173,7 b' pull (minimal config)' | |||
|
173 | 173 | Message-Id: <*> (glob) |
|
174 | 174 | To: baz, foo@bar |
|
175 | 175 | |
|
176 | changeset 0647d048b600 in $TESTTMP/b | |
|
176 | changeset 0647d048b600 in $TESTTMP/b (glob) | |
|
177 | 177 | details: $TESTTMP/b?cmd=changeset;node=0647d048b600 |
|
178 | 178 | description: b |
|
179 | 179 |
@@ -7,29 +7,29 b'' | |||
|
7 | 7 | $ echo 'dupe = ../b' >> .hg/hgrc |
|
8 | 8 | $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc |
|
9 | 9 | $ hg in dupe |
|
10 | comparing with $TESTTMP/b | |
|
10 | comparing with $TESTTMP/b (glob) | |
|
11 | 11 | no changes found |
|
12 | 12 | [1] |
|
13 | 13 | $ cd .. |
|
14 | 14 | $ hg -R a in dupe |
|
15 | comparing with $TESTTMP/b | |
|
15 | comparing with $TESTTMP/b (glob) | |
|
16 | 16 | no changes found |
|
17 | 17 | [1] |
|
18 | 18 | $ cd a |
|
19 | 19 | $ hg paths |
|
20 | dupe = $TESTTMP/b | |
|
21 | expand = $TESTTMP/a/$SOMETHING/bar | |
|
20 | dupe = $TESTTMP/b (glob) | |
|
21 | expand = $TESTTMP/a/$SOMETHING/bar (glob) | |
|
22 | 22 | $ SOMETHING=foo hg paths |
|
23 | dupe = $TESTTMP/b | |
|
24 | expand = $TESTTMP/a/foo/bar | |
|
23 | dupe = $TESTTMP/b (glob) | |
|
24 | expand = $TESTTMP/a/foo/bar (glob) | |
|
25 | 25 | $ SOMETHING=/foo hg paths |
|
26 | dupe = $TESTTMP/b | |
|
26 | dupe = $TESTTMP/b (glob) | |
|
27 | 27 | expand = /foo/bar |
|
28 | 28 | $ hg paths -q |
|
29 | 29 | dupe |
|
30 | 30 | expand |
|
31 | 31 | $ hg paths dupe |
|
32 | $TESTTMP/b | |
|
32 | $TESTTMP/b (glob) | |
|
33 | 33 | $ hg paths -q dupe |
|
34 | 34 | $ hg paths unknown |
|
35 | 35 | not found! |
@@ -43,7 +43,7 b' don\'t show "(+1 heads)" message when pul' | |||
|
43 | 43 | 2:effea6de0384 |
|
44 | 44 | 1:ed1b79f46b9a |
|
45 | 45 | $ hg pull |
|
46 | pulling from $TESTTMP/repo2 | |
|
46 | pulling from $TESTTMP/repo2 (glob) | |
|
47 | 47 | searching for changes |
|
48 | 48 | adding changesets |
|
49 | 49 | adding manifests |
@@ -40,7 +40,7 b' Expected to fail:' | |||
|
40 | 40 | Expected to fail: |
|
41 | 41 | |
|
42 | 42 | $ hg push |
|
43 | pushing to $TESTTMP/test | |
|
43 | pushing to $TESTTMP/test (glob) | |
|
44 | 44 | searching for changes |
|
45 | 45 | adding changesets |
|
46 | 46 | adding manifests |
@@ -283,7 +283,7 b' Rebasing across null as ancestor' | |||
|
283 | 283 | |
|
284 | 284 | |
|
285 | 285 | $ hg rebase -d 5 -s 7 |
|
286 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg | |
|
286 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) | |
|
287 | 287 | $ hg tglog |
|
288 | 288 | @ 8: 'D' |
|
289 | 289 | | |
@@ -48,7 +48,7 b'' | |||
|
48 | 48 | Now b has one revision to be pulled from a: |
|
49 | 49 | |
|
50 | 50 | $ hg pull --rebase |
|
51 | pulling from $TESTTMP/a | |
|
51 | pulling from $TESTTMP/a (glob) | |
|
52 | 52 | searching for changes |
|
53 | 53 | adding changesets |
|
54 | 54 | adding manifests |
@@ -68,7 +68,7 b' Now b has one revision to be pulled from' | |||
|
68 | 68 | Re-run: |
|
69 | 69 | |
|
70 | 70 | $ hg pull --rebase |
|
71 | pulling from $TESTTMP/a | |
|
71 | pulling from $TESTTMP/a (glob) | |
|
72 | 72 | searching for changes |
|
73 | 73 | no changes found |
|
74 | 74 | |
@@ -78,7 +78,7 b' Invoke pull --rebase and nothing to reba' | |||
|
78 | 78 | $ cd ../c |
|
79 | 79 | |
|
80 | 80 | $ hg pull --rebase |
|
81 | pulling from $TESTTMP/a | |
|
81 | pulling from $TESTTMP/a (glob) | |
|
82 | 82 | searching for changes |
|
83 | 83 | adding changesets |
|
84 | 84 | adding manifests |
@@ -94,7 +94,7 b' Invoke pull --rebase and nothing to reba' | |||
|
94 | 94 | pull --rebase --update should ignore --update: |
|
95 | 95 | |
|
96 | 96 | $ hg pull --rebase --update |
|
97 | pulling from $TESTTMP/a | |
|
97 | pulling from $TESTTMP/a (glob) | |
|
98 | 98 | searching for changes |
|
99 | 99 | no changes found |
|
100 | 100 | |
@@ -103,7 +103,7 b" pull --rebase doesn't update if nothing " | |||
|
103 | 103 | $ hg up -q 1 |
|
104 | 104 | |
|
105 | 105 | $ hg pull --rebase |
|
106 | pulling from $TESTTMP/a | |
|
106 | pulling from $TESTTMP/a (glob) | |
|
107 | 107 | searching for changes |
|
108 | 108 | no changes found |
|
109 | 109 |
@@ -251,7 +251,7 b' F onto G - rebase onto a descendant:' | |||
|
251 | 251 | C onto A - rebase onto an ancestor: |
|
252 | 252 | |
|
253 | 253 | $ hg rebase -d 0 -s 2 |
|
254 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg | |
|
254 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | |
|
255 | 255 | $ hg tglog |
|
256 | 256 | @ 7: 'D' |
|
257 | 257 | | |
@@ -473,7 +473,7 b' rebase on ancestor with revset' | |||
|
473 | 473 | $ hg clone -q -u . ah ah5 |
|
474 | 474 | $ cd ah5 |
|
475 | 475 | $ hg rebase -r '6::' -d 2 |
|
476 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg | |
|
476 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) | |
|
477 | 477 | $ hg tglog |
|
478 | 478 | @ 8: 'I' |
|
479 | 479 | | |
@@ -39,7 +39,7 b' formatting of final byte count' | |||
|
39 | 39 | don't sit forever trying to double-lock the source repo |
|
40 | 40 | |
|
41 | 41 | $ hg relink . |
|
42 | relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store | |
|
42 | relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob) | |
|
43 | 43 | there is nothing to relink |
|
44 | 44 | |
|
45 | 45 |
@@ -196,8 +196,8 b' dir, options none' | |||
|
196 | 196 | |
|
197 | 197 | $ rm test/bar |
|
198 | 198 | $ remove test |
|
199 | removing test/bar | |
|
200 | removing test/foo | |
|
199 | removing test/bar (glob) | |
|
200 | removing test/foo (glob) | |
|
201 | 201 | exit code: 0 |
|
202 | 202 | R test/bar |
|
203 | 203 | R test/foo |
@@ -208,8 +208,8 b' dir, options -f' | |||
|
208 | 208 | |
|
209 | 209 | $ rm test/bar |
|
210 | 210 | $ remove -f test |
|
211 | removing test/bar | |
|
212 | removing test/foo | |
|
211 | removing test/bar (glob) | |
|
212 | removing test/foo (glob) | |
|
213 | 213 | exit code: 0 |
|
214 | 214 | R test/bar |
|
215 | 215 | R test/foo |
@@ -220,8 +220,8 b' dir, options -A' | |||
|
220 | 220 | |
|
221 | 221 | $ rm test/bar |
|
222 | 222 | $ remove -A test |
|
223 | not removing test/foo: file still exists (use -f to force removal) | |
|
224 | removing test/bar | |
|
223 | not removing test/foo: file still exists (use -f to force removal) (glob) | |
|
224 | removing test/bar (glob) | |
|
225 | 225 | exit code: 1 |
|
226 | 226 | R test/bar |
|
227 | 227 | ./foo |
@@ -232,8 +232,8 b' dir, options -Af' | |||
|
232 | 232 | |
|
233 | 233 | $ rm test/bar |
|
234 | 234 | $ remove -Af test |
|
235 | removing test/bar | |
|
236 | removing test/foo | |
|
235 | removing test/bar (glob) | |
|
236 | removing test/foo (glob) | |
|
237 | 237 | exit code: 0 |
|
238 | 238 | R test/bar |
|
239 | 239 | R test/foo |
@@ -250,7 +250,7 b' test remove dropping empty trees (issue1' | |||
|
250 | 250 | adding issue1861/b/c/y |
|
251 | 251 | adding issue1861/x |
|
252 | 252 | $ hg rm issue1861/b |
|
253 | removing issue1861/b/c/y | |
|
253 | removing issue1861/b/c/y (glob) | |
|
254 | 254 | $ hg ci -m remove |
|
255 | 255 | $ ls issue1861 |
|
256 | 256 | x |
@@ -11,8 +11,8 b'' | |||
|
11 | 11 | $ hg co -C 0 |
|
12 | 12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 13 | $ hg mv a b |
|
14 | moving a/a to b/a | |
|
15 | moving a/b to b/b | |
|
14 | moving a/a to b/a (glob) | |
|
15 | moving a/b to b/b (glob) | |
|
16 | 16 | $ hg ci -m "1 mv a/ b/" |
|
17 | 17 | |
|
18 | 18 | $ hg co -C 0 |
@@ -75,7 +75,7 b'' | |||
|
75 | 75 | ? b/d |
|
76 | 76 | $ hg ci -m "3 merge 2+1" |
|
77 | 77 | $ hg debugrename b/c |
|
78 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
|
78 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) | |
|
79 | 79 | |
|
80 | 80 | $ hg co -C 1 |
|
81 | 81 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -111,7 +111,7 b'' | |||
|
111 | 111 | $ hg ci -m "4 merge 1+2" |
|
112 | 112 | created new head |
|
113 | 113 | $ hg debugrename b/c |
|
114 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
|
114 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) | |
|
115 | 115 | |
|
116 | 116 | |
|
117 | 117 | Second scenario with two repos: |
@@ -122,7 +122,7 b' Second scenario with two repos:' | |||
|
122 | 122 | $ mkdir a |
|
123 | 123 | $ echo foo > a/f |
|
124 | 124 | $ hg add a |
|
125 | adding a/f | |
|
125 | adding a/f (glob) | |
|
126 | 126 | $ hg ci -m "a/f == foo" |
|
127 | 127 | $ cd .. |
|
128 | 128 | |
@@ -131,7 +131,7 b' Second scenario with two repos:' | |||
|
131 | 131 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 132 | $ cd r2 |
|
133 | 133 | $ hg mv a b |
|
134 | moving a/f to b/f | |
|
134 | moving a/f to b/f (glob) | |
|
135 | 135 | $ echo foo1 > b/f |
|
136 | 136 | $ hg ci -m" a -> b, b/f == foo1" |
|
137 | 137 | $ cd .. |
@@ -140,7 +140,7 b' Second scenario with two repos:' | |||
|
140 | 140 | $ mkdir a/aa |
|
141 | 141 | $ echo bar > a/aa/g |
|
142 | 142 | $ hg add a/aa |
|
143 | adding a/aa/g | |
|
143 | adding a/aa/g (glob) | |
|
144 | 144 | $ hg ci -m "a/aa/g" |
|
145 | 145 | $ hg pull ../r2 |
|
146 | 146 | pulling from ../r2 |
@@ -71,7 +71,7 b' rename --after a single file when src an' | |||
|
71 | 71 | rename --after a single file to a nonexistant target filename |
|
72 | 72 | |
|
73 | 73 | $ hg rename --after d1/a dummy |
|
74 | d1/a: not recording move - dummy does not exist | |
|
74 | d1/a: not recording move - dummy does not exist (glob) | |
|
75 | 75 | |
|
76 | 76 | move a single file to an existing directory |
|
77 | 77 | |
@@ -121,10 +121,10 b' rename --after a file using a relative p' | |||
|
121 | 121 | rename directory d1 as d3 |
|
122 | 122 | |
|
123 | 123 | $ hg rename d1/ d3 |
|
124 | moving d1/a to d3/a | |
|
125 | moving d1/b to d3/b | |
|
126 | moving d1/ba to d3/ba | |
|
127 | moving d1/d11/a1 to d3/d11/a1 | |
|
124 | moving d1/a to d3/a (glob) | |
|
125 | moving d1/b to d3/b (glob) | |
|
126 | moving d1/ba to d3/ba (glob) | |
|
127 | moving d1/d11/a1 to d3/d11/a1 (glob) | |
|
128 | 128 | $ hg status -C |
|
129 | 129 | A d3/a |
|
130 | 130 | d1/a |
@@ -146,10 +146,10 b' rename --after directory d1 as d3' | |||
|
146 | 146 | |
|
147 | 147 | $ mv d1 d3 |
|
148 | 148 | $ hg rename --after d1 d3 |
|
149 | moving d1/a to d3/a | |
|
150 | moving d1/b to d3/b | |
|
151 | moving d1/ba to d3/ba | |
|
152 | moving d1/d11/a1 to d3/d11/a1 | |
|
149 | moving d1/a to d3/a (glob) | |
|
150 | moving d1/b to d3/b (glob) | |
|
151 | moving d1/ba to d3/ba (glob) | |
|
152 | moving d1/d11/a1 to d3/d11/a1 (glob) | |
|
153 | 153 | $ hg status -C |
|
154 | 154 | A d3/a |
|
155 | 155 | d1/a |
@@ -170,7 +170,7 b' rename --after directory d1 as d3' | |||
|
170 | 170 | move a directory using a relative path |
|
171 | 171 | |
|
172 | 172 | $ (cd d2; mkdir d3; hg rename ../d1/d11 d3) |
|
173 | moving ../d1/d11/a1 to d3/d11/a1 | |
|
173 | moving ../d1/d11/a1 to d3/d11/a1 (glob) | |
|
174 | 174 | $ hg status -C |
|
175 | 175 | A d2/d3/d11/a1 |
|
176 | 176 | d1/d11/a1 |
@@ -182,7 +182,7 b' move a directory using a relative path' | |||
|
182 | 182 | move --after a directory using a relative path |
|
183 | 183 | |
|
184 | 184 | $ (cd d2; mkdir d3; mv ../d1/d11 d3; hg rename --after ../d1/d11 d3) |
|
185 | moving ../d1/d11/a1 to d3/d11/a1 | |
|
185 | moving ../d1/d11/a1 to d3/d11/a1 (glob) | |
|
186 | 186 | $ hg status -C |
|
187 | 187 | A d2/d3/d11/a1 |
|
188 | 188 | d1/d11/a1 |
@@ -194,7 +194,7 b' move --after a directory using a relativ' | |||
|
194 | 194 | move directory d1/d11 to an existing directory d2 (removes empty d1) |
|
195 | 195 | |
|
196 | 196 | $ hg rename d1/d11/ d2 |
|
197 | moving d1/d11/a1 to d2/d11/a1 | |
|
197 | moving d1/d11/a1 to d2/d11/a1 (glob) | |
|
198 | 198 | $ hg status -C |
|
199 | 199 | A d2/d11/a1 |
|
200 | 200 | d1/d11/a1 |
@@ -207,11 +207,11 b' move directories d1 and d2 to a new dire' | |||
|
207 | 207 | |
|
208 | 208 | $ mkdir d3 |
|
209 | 209 | $ hg rename d1 d2 d3 |
|
210 | moving d1/a to d3/d1/a | |
|
211 | moving d1/b to d3/d1/b | |
|
212 | moving d1/ba to d3/d1/ba | |
|
213 | moving d1/d11/a1 to d3/d1/d11/a1 | |
|
214 | moving d2/b to d3/d2/b | |
|
210 | moving d1/a to d3/d1/a (glob) | |
|
211 | moving d1/b to d3/d1/b (glob) | |
|
212 | moving d1/ba to d3/d1/ba (glob) | |
|
213 | moving d1/d11/a1 to d3/d1/d11/a1 (glob) | |
|
214 | moving d2/b to d3/d2/b (glob) | |
|
215 | 215 | $ hg status -C |
|
216 | 216 | A d3/d1/a |
|
217 | 217 | d1/a |
@@ -237,11 +237,11 b' move --after directories d1 and d2 to a ' | |||
|
237 | 237 | $ mkdir d3 |
|
238 | 238 | $ mv d1 d2 d3 |
|
239 | 239 | $ hg rename --after d1 d2 d3 |
|
240 | moving d1/a to d3/d1/a | |
|
241 | moving d1/b to d3/d1/b | |
|
242 | moving d1/ba to d3/d1/ba | |
|
243 | moving d1/d11/a1 to d3/d1/d11/a1 | |
|
244 | moving d2/b to d3/d2/b | |
|
240 | moving d1/a to d3/d1/a (glob) | |
|
241 | moving d1/b to d3/d1/b (glob) | |
|
242 | moving d1/ba to d3/d1/ba (glob) | |
|
243 | moving d1/d11/a1 to d3/d1/d11/a1 (glob) | |
|
244 | moving d2/b to d3/d2/b (glob) | |
|
245 | 245 | $ hg status -C |
|
246 | 246 | A d3/d1/a |
|
247 | 247 | d1/a |
@@ -267,7 +267,7 b' overwrite existing files (d2/b)' | |||
|
267 | 267 | |
|
268 | 268 | $ hg rename d1/* d2 |
|
269 | 269 | d2/b: not overwriting - file exists |
|
270 | moving d1/d11/a1 to d2/d11/a1 | |
|
270 | moving d1/d11/a1 to d2/d11/a1 (glob) | |
|
271 | 271 | $ hg status -C |
|
272 | 272 | A d2/a |
|
273 | 273 | d1/a |
@@ -308,10 +308,10 b' move every file under d1 to d2/d21 (glob' | |||
|
308 | 308 | |
|
309 | 309 | $ mkdir d2/d21 |
|
310 | 310 | $ hg rename 'glob:d1/**' d2/d21 |
|
311 | moving d1/a to d2/d21/a | |
|
312 | moving d1/b to d2/d21/b | |
|
313 | moving d1/ba to d2/d21/ba | |
|
314 | moving d1/d11/a1 to d2/d21/a1 | |
|
311 | moving d1/a to d2/d21/a (glob) | |
|
312 | moving d1/b to d2/d21/b (glob) | |
|
313 | moving d1/ba to d2/d21/ba (glob) | |
|
314 | moving d1/d11/a1 to d2/d21/a1 (glob) | |
|
315 | 315 | $ hg status -C |
|
316 | 316 | A d2/d21/a |
|
317 | 317 | d1/a |
@@ -334,10 +334,10 b' move --after some files under d1 to d2/d' | |||
|
334 | 334 | $ mkdir d2/d21 |
|
335 | 335 | $ mv d1/a d1/d11/a1 d2/d21 |
|
336 | 336 | $ hg rename --after 'glob:d1/**' d2/d21 |
|
337 | moving d1/a to d2/d21/a | |
|
338 | d1/b: not recording move - d2/d21/b does not exist | |
|
339 | d1/ba: not recording move - d2/d21/ba does not exist | |
|
340 | moving d1/d11/a1 to d2/d21/a1 | |
|
337 | moving d1/a to d2/d21/a (glob) | |
|
338 | d1/b: not recording move - d2/d21/b does not exist (glob) | |
|
339 | d1/ba: not recording move - d2/d21/ba does not exist (glob) | |
|
340 | moving d1/d11/a1 to d2/d21/a1 (glob) | |
|
341 | 341 | $ hg status -C |
|
342 | 342 | A d2/d21/a |
|
343 | 343 | d1/a |
@@ -353,8 +353,8 b' move every file under d1 starting with a' | |||
|
353 | 353 | |
|
354 | 354 | $ mkdir d2/d21 |
|
355 | 355 | $ hg rename 're:d1/([^a][^/]*/)*a.*' d2/d21 |
|
356 | moving d1/a to d2/d21/a | |
|
357 | moving d1/d11/a1 to d2/d21/a1 | |
|
356 | moving d1/a to d2/d21/a (glob) | |
|
357 | moving d1/d11/a1 to d2/d21/a1 (glob) | |
|
358 | 358 | $ hg status -C |
|
359 | 359 | A d2/d21/a |
|
360 | 360 | d1/a |
@@ -415,7 +415,7 b' do not copy more than one source file to' | |||
|
415 | 415 | |
|
416 | 416 | $ mkdir d3 |
|
417 | 417 | $ hg rename d1/* d2/* d3 |
|
418 | moving d1/d11/a1 to d3/d11/a1 | |
|
418 | moving d1/d11/a1 to d3/d11/a1 (glob) | |
|
419 | 419 | d3/b: not overwriting - d2/b collides with d1/b |
|
420 | 420 | $ hg status -C |
|
421 | 421 | A d3/a |
@@ -441,7 +441,7 b' move a whole subtree with "hg rename ."' | |||
|
441 | 441 | moving a to ../d3/d1/a |
|
442 | 442 | moving b to ../d3/d1/b |
|
443 | 443 | moving ba to ../d3/d1/ba |
|
444 | moving d11/a1 to ../d3/d1/d11/a1 | |
|
444 | moving d11/a1 to ../d3/d1/d11/a1 (glob) | |
|
445 | 445 | $ hg status -C |
|
446 | 446 | A d3/d1/a |
|
447 | 447 | d1/a |
@@ -467,7 +467,7 b' move a whole subtree with "hg rename --a' | |||
|
467 | 467 | moving a to ../d3/a |
|
468 | 468 | moving b to ../d3/b |
|
469 | 469 | moving ba to ../d3/ba |
|
470 | moving d11/a1 to ../d3/d11/a1 | |
|
470 | moving d11/a1 to ../d3/d11/a1 (glob) | |
|
471 | 471 | $ hg status -C |
|
472 | 472 | A d3/a |
|
473 | 473 | d1/a |
@@ -488,9 +488,9 b' move a whole subtree with "hg rename --a' | |||
|
488 | 488 | move the parent tree with "hg rename .." |
|
489 | 489 | |
|
490 | 490 | $ (cd d1/d11; hg rename .. ../../d3) |
|
491 | moving ../a to ../../d3/a | |
|
492 | moving ../b to ../../d3/b | |
|
493 | moving ../ba to ../../d3/ba | |
|
491 | moving ../a to ../../d3/a (glob) | |
|
492 | moving ../b to ../../d3/b (glob) | |
|
493 | moving ../ba to ../../d3/ba (glob) | |
|
494 | 494 | moving a1 to ../../d3/d11/a1 |
|
495 | 495 | $ hg status -C |
|
496 | 496 | A d3/a |
@@ -513,9 +513,9 b' skip removed files' | |||
|
513 | 513 | |
|
514 | 514 | $ hg remove d1/b |
|
515 | 515 | $ hg rename d1 d3 |
|
516 | moving d1/a to d3/a | |
|
517 | moving d1/ba to d3/ba | |
|
518 | moving d1/d11/a1 to d3/d11/a1 | |
|
516 | moving d1/a to d3/a (glob) | |
|
517 | moving d1/ba to d3/ba (glob) | |
|
518 | moving d1/d11/a1 to d3/d11/a1 (glob) | |
|
519 | 519 | $ hg status -C |
|
520 | 520 | A d3/a |
|
521 | 521 | d1/a |
@@ -589,7 +589,7 b' overwriting with renames (issue1959)' | |||
|
589 | 589 | check illegal path components |
|
590 | 590 | |
|
591 | 591 | $ hg rename d1/d11/a1 .hg/foo |
|
592 | abort: path contains illegal component: .hg/foo | |
|
592 | abort: path contains illegal component: .hg/foo (glob) | |
|
593 | 593 | [255] |
|
594 | 594 | $ hg status -C |
|
595 | 595 | $ hg rename d1/d11/a1 ../foo |
@@ -599,7 +599,7 b' check illegal path components' | |||
|
599 | 599 | |
|
600 | 600 | $ mv d1/d11/a1 .hg/foo |
|
601 | 601 | $ hg rename --after d1/d11/a1 .hg/foo |
|
602 | abort: path contains illegal component: .hg/foo | |
|
602 | abort: path contains illegal component: .hg/foo (glob) | |
|
603 | 603 | [255] |
|
604 | 604 | $ hg status -C |
|
605 | 605 | ! d1/d11/a1 |
@@ -608,17 +608,17 b' check illegal path components' | |||
|
608 | 608 | $ rm .hg/foo |
|
609 | 609 | |
|
610 | 610 | $ hg rename d1/d11/a1 .hg |
|
611 | abort: path contains illegal component: .hg/a1 | |
|
611 | abort: path contains illegal component: .hg/a1 (glob) | |
|
612 | 612 | [255] |
|
613 | 613 | $ hg status -C |
|
614 | 614 | $ hg rename d1/d11/a1 .. |
|
615 | abort: ../a1 not under root | |
|
615 | abort: ../a1 not under root (glob) | |
|
616 | 616 | [255] |
|
617 | 617 | $ hg status -C |
|
618 | 618 | |
|
619 | 619 | $ mv d1/d11/a1 .hg |
|
620 | 620 | $ hg rename --after d1/d11/a1 .hg |
|
621 | abort: path contains illegal component: .hg/a1 | |
|
621 | abort: path contains illegal component: .hg/a1 (glob) | |
|
622 | 622 | [255] |
|
623 | 623 | $ hg status -C |
|
624 | 624 | ! d1/d11/a1 |
@@ -627,7 +627,7 b' check illegal path components' | |||
|
627 | 627 | $ rm .hg/a1 |
|
628 | 628 | |
|
629 | 629 | $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo) |
|
630 | abort: path contains illegal component: .hg/foo | |
|
630 | abort: path contains illegal component: .hg/foo (glob) | |
|
631 | 631 | [255] |
|
632 | 632 | $ hg status -C |
|
633 | 633 | $ (cd d1/d11; hg rename ../../d2/b ../../../foo) |
@@ -216,11 +216,11 b' Issue332: confusing message when reverti' | |||
|
216 | 216 | $ echo foo > newdir/newfile |
|
217 | 217 | $ hg add newdir/newfile |
|
218 | 218 | $ hg revert b newdir |
|
219 | reverting b/b | |
|
220 | forgetting newdir/newfile | |
|
219 | reverting b/b (glob) | |
|
220 | forgetting newdir/newfile (glob) | |
|
221 | 221 | $ echo foobar > b/b |
|
222 | 222 | $ hg revert . |
|
223 | reverting b/b | |
|
223 | reverting b/b (glob) | |
|
224 | 224 | |
|
225 | 225 | |
|
226 | 226 | reverting a rename target should revert the source |
@@ -261,8 +261,8 b' should revert ignored* and undelete *rem' | |||
|
261 | 261 | |
|
262 | 262 | $ hg revert -a --no-backup |
|
263 | 263 | reverting ignored |
|
264 | reverting ignoreddir/file | |
|
265 | undeleting ignoreddir/removed | |
|
264 | reverting ignoreddir/file (glob) | |
|
265 | undeleting ignoreddir/removed (glob) | |
|
266 | 266 | undeleting removed |
|
267 | 267 | $ hg st -mardi |
|
268 | 268 |
@@ -39,7 +39,7 b'' | |||
|
39 | 39 | $ cd b |
|
40 | 40 | $ cat .hg/hgrc |
|
41 | 41 | [paths] |
|
42 | default = $TESTTMP/a#stable | |
|
42 | default = $TESTTMP/a#stable (glob) | |
|
43 | 43 | |
|
44 | 44 | $ echo red >> a |
|
45 | 45 | $ hg ci -qm3 |
@@ -60,7 +60,7 b'' | |||
|
60 | 60 | |
|
61 | 61 | |
|
62 | 62 | $ hg tout |
|
63 | comparing with $TESTTMP/a | |
|
63 | comparing with $TESTTMP/a (glob) | |
|
64 | 64 | searching for changes |
|
65 | 65 | 2:1d4099801a4e: '3' stable |
|
66 | 66 | |
@@ -79,11 +79,11 b'' | |||
|
79 | 79 | |
|
80 | 80 | $ cat .hg/hgrc |
|
81 | 81 | [paths] |
|
82 | default = $TESTTMP/a#stable | |
|
82 | default = $TESTTMP/a#stable (glob) | |
|
83 | 83 | green = ../a#default |
|
84 | 84 | |
|
85 | 85 | $ hg tout green |
|
86 | comparing with $TESTTMP/a | |
|
86 | comparing with $TESTTMP/a (glob) | |
|
87 | 87 | searching for changes |
|
88 | 88 | 3:f0461977a3db: '4' |
|
89 | 89 |
@@ -27,14 +27,14 b" share shouldn't have a store dir" | |||
|
27 | 27 | Some sed versions appends newline, some don't, and some just fails |
|
28 | 28 | |
|
29 | 29 | $ cat .hg/sharedpath; echo |
|
30 | $TESTTMP/repo1/.hg | |
|
30 | $TESTTMP/repo1/.hg (glob) | |
|
31 | 31 | |
|
32 | 32 | trailing newline on .hg/sharedpath is ok |
|
33 | 33 | $ hg tip -q |
|
34 | 34 | 0:d3873e73d99e |
|
35 | 35 | $ echo '' >> .hg/sharedpath |
|
36 | 36 | $ cat .hg/sharedpath |
|
37 | $TESTTMP/repo1/.hg | |
|
37 | $TESTTMP/repo1/.hg (glob) | |
|
38 | 38 | $ hg tip -q |
|
39 | 39 | 0:d3873e73d99e |
|
40 | 40 |
@@ -3,7 +3,7 b" Preparing the subrepository 'sub2'" | |||
|
3 | 3 | $ hg init sub2 |
|
4 | 4 | $ echo sub2 > sub2/sub2 |
|
5 | 5 | $ hg add -R sub2 |
|
6 | adding sub2/sub2 | |
|
6 | adding sub2/sub2 (glob) | |
|
7 | 7 | $ hg commit -R sub2 -m "sub2 import" |
|
8 | 8 | |
|
9 | 9 | Preparing the 'sub1' repo which depends on the subrepo 'sub2' |
@@ -15,8 +15,8 b" Preparing the 'sub1' repo which depends " | |||
|
15 | 15 | updating to branch default |
|
16 | 16 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 17 | $ hg add -R sub1 |
|
18 | adding sub1/.hgsub | |
|
19 | adding sub1/sub1 | |
|
18 | adding sub1/.hgsub (glob) | |
|
19 | adding sub1/sub1 (glob) | |
|
20 | 20 | $ hg commit -R sub1 -m "sub1 import" |
|
21 | 21 | committing subrepository sub2 |
|
22 | 22 | |
@@ -30,8 +30,8 b" Preparing the 'main' repo which depends " | |||
|
30 | 30 | cloning subrepo sub2 from $TESTTMP/sub2 |
|
31 | 31 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 32 | $ hg add -R main |
|
33 | adding main/.hgsub | |
|
34 | adding main/main | |
|
33 | adding main/.hgsub (glob) | |
|
34 | adding main/main (glob) | |
|
35 | 35 | $ hg commit -R main -m "main import" |
|
36 | 36 | committing subrepository sub1 |
|
37 | 37 | |
@@ -51,7 +51,7 b' Clone main' | |||
|
51 | 51 | $ hg clone main cloned |
|
52 | 52 | updating to branch default |
|
53 | 53 | cloning subrepo sub1 from $TESTTMP/sub1 |
|
54 | cloning subrepo sub1/sub2 from $TESTTMP/sub2 | |
|
54 | cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob) | |
|
55 | 55 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
56 | 56 | |
|
57 | 57 | Checking cloned repo ids |
@@ -79,7 +79,7 b" Modifying deeply nested 'sub2'" | |||
|
79 | 79 | $ echo modified > cloned/sub1/sub2/sub2 |
|
80 | 80 | $ hg commit --subrepos -m "deep nested modif should trigger a commit" -R cloned |
|
81 | 81 | committing subrepository sub1 |
|
82 | committing subrepository sub1/sub2 | |
|
82 | committing subrepository sub1/sub2 (glob) | |
|
83 | 83 | |
|
84 | 84 | Checking modified node ids |
|
85 | 85 |
@@ -55,5 +55,5 b' test bad subpaths pattern' | |||
|
55 | 55 | > .* = \1 |
|
56 | 56 | > EOF |
|
57 | 57 | $ hg debugsub |
|
58 | abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference | |
|
58 | abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob) | |
|
59 | 59 | [255] |
@@ -265,10 +265,10 b' only show up in the test output, not in ' | |||
|
265 | 265 | archiving (foo) [====================================>] 3/3 |
|
266 | 266 | archiving (foo) [====================================>] 3/3 |
|
267 | 267 | |
|
268 | archiving (foo/bar) [ ] 0/1 | |
|
269 | archiving (foo/bar) [ ] 0/1 | |
|
270 | archiving (foo/bar) [================================>] 1/1 | |
|
271 | archiving (foo/bar) [================================>] 1/1 | |
|
268 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
269 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
270 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
271 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
272 | 272 | \r (esc) |
|
273 | 273 | $ find ../archive | sort |
|
274 | 274 | ../archive |
@@ -305,10 +305,10 b' Test archiving to zip file (unzip output' | |||
|
305 | 305 | archiving (foo) [====================================>] 3/3 |
|
306 | 306 | archiving (foo) [====================================>] 3/3 |
|
307 | 307 | |
|
308 | archiving (foo/bar) [ ] 0/1 | |
|
309 | archiving (foo/bar) [ ] 0/1 | |
|
310 | archiving (foo/bar) [================================>] 1/1 | |
|
311 | archiving (foo/bar) [================================>] 1/1 | |
|
308 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
309 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
310 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
311 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
312 | 312 | \r (esc) |
|
313 | 313 | |
|
314 | 314 | Test archiving a revision that references a subrepo that is not yet |
@@ -336,10 +336,10 b' cloned:' | |||
|
336 | 336 | archiving (foo) [====================================>] 3/3 |
|
337 | 337 | archiving (foo) [====================================>] 3/3 |
|
338 | 338 | |
|
339 | archiving (foo/bar) [ ] 0/1 | |
|
340 | archiving (foo/bar) [ ] 0/1 | |
|
341 | archiving (foo/bar) [================================>] 1/1 | |
|
342 | archiving (foo/bar) [================================>] 1/1 | |
|
339 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
340 | archiving (foo/bar) [ ] 0/1 (glob) | |
|
341 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
342 | archiving (foo/bar) [================================>] 1/1 (glob) | |
|
343 | 343 | |
|
344 | 344 | cloning subrepo foo from $TESTTMP/repo/foo |
|
345 | 345 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar |
@@ -5,7 +5,7 b" Preparing the subrepository 'sub'" | |||
|
5 | 5 | $ hg init sub |
|
6 | 6 | $ echo sub > sub/sub |
|
7 | 7 | $ hg add -R sub |
|
8 | adding sub/sub | |
|
8 | adding sub/sub (glob) | |
|
9 | 9 | $ hg commit -R sub -m "sub import" |
|
10 | 10 | |
|
11 | 11 | Preparing the 'main' repo which depends on the subrepo 'sub' |
@@ -17,8 +17,8 b" Preparing the 'main' repo which depends " | |||
|
17 | 17 | updating to branch default |
|
18 | 18 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 19 | $ hg add -R main |
|
20 | adding main/.hgsub | |
|
21 | adding main/main | |
|
20 | adding main/.hgsub (glob) | |
|
21 | adding main/main (glob) | |
|
22 | 22 | $ hg commit -R main -m "main import" |
|
23 | 23 | committing subrepository sub |
|
24 | 24 |
@@ -49,7 +49,7 b' Revert currently ignores subrepos by def' | |||
|
49 | 49 | |
|
50 | 50 | $ hg revert -a |
|
51 | 51 | $ hg revert -R s -a -C |
|
52 | reverting s/a | |
|
52 | reverting s/a (glob) | |
|
53 | 53 | |
|
54 | 54 | Issue2022: update -C |
|
55 | 55 | |
@@ -92,7 +92,7 b' add sub sub' | |||
|
92 | 92 | update: (current) |
|
93 | 93 | $ hg ci -m2 |
|
94 | 94 | committing subrepository s |
|
95 | committing subrepository s/ss | |
|
95 | committing subrepository s/ss (glob) | |
|
96 | 96 | $ hg sum |
|
97 | 97 | parent: 2:df30734270ae tip |
|
98 | 98 | 2 |
@@ -147,7 +147,7 b' new branch for merge tests' | |||
|
147 | 147 | $ hg init t |
|
148 | 148 | $ echo t > t/t |
|
149 | 149 | $ hg -R t add t |
|
150 | adding t/t | |
|
150 | adding t/t (glob) | |
|
151 | 151 | |
|
152 | 152 | 5 |
|
153 | 153 | |
@@ -265,9 +265,9 b' clone' | |||
|
265 | 265 | $ cd .. |
|
266 | 266 | $ hg clone t tc |
|
267 | 267 | updating to branch default |
|
268 | cloning subrepo s from $TESTTMP/sub/t/s | |
|
269 | cloning subrepo s/ss from $TESTTMP/sub/t/s/ss | |
|
270 | cloning subrepo t from $TESTTMP/sub/t/t | |
|
268 | cloning subrepo s from $TESTTMP/sub/t/s (glob) | |
|
269 | cloning subrepo s/ss from $TESTTMP/sub/t/s/ss (glob) | |
|
270 | cloning subrepo t from $TESTTMP/sub/t/t (glob) | |
|
271 | 271 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
272 | 272 | $ cd tc |
|
273 | 273 | $ hg debugsub |
@@ -284,14 +284,14 b' push' | |||
|
284 | 284 | $ hg ci -m11 |
|
285 | 285 | committing subrepository t |
|
286 | 286 | $ hg push |
|
287 | pushing to $TESTTMP/sub/t | |
|
288 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
287 | pushing to $TESTTMP/sub/t (glob) | |
|
288 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) | |
|
289 | 289 | searching for changes |
|
290 | 290 | no changes found |
|
291 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
291 | pushing subrepo s to $TESTTMP/sub/t/s (glob) | |
|
292 | 292 | searching for changes |
|
293 | 293 | no changes found |
|
294 | pushing subrepo t to $TESTTMP/sub/t/t | |
|
294 | pushing subrepo t to $TESTTMP/sub/t/t (glob) | |
|
295 | 295 | searching for changes |
|
296 | 296 | adding changesets |
|
297 | 297 | adding manifests |
@@ -309,27 +309,27 b' push -f' | |||
|
309 | 309 | $ hg ci -m12 |
|
310 | 310 | committing subrepository s |
|
311 | 311 | $ hg push |
|
312 | pushing to $TESTTMP/sub/t | |
|
313 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
312 | pushing to $TESTTMP/sub/t (glob) | |
|
313 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) | |
|
314 | 314 | searching for changes |
|
315 | 315 | no changes found |
|
316 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
316 | pushing subrepo s to $TESTTMP/sub/t/s (glob) | |
|
317 | 317 | searching for changes |
|
318 | 318 | abort: push creates new remote head 12a213df6fa9! |
|
319 | 319 | (did you forget to merge? use push -f to force) |
|
320 | 320 | [255] |
|
321 | 321 | $ hg push -f |
|
322 | pushing to $TESTTMP/sub/t | |
|
323 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss | |
|
322 | pushing to $TESTTMP/sub/t (glob) | |
|
323 | pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) | |
|
324 | 324 | searching for changes |
|
325 | 325 | no changes found |
|
326 | pushing subrepo s to $TESTTMP/sub/t/s | |
|
326 | pushing subrepo s to $TESTTMP/sub/t/s (glob) | |
|
327 | 327 | searching for changes |
|
328 | 328 | adding changesets |
|
329 | 329 | adding manifests |
|
330 | 330 | adding file changes |
|
331 | 331 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
332 | pushing subrepo t to $TESTTMP/sub/t/t | |
|
332 | pushing subrepo t to $TESTTMP/sub/t/t (glob) | |
|
333 | 333 | searching for changes |
|
334 | 334 | no changes found |
|
335 | 335 | searching for changes |
@@ -351,7 +351,7 b' pull' | |||
|
351 | 351 | |
|
352 | 352 | $ cd ../tc |
|
353 | 353 | $ hg pull |
|
354 | pulling from $TESTTMP/sub/t | |
|
354 | pulling from $TESTTMP/sub/t (glob) | |
|
355 | 355 | searching for changes |
|
356 | 356 | adding changesets |
|
357 | 357 | adding manifests |
@@ -362,7 +362,7 b' pull' | |||
|
362 | 362 | should pull t |
|
363 | 363 | |
|
364 | 364 | $ hg up |
|
365 | pulling subrepo t from $TESTTMP/sub/t/t | |
|
365 | pulling subrepo t from $TESTTMP/sub/t/t (glob) | |
|
366 | 366 | searching for changes |
|
367 | 367 | adding changesets |
|
368 | 368 | adding manifests |
@@ -507,15 +507,15 b' test subrepo delete from .hgsubstate' | |||
|
507 | 507 | $ echo test > testdelete/nested/foo |
|
508 | 508 | $ echo test > testdelete/nested2/foo |
|
509 | 509 | $ hg -R testdelete/nested add |
|
510 | adding testdelete/nested/foo | |
|
510 | adding testdelete/nested/foo (glob) | |
|
511 | 511 | $ hg -R testdelete/nested2 add |
|
512 | adding testdelete/nested2/foo | |
|
512 | adding testdelete/nested2/foo (glob) | |
|
513 | 513 | $ hg -R testdelete/nested ci -m test |
|
514 | 514 | $ hg -R testdelete/nested2 ci -m test |
|
515 | 515 | $ echo nested = nested > testdelete/.hgsub |
|
516 | 516 | $ echo nested2 = nested2 >> testdelete/.hgsub |
|
517 | 517 | $ hg -R testdelete add |
|
518 | adding testdelete/.hgsub | |
|
518 | adding testdelete/.hgsub (glob) | |
|
519 | 519 | $ hg -R testdelete ci -m "nested 1 & 2 added" |
|
520 | 520 | committing subrepository nested |
|
521 | 521 | committing subrepository nested2 |
@@ -534,19 +534,19 b' test repository cloning' | |||
|
534 | 534 | $ hg init nested_absolute |
|
535 | 535 | $ echo test > nested_absolute/foo |
|
536 | 536 | $ hg -R nested_absolute add |
|
537 | adding nested_absolute/foo | |
|
537 | adding nested_absolute/foo (glob) | |
|
538 | 538 | $ hg -R nested_absolute ci -mtest |
|
539 | 539 | $ cd mercurial |
|
540 | 540 | $ hg init nested_relative |
|
541 | 541 | $ echo test2 > nested_relative/foo2 |
|
542 | 542 | $ hg -R nested_relative add |
|
543 | adding nested_relative/foo2 | |
|
543 | adding nested_relative/foo2 (glob) | |
|
544 | 544 | $ hg -R nested_relative ci -mtest2 |
|
545 | 545 | $ hg init main |
|
546 | 546 | $ echo "nested_relative = ../nested_relative" > main/.hgsub |
|
547 | 547 | $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub |
|
548 | 548 | $ hg -R main add |
|
549 | adding main/.hgsub | |
|
549 | adding main/.hgsub (glob) | |
|
550 | 550 | $ hg -R main ci -m "add subrepos" |
|
551 | 551 | committing subrepository nested_absolute |
|
552 | 552 | committing subrepository nested_relative |
@@ -575,7 +575,7 b' Issue1977: multirepo push should fail if' | |||
|
575 | 575 | committing subrepository s |
|
576 | 576 | $ hg clone repo repo2 |
|
577 | 577 | updating to branch default |
|
578 | cloning subrepo s from $TESTTMP/sub/repo/s | |
|
578 | cloning subrepo s from $TESTTMP/sub/repo/s (glob) | |
|
579 | 579 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
580 | 580 | $ hg -q -R repo2 pull -u |
|
581 | 581 | $ echo 1 > repo2/s/a |
@@ -609,10 +609,10 b' Prepare a repo with subrepo' | |||
|
609 | 609 | $ echo sub/repo = sub/repo > .hgsub |
|
610 | 610 | $ hg add .hgsub |
|
611 | 611 | $ hg ci -mtest |
|
612 | committing subrepository sub/repo | |
|
612 | committing subrepository sub/repo (glob) | |
|
613 | 613 | $ echo test >> sub/repo/foo |
|
614 | 614 | $ hg ci -mtest |
|
615 | committing subrepository sub/repo | |
|
615 | committing subrepository sub/repo (glob) | |
|
616 | 616 | $ cd .. |
|
617 | 617 | |
|
618 | 618 | Create repo without default path, pull top repo, and see what happens on update |
@@ -627,7 +627,7 b' Create repo without default path, pull t' | |||
|
627 | 627 | added 2 changesets with 3 changes to 2 files |
|
628 | 628 | (run 'hg update' to get a working copy) |
|
629 | 629 | $ hg -R issue1852b update |
|
630 | abort: default path for subrepository sub/repo not found | |
|
630 | abort: default path for subrepository sub/repo not found (glob) | |
|
631 | 631 | [255] |
|
632 | 632 | |
|
633 | 633 | Pull -u now doesn't help |
@@ -646,14 +646,14 b' Try the same, but with pull -u' | |||
|
646 | 646 | adding manifests |
|
647 | 647 | adding file changes |
|
648 | 648 | added 1 changesets with 2 changes to 2 files |
|
649 | cloning subrepo sub/repo from issue1852a/sub/repo | |
|
649 | cloning subrepo sub/repo from issue1852a/sub/repo (glob) | |
|
650 | 650 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
651 | 651 | |
|
652 | 652 | Try to push from the other side |
|
653 | 653 | |
|
654 | 654 | $ hg -R issue1852a push `pwd`/issue1852c |
|
655 | 655 | pushing to $TESTTMP/sub/issue1852c |
|
656 | pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo | |
|
656 | pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo (glob) | |
|
657 | 657 | searching for changes |
|
658 | 658 | no changes found |
|
659 | 659 | searching for changes |
@@ -41,7 +41,7 b' Test basic functionality of url#rev synt' | |||
|
41 | 41 | |
|
42 | 42 | $ cat clone/.hg/hgrc |
|
43 | 43 | [paths] |
|
44 |
default = $TESTTMP/repo# |
|
|
44 | default = $TESTTMP/repo#foo (glob) | |
|
45 | 45 | |
|
46 | 46 | Changing original repo: |
|
47 | 47 |
@@ -385,7 +385,7 b' Disable warning:' | |||
|
385 | 385 | WARNING: f4.bat already has CRLF line endings |
|
386 | 386 | and does not need EOL conversion by the win32text plugin. |
|
387 | 387 | Before your next commit, please reconsider your encode/decode settings in |
|
388 | Mercurial.ini or $TESTTMP/t/.hg/hgrc. | |
|
388 | Mercurial.ini or $TESTTMP/t/.hg/hgrc. (glob) | |
|
389 | 389 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
390 | 390 | $ cat bin |
|
391 | 391 | hello\x00\r (esc) |
General Comments 0
You need to be logged in to leave comments.
Login now