Show More
@@ -181,8 +181,6 b' utestpats = [' | |||||
181 | (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite " |
|
181 | (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite " | |
182 | "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx |
|
182 | "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx | |
183 | '# no-msys'), # in test-pull.t which is skipped on windows |
|
183 | '# no-msys'), # in test-pull.t which is skipped on windows | |
184 | (r'^ .*file://\$TESTTMP', |
|
|||
185 | 'write "file:/*/$TESTTMP" + (glob) to match on windows too'), |
|
|||
186 | (r'^ [^$>].*27\.0\.0\.1', |
|
184 | (r'^ [^$>].*27\.0\.0\.1', | |
187 | 'use $LOCALIP not an explicit loopback address'), |
|
185 | 'use $LOCALIP not an explicit loopback address'), | |
188 | (r'^ (?![>$] ).*\$LOCALIP.*[^)]$', |
|
186 | (r'^ (?![>$] ).*\$LOCALIP.*[^)]$', |
@@ -38,6 +38,14 b' substitutions = [' | |||||
38 | (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET', |
|
38 | (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET', | |
39 | br' - - [$LOGDATE$] "GET' |
|
39 | br' - - [$LOGDATE$] "GET' | |
40 | ), |
|
40 | ), | |
|
41 | # Windows has an extra '/' in the following lines that get globbed away: | |||
|
42 | # pushing to file:/*/$TESTTMP/r2 (glob) | |||
|
43 | # comparing with file:/*/$TESTTMP/r2 (glob) | |||
|
44 | # sub/maybelarge.dat: largefile 34..9c not available from | |||
|
45 | # file:/*/$TESTTMP/largefiles-repo (glob) | |||
|
46 | (br'(.*file:/)/?(/\$TESTTMP.*)', | |||
|
47 | lambda m: m.group(1) + b'*' + m.group(2) + b' (glob)' | |||
|
48 | ), | |||
41 | ] |
|
49 | ] | |
42 |
|
50 | |||
43 | # Various platform error strings, keyed on a common replacement string |
|
51 | # Various platform error strings, keyed on a common replacement string |
@@ -91,10 +91,10 b' debugsub' | |||||
91 |
|
91 | |||
92 | $ hg debugsub |
|
92 | $ hg debugsub | |
93 | path s |
|
93 | path s | |
94 |
source file:/ |
|
94 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
95 | revision 2 |
|
95 | revision 2 | |
96 | path subdir/s |
|
96 | path subdir/s | |
97 |
|
|
97 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
98 | revision 2 |
|
98 | revision 2 | |
99 |
|
99 | |||
100 | change file in svn and hg, commit |
|
100 | change file in svn and hg, commit | |
@@ -117,10 +117,10 b' change file in svn and hg, commit' | |||||
117 | At revision 3. |
|
117 | At revision 3. | |
118 | $ hg debugsub |
|
118 | $ hg debugsub | |
119 | path s |
|
119 | path s | |
120 |
source file:/ |
|
120 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
121 | revision 3 |
|
121 | revision 3 | |
122 | path subdir/s |
|
122 | path subdir/s | |
123 |
|
|
123 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
124 | revision 2 |
|
124 | revision 2 | |
125 |
|
125 | |||
126 | missing svn file, commit should fail |
|
126 | missing svn file, commit should fail | |
@@ -239,10 +239,10 b' debugsub in clone' | |||||
239 |
|
239 | |||
240 | $ hg debugsub |
|
240 | $ hg debugsub | |
241 | path s |
|
241 | path s | |
242 |
source file:/ |
|
242 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
243 | revision 3 |
|
243 | revision 3 | |
244 | path subdir/s |
|
244 | path subdir/s | |
245 |
|
|
245 | source file:/*/$TESTTMP/svn-repo/src (glob) | |
246 | revision 2 |
|
246 | revision 2 | |
247 |
|
247 | |||
248 | verify subrepo is contained within the repo directory |
|
248 | verify subrepo is contained within the repo directory |
General Comments 0
You need to be logged in to leave comments.
Login now