Show More
@@ -518,7 +518,7 b' def tsttest(test, options):' | |||
|
518 | 518 | c = el[i] |
|
519 | 519 | i += 1 |
|
520 | 520 | if c == '\\' and el[i] in '*?\\': |
|
521 | res += el[i-1:i+1] | |
|
521 | res += el[i - 1:i + 1] | |
|
522 | 522 | i += 1 |
|
523 | 523 | elif c == '*': |
|
524 | 524 | res += '.*' |
@@ -79,7 +79,7 b' Convert again' | |||
|
79 | 79 | Test hg failing to call itself |
|
80 | 80 | |
|
81 | 81 | $ HG=foobar hg convert svn-repo B-hg |
|
82 | .* | |
|
82 | * (glob) | |
|
83 | 83 | initializing destination B-hg repository |
|
84 | 84 | abort: Mercurial failed to run itself, check hg executable is in PATH |
|
85 | 85 | [255] |
@@ -14,7 +14,7 b' Convert while testing all possible outpu' | |||
|
14 | 14 | |
|
15 | 15 | $ hg --debug convert svn-repo A-hg |
|
16 | 16 | initializing destination A-hg repository |
|
17 |
reparent to file:// |
|
|
17 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
18 | 18 | run hg sink pre-conversion action |
|
19 | 19 | scanning source... |
|
20 | 20 | found trunk at 'trunk' |
@@ -23,7 +23,7 b' Convert while testing all possible outpu' | |||
|
23 | 23 | found branch branchΓ© at 5 |
|
24 | 24 | found branch branchΓ©e at 6 |
|
25 | 25 | scanning: 1 revisions |
|
26 |
reparent to file:// |
|
|
26 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
27 | 27 | fetching revision log for "/trunk" from 4 to 0 |
|
28 | 28 | parsing revision 4 (2 changes) |
|
29 | 29 | parsing revision 3 (4 changes) |
@@ -33,18 +33,18 b' Convert while testing all possible outpu' | |||
|
33 | 33 | '/branches' is not under '/trunk', ignoring |
|
34 | 34 | '/tags' is not under '/trunk', ignoring |
|
35 | 35 | scanning: 2 revisions |
|
36 |
reparent to file:// |
|
|
36 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob) | |
|
37 | 37 | fetching revision log for "/branches/branchΓ©" from 5 to 0 |
|
38 | 38 | parsing revision 5 (1 changes) |
|
39 |
reparent to file:// |
|
|
40 |
reparent to file:// |
|
|
39 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
40 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob) | |
|
41 | 41 | found parent of branch /branches/branchΓ© at 4: /trunk |
|
42 | 42 | scanning: 3 revisions |
|
43 |
reparent to file:// |
|
|
43 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob) | |
|
44 | 44 | fetching revision log for "/branches/branchΓ©e" from 6 to 0 |
|
45 | 45 | parsing revision 6 (1 changes) |
|
46 |
reparent to file:// |
|
|
47 |
reparent to file:// |
|
|
46 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
47 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob) | |
|
48 | 48 | found parent of branch /branches/branchΓ©e at 5: /branches/branchΓ© |
|
49 | 49 | scanning: 4 revisions |
|
50 | 50 | scanning: 5 revisions |
@@ -57,7 +57,7 b' Convert while testing all possible outpu' | |||
|
57 | 57 | 4 hello |
|
58 | 58 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
|
59 | 59 | converting: 1/6 revisions (16.67%) |
|
60 |
reparent to file:// |
|
|
60 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
61 | 61 | scanning paths: /trunk/Γ 0/3 (0.00%) |
|
62 | 62 | scanning paths: /trunk/Γ /eΜ 1/3 (33.33%) |
|
63 | 63 | scanning paths: /trunk/Γ© 2/3 (66.67%) |
@@ -70,14 +70,14 b' Convert while testing all possible outpu' | |||
|
70 | 70 | converting: 2/6 revisions (33.33%) |
|
71 | 71 | scanning paths: /trunk/Γ 0/4 (0.00%) |
|
72 | 72 | gone from -1 |
|
73 |
reparent to file:// |
|
|
74 |
reparent to file:// |
|
|
73 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
74 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
75 | 75 | scanning paths: /trunk/Γ¨ 1/4 (25.00%) |
|
76 | 76 | copied to Γ¨ from Γ©@2 |
|
77 | 77 | scanning paths: /trunk/Γ© 2/4 (50.00%) |
|
78 | 78 | gone from -1 |
|
79 |
reparent to file:// |
|
|
80 |
reparent to file:// |
|
|
79 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
80 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
81 | 81 | scanning paths: /trunk/ΓΉ 3/4 (75.00%) |
|
82 | 82 | mark /trunk/ΓΉ came from Γ :2 |
|
83 | 83 | Γ /eΜ |
@@ -95,12 +95,12 b' Convert while testing all possible outpu' | |||
|
95 | 95 | converting: 3/6 revisions (50.00%) |
|
96 | 96 | scanning paths: /trunk/Γ¨ 0/2 (0.00%) |
|
97 | 97 | gone from -1 |
|
98 |
reparent to file:// |
|
|
99 |
reparent to file:// |
|
|
98 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
99 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
100 | 100 | scanning paths: /trunk/ΓΉ 1/2 (50.00%) |
|
101 | 101 | gone from -1 |
|
102 |
reparent to file:// |
|
|
103 |
reparent to file:// |
|
|
102 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
103 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/trunk (glob) | |
|
104 | 104 | Γ¨ |
|
105 | 105 | getting files: Γ¨ 1/2 (50.00%) |
|
106 | 106 | ΓΉ/eΜ |
@@ -108,17 +108,17 b' Convert while testing all possible outpu' | |||
|
108 | 108 | 1 branch to branch? |
|
109 | 109 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
|
110 | 110 | converting: 4/6 revisions (66.67%) |
|
111 |
reparent to file:// |
|
|
111 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9 (glob) | |
|
112 | 112 | scanning paths: /branches/branchΓ© 0/1 (0.00%) |
|
113 | 113 | 0 branch to branch?e |
|
114 | 114 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
|
115 | 115 | converting: 5/6 revisions (83.33%) |
|
116 |
reparent to file:// |
|
|
116 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob) | |
|
117 | 117 | scanning paths: /branches/branchΓ©e 0/1 (0.00%) |
|
118 |
reparent to file:// |
|
|
119 |
reparent to file:// |
|
|
120 |
reparent to file:// |
|
|
121 |
reparent to file:// |
|
|
118 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
119 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob) | |
|
120 | reparent to file://*/test-convert-svn-encoding.t/svn-repo (glob) | |
|
121 | reparent to file://*/test-convert-svn-encoding.t/svn-repo/branches/branch%C3%A9e (glob) | |
|
122 | 122 | updating tags |
|
123 | 123 | .hgtags |
|
124 | 124 | run hg sink post-conversion action |
@@ -87,8 +87,8 b' Check move copy records' | |||
|
87 | 87 | Check branches |
|
88 | 88 | |
|
89 | 89 | $ hg branches |
|
90 |
default 13: |
|
|
91 |
d1 6: |
|
|
90 | default 13:* (glob) | |
|
91 | d1 6:* (glob) | |
|
92 | 92 | $ cd .. |
|
93 | 93 | |
|
94 | 94 | $ mkdir test-replace |
@@ -12,7 +12,6 b'' | |||
|
12 | 12 | > EOF |
|
13 | 13 | |
|
14 | 14 | $ svnadmin create svn-repo |
|
15 | $ svnadmin setuuid svn-repo 00000000-0000-0000-0000-000000000000 | |
|
16 | 15 |
$ |
|
17 | 16 | |
|
18 | 17 | |
@@ -175,5 +174,5 b' This is also the only place testing more' | |||
|
175 | 174 | $ cd stoprev |
|
176 | 175 | $ hg tip --debug | grep extra |
|
177 | 176 | extra: branch=default |
|
178 |
extra: convert_revision=svn: |
|
|
177 | extra: convert_revision=svn:........-....-....-....-............/proj B/trunk@1 (re) | |
|
179 | 178 | $ cd .. |
@@ -82,12 +82,12 b' Exporting 4 changesets to a file:' | |||
|
82 | 82 | |
|
83 | 83 | $ hg export -o export_internal 1 2 3 4 |
|
84 | 84 | $ grep HG export_internal | wc -l |
|
85 | \s*4 | |
|
85 | \s*4 (re) | |
|
86 | 86 | |
|
87 | 87 | Exporting 4 changesets to a file: |
|
88 | 88 | |
|
89 | 89 | $ hg export 1 2 3 4 | grep HG | wc -l |
|
90 | \s*4 | |
|
90 | \s*4 (re) | |
|
91 | 91 | |
|
92 | 92 | Exporting revision -2 to a file: |
|
93 | 93 |
@@ -21,7 +21,7 b'' | |||
|
21 | 21 | http incoming |
|
22 | 22 | |
|
23 | 23 | $ hg -R new incoming http://localhost:$HGPORT/ |
|
24 | comparing with http://localhost:\d+/ | |
|
24 | comparing with http://localhost:\d+/ (re) | |
|
25 | 25 | changeset: 0:00a43fa82f62 |
|
26 | 26 | user: test |
|
27 | 27 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -69,7 +69,7 b' http incoming' | |||
|
69 | 69 | summary: 8 |
|
70 | 70 | |
|
71 | 71 | $ hg -R new incoming -r 4 http://localhost:$HGPORT/ |
|
72 | comparing with http://localhost:\d+/ | |
|
72 | comparing with http://localhost:\d+/ (re) | |
|
73 | 73 | changeset: 0:00a43fa82f62 |
|
74 | 74 | user: test |
|
75 | 75 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -222,7 +222,7 b' limit to 2 changesets, test with -p --gi' | |||
|
222 | 222 | test with --bundle |
|
223 | 223 | |
|
224 | 224 | $ hg -R new incoming --bundle test.hg http://localhost:$HGPORT/ |
|
225 |
comparing with http://localhost: |
|
|
225 | comparing with http://localhost:*/ (glob) | |
|
226 | 226 | changeset: 0:00a43fa82f62 |
|
227 | 227 | user: test |
|
228 | 228 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -420,7 +420,7 b' limit to 3 changesets' | |||
|
420 | 420 | summary: 11 |
|
421 | 421 | |
|
422 | 422 | $ hg -R test-dev outgoing http://localhost:$HGPORT/ |
|
423 |
comparing with http://localhost: |
|
|
423 | comparing with http://localhost:*/ (glob) | |
|
424 | 424 | searching for changes |
|
425 | 425 | changeset: 9:d89d4abea5bc |
|
426 | 426 | user: test |
@@ -449,7 +449,7 b' limit to 3 changesets' | |||
|
449 | 449 | summary: 13 |
|
450 | 450 | |
|
451 | 451 | $ hg -R test-dev outgoing -r 11 http://localhost:$HGPORT/ |
|
452 |
comparing with http://localhost: |
|
|
452 | comparing with http://localhost:*/ (glob) | |
|
453 | 453 | searching for changes |
|
454 | 454 | changeset: 9:d89d4abea5bc |
|
455 | 455 | user: test |
@@ -20,7 +20,7 b' qdiff:' | |||
|
20 | 20 | $ hg qdiff |
|
21 | 21 | diff -r d20a80d4def3 base |
|
22 | 22 | --- a/base Thu Jan 01 00:00:00 1970 +0000 |
|
23 |
|
|
|
23 | +++ b/base* (glob) | |
|
24 | 24 | @@ -1,1 +1,1 @@ |
|
25 | 25 | -base |
|
26 | 26 | +patched |
@@ -44,12 +44,12 b'' | |||
|
44 | 44 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
45 | 45 | |
|
46 | 46 | $ hg pull |
|
47 | pulling from http://foo:\*\*\*@localhost:.*/ | |
|
47 | pulling from http://foo:\*\*\*@localhost:.*/ (re) | |
|
48 | 48 | searching for changes |
|
49 | 49 | no changes found |
|
50 | 50 | |
|
51 | 51 | $ hg rollback --dry-run --verbose |
|
52 | rolling back to revision -1 \(undo pull: http://foo:\*\*\*@localhost:.*/\) | |
|
52 | rolling back to revision -1 \(undo pull: http://foo:\*\*\*@localhost:.*/\) (re) | |
|
53 | 53 | |
|
54 | 54 | Issue 622: |
|
55 | 55 |
@@ -2,7 +2,7 b' Simple commands:' | |||
|
2 | 2 | |
|
3 | 3 | $ echo foo |
|
4 | 4 | foo |
|
5 |
$ |
|
|
5 | $ printf 'bar\nbaz\n' | cat | |
|
6 | 6 | bar |
|
7 | 7 | baz |
|
8 | 8 | |
@@ -23,7 +23,7 b' Regular expressions:' | |||
|
23 | 23 | |
|
24 | 24 | Globs: |
|
25 | 25 | |
|
26 |
$ |
|
|
26 | $ printf '* \\foobarbaz {10}\n' | |
|
27 | 27 | \* \\fo?bar* {10} (glob) |
|
28 | 28 | |
|
29 | 29 | Literal match ending in " (re)": |
@@ -73,7 +73,7 b' debugsub' | |||
|
73 | 73 | |
|
74 | 74 | $ hg debugsub |
|
75 | 75 | path s |
|
76 |
source file:/// |
|
|
76 | source file:///*/svn-repo/src (glob) | |
|
77 | 77 | revision 2 |
|
78 | 78 | |
|
79 | 79 | change file in svn and hg, commit |
@@ -82,7 +82,7 b' change file in svn and hg, commit' | |||
|
82 | 82 | $ echo alpha >> s/alpha |
|
83 | 83 | $ hg commit -m 'Message!' |
|
84 | 84 | committing subrepository s |
|
85 |
Sending |
|
|
85 | Sending*s/alpha (glob) | |
|
86 | 86 | Transmitting file data . |
|
87 | 87 | Committed revision 3. |
|
88 | 88 | |
@@ -92,7 +92,7 b' change file in svn and hg, commit' | |||
|
92 | 92 | At revision 3. |
|
93 | 93 | $ hg debugsub |
|
94 | 94 | path s |
|
95 |
source file:/// |
|
|
95 | source file:///*/svn-repo/src (glob) | |
|
96 | 96 | revision 3 |
|
97 | 97 | |
|
98 | 98 | $ echo a > s/a |
@@ -127,7 +127,7 b' this commit from hg will fail' | |||
|
127 | 127 | $ hg ci -m 'amend alpha from hg' |
|
128 | 128 | committing subrepository s |
|
129 | 129 | abort: svn: Commit failed (details follow): |
|
130 | svn: (Out of date)?.*/src/alpha.*(is out of date)? | |
|
130 | svn: (Out of date)?.*/src/alpha.*(is out of date)? (re) | |
|
131 | 131 | [255] |
|
132 | 132 | $ svn revert -q s/alpha |
|
133 | 133 | |
@@ -138,7 +138,7 b' this commit fails because of meta change' | |||
|
138 | 138 | $ hg ci -m 'amend alpha from hg' |
|
139 | 139 | committing subrepository s |
|
140 | 140 | abort: svn: Commit failed (details follow): |
|
141 | svn: (Out of date)?.*/src/alpha.*(is out of date)? | |
|
141 | svn: (Out of date)?.*/src/alpha.*(is out of date)? (re) | |
|
142 | 142 | [255] |
|
143 | 143 | $ svn revert -q s/alpha |
|
144 | 144 | |
@@ -192,7 +192,7 b' debugsub in clone' | |||
|
192 | 192 | |
|
193 | 193 | $ hg debugsub |
|
194 | 194 | path s |
|
195 |
source file:/// |
|
|
195 | source file:///*/svn-repo/src (glob) | |
|
196 | 196 | revision 3 |
|
197 | 197 | |
|
198 | 198 | verify subrepo is contained within the repo directory |
General Comments 0
You need to be logged in to leave comments.
Login now