Show More
@@ -508,7 +508,7 b' def pytest(test, wd, options, replacemen' | |||
|
508 | 508 | return run(cmd, wd, options, replacements) |
|
509 | 509 | |
|
510 | 510 | def shtest(test, wd, options, replacements): |
|
511 | cmd = '"%s"' % test | |
|
511 | cmd = '%s "%s"' % (options.shell, test) | |
|
512 | 512 | vlog("# Running", cmd) |
|
513 | 513 | return run(cmd, wd, options, replacements) |
|
514 | 514 |
@@ -868,10 +868,10 b' file specified by acl.config does not ex' | |||
|
868 | 868 | added 3 changesets with 3 changes to 3 files |
|
869 | 869 | calling hook pretxnchangegroup.acl: hgext.acl.hook |
|
870 | 870 | acl: checking access for user "barney" |
|
871 |
error: pretxnchangegroup.acl hook raised an exception: [Errno 2] |
|
|
871 | error: pretxnchangegroup.acl hook raised an exception: [Errno 2] *: '../acl.config' (glob) | |
|
872 | 872 | transaction abort! |
|
873 | 873 | rollback completed |
|
874 | abort: No such file or directory: ../acl.config | |
|
874 | abort: *: ../acl.config (glob) | |
|
875 | 875 | no rollback information available |
|
876 | 876 | 0:6675d58eff77 |
|
877 | 877 |
@@ -123,11 +123,11 b' Issue683: peculiarity with hg revert of ' | |||
|
123 | 123 | ? a.orig |
|
124 | 124 | |
|
125 | 125 | $ hg add c && echo "unexpected addition of missing file" |
|
126 | c: No such file or directory | |
|
126 | c: * (glob) | |
|
127 | 127 | [1] |
|
128 | 128 | $ echo c > c |
|
129 | 129 | $ hg add d c && echo "unexpected addition of missing file" |
|
130 | d: No such file or directory | |
|
130 | d: * (glob) | |
|
131 | 131 | [1] |
|
132 | 132 | $ hg st |
|
133 | 133 | M a |
@@ -80,5 +80,5 b' attack /tmp/test' | |||
|
80 | 80 | $ hg manifest -r4 |
|
81 | 81 | /tmp/test |
|
82 | 82 | $ hg update -Cr4 |
|
83 |
abort: |
|
|
83 | abort: *: $TESTTMP/target//tmp/test (glob) | |
|
84 | 84 | [255] |
@@ -48,8 +48,8 b' backout of backout is as if nothing happ' | |||
|
48 | 48 | $ hg backout -d '3 0' --merge tip --tool=true |
|
49 | 49 | removing a |
|
50 | 50 | changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d |
|
51 | $ cat a 2>/dev/null || echo cat: a: No such file or directory | |
|
52 | cat: a: No such file or directory | |
|
51 | $ test -f a | |
|
52 | [1] | |
|
53 | 53 | |
|
54 | 54 | across branch |
|
55 | 55 |
@@ -4,8 +4,8 b'' | |||
|
4 | 4 | abort: error: Connection refused |
|
5 | 5 | [255] |
|
6 | 6 | |
|
7 | $ test -d copy || echo copy: No such file or directory | |
|
8 | copy: No such file or directory | |
|
7 | $ test -d copy | |
|
8 | [1] | |
|
9 | 9 | |
|
10 | 10 | $ cat > dumb.py <<EOF |
|
11 | 11 | > import BaseHTTPServer, SimpleHTTPServer, os, signal |
@@ -1,3 +1,5 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
1 | 3 | Setting up test |
|
2 | 4 | |
|
3 | 5 | $ hg init test |
@@ -375,7 +377,7 b' Outgoing -R full.hg vs partial2 in parti' | |||
|
375 | 377 | Outgoing -R does-not-exist.hg vs partial2 in partial |
|
376 | 378 | |
|
377 | 379 | $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 |
|
378 |
abort: |
|
|
380 | abort: *: ../does-not-exist.hg (glob) | |
|
379 | 381 | [255] |
|
380 | 382 | $ cd .. |
|
381 | 383 | |
@@ -408,7 +410,7 b' When cloning from a non-copiable reposit' | |||
|
408 | 410 | recurse infinitely (issue 2528) |
|
409 | 411 | |
|
410 | 412 | $ hg clone full.hg '' |
|
411 | abort: No such file or directory | |
|
413 | abort: * (glob) | |
|
412 | 414 | [255] |
|
413 | 415 | |
|
414 | 416 | test for http://mercurial.selenic.com/bts/issue216 |
@@ -10,7 +10,7 b' Prepare repo a:' | |||
|
10 | 10 | |
|
11 | 11 | Create a non-inlined filelog: |
|
12 | 12 | |
|
13 | $ python -c 'for x in range(10000): print x' >> data1 | |
|
13 | $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))' | |
|
14 | 14 | $ for j in 0 1 2 3 4 5 6 7 8 9; do |
|
15 | 15 | > cat data1 >> b |
|
16 | 16 | > hg commit -m test |
@@ -43,7 +43,7 b' Default operation:' | |||
|
43 | 43 | Invalid dest '' must abort: |
|
44 | 44 | |
|
45 | 45 | $ hg clone . '' |
|
46 | abort: No such file or directory | |
|
46 | abort: * (glob) | |
|
47 | 47 | [255] |
|
48 | 48 | |
|
49 | 49 | No update, with debug option: |
@@ -85,7 +85,7 b' Check that path aliases are expanded:' | |||
|
85 | 85 | |
|
86 | 86 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f |
|
87 | 87 | $ hg -R f showconfig paths.default |
|
88 | $TESTTMP/a#0 | |
|
88 | $TESTTMP/a#0 (glob) | |
|
89 | 89 | |
|
90 | 90 | Use --pull: |
|
91 | 91 | |
@@ -107,7 +107,7 b' Use --pull:' | |||
|
107 | 107 | Invalid dest '' with --pull must abort (issue2528): |
|
108 | 108 | |
|
109 | 109 | $ hg clone --pull a '' |
|
110 | abort: No such file or directory | |
|
110 | abort: * (glob) | |
|
111 | 111 | [255] |
|
112 | 112 | |
|
113 | 113 | Clone to '.': |
@@ -73,7 +73,7 b' commit added file that has been deleted' | |||
|
73 | 73 | $ cd .. |
|
74 | 74 | |
|
75 | 75 | $ hg commit -m commit-14 does-not-exist |
|
76 |
abort: does-not-exist: |
|
|
76 | abort: does-not-exist: * (glob) | |
|
77 | 77 | [255] |
|
78 | 78 | $ ln -s foo baz |
|
79 | 79 | $ hg commit -m commit-15 baz |
@@ -2,8 +2,8 b'' | |||
|
2 | 2 | $ cd a |
|
3 | 3 | |
|
4 | 4 | $ hg diff inexistent1 inexistent2 |
|
5 | inexistent1: No such file or directory | |
|
6 | inexistent2: No such file or directory | |
|
5 | inexistent1: * (glob) | |
|
6 | inexistent2: * (glob) | |
|
7 | 7 | |
|
8 | 8 | $ echo bar > foo |
|
9 | 9 | $ hg add foo |
@@ -1,6 +1,6 b'' | |||
|
1 | 1 | $ hg init |
|
2 | 2 | |
|
3 |
$ python -c ' |
|
|
3 | $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")' | |
|
4 | 4 | $ hg ci -Ama -d '1 0' |
|
5 | 5 | adding a |
|
6 | 6 |
@@ -1,6 +1,6 b'' | |||
|
1 | 1 | import sys, os, subprocess |
|
2 | 2 | |
|
3 | if subprocess.call(['%s/hghave' % os.environ['TESTDIR'], 'cacheable']): | |
|
3 | if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'], 'cacheable']): | |
|
4 | 4 | sys.exit(80) |
|
5 | 5 | |
|
6 | 6 | from mercurial import util, scmutil, extensions |
@@ -233,7 +233,7 b' override commit message' | |||
|
233 | 233 | > msg.set_payload('email commit message\n' + patch) |
|
234 | 234 | > msg['Subject'] = 'email patch' |
|
235 | 235 | > msg['From'] = 'email patcher' |
|
236 |
> sys. |
|
|
236 | > file(sys.argv[2], 'wb').write(msg.as_string()) | |
|
237 | 237 | > EOF |
|
238 | 238 | |
|
239 | 239 | |
@@ -246,7 +246,7 b' plain diff in email, subject, message bo' | |||
|
246 | 246 | added 1 changesets with 2 changes to 2 files |
|
247 | 247 | updating to branch default |
|
248 | 248 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
249 |
$ python mkmsg.py diffed-tip.patch |
|
|
249 | $ python mkmsg.py diffed-tip.patch msg.patch | |
|
250 | 250 | $ hg --cwd b import ../msg.patch |
|
251 | 251 | applying ../msg.patch |
|
252 | 252 | $ hg --cwd b tip | grep email |
@@ -308,7 +308,8 b' hg export in email, should use patch hea' | |||
|
308 | 308 | added 1 changesets with 2 changes to 2 files |
|
309 | 309 | updating to branch default |
|
310 | 310 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
311 |
$ python mkmsg.py exported-tip.patch |
|
|
311 | $ python mkmsg.py exported-tip.patch msg.patch | |
|
312 | $ cat msg.patch | hg --cwd b import - | |
|
312 | 313 | applying patch from stdin |
|
313 | 314 | $ hg --cwd b tip | grep second |
|
314 | 315 | summary: second change |
@@ -325,7 +326,7 b" The '---' tests the gitsendmail handling" | |||
|
325 | 326 | > msg.set_payload('email patch\n\nnext line\n---\n' + patch) |
|
326 | 327 | > msg['Subject'] = '[PATCH] email patch' |
|
327 | 328 | > msg['From'] = 'email patcher' |
|
328 |
> sys. |
|
|
329 | > file(sys.argv[2], 'wb').write(msg.as_string()) | |
|
329 | 330 | > EOF |
|
330 | 331 | |
|
331 | 332 | |
@@ -338,7 +339,8 b' plain diff in email, [PATCH] subject, me' | |||
|
338 | 339 | added 1 changesets with 2 changes to 2 files |
|
339 | 340 | updating to branch default |
|
340 | 341 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
341 |
$ python mkmsg2.py diffed-tip.patch |
|
|
342 | $ python mkmsg2.py diffed-tip.patch msg.patch | |
|
343 | $ cat msg.patch | hg --cwd b import - | |
|
342 | 344 | applying patch from stdin |
|
343 | 345 | $ hg --cwd b tip --template '{desc}\n' |
|
344 | 346 | email patch |
@@ -818,6 +818,7 b' We have to simulate that here by setting' | |||
|
818 | 818 | getting changed largefiles |
|
819 | 819 | 1 largefiles updated, 0 removed |
|
820 | 820 | $ cd .. |
|
821 | $ chmod -R u+w alice/pubrepo | |
|
821 | 822 | $ HOME="$ORIGHOME" |
|
822 | 823 | |
|
823 | 824 | Symlink to a large largefile should behave the same as a symlink to a normal file |
@@ -77,7 +77,7 b' Interactive merge:' | |||
|
77 | 77 | |
|
78 | 78 | $ status |
|
79 | 79 | --- status --- |
|
80 | file2: No such file or directory | |
|
80 | file2: * (glob) | |
|
81 | 81 | C file1 |
|
82 | 82 | --- file1 --- |
|
83 | 83 | 1 |
@@ -133,7 +133,7 b' Interactive merge with not enough input:' | |||
|
133 | 133 | |
|
134 | 134 | $ status |
|
135 | 135 | --- status --- |
|
136 | file2: No such file or directory | |
|
136 | file2: * (glob) | |
|
137 | 137 | C file1 |
|
138 | 138 | --- file1 --- |
|
139 | 139 | 1 |
@@ -1,3 +1,5 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
1 | 3 | test merge-tools configuration - mostly exercising filemerge.py |
|
2 | 4 | |
|
3 | 5 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
@@ -123,7 +123,7 b' plain headers' | |||
|
123 | 123 | A series |
|
124 | 124 | A uncommitted.patch |
|
125 | 125 | % qnew missing |
|
126 | abort: missing: No such file or directory | |
|
126 | abort: missing: * (glob) | |
|
127 | 127 | % qnew -m |
|
128 | 128 | foo bar |
|
129 | 129 | |
@@ -190,7 +190,7 b' hg headers' | |||
|
190 | 190 | A series |
|
191 | 191 | A uncommitted.patch |
|
192 | 192 | % qnew missing |
|
193 | abort: missing: No such file or directory | |
|
193 | abort: missing: * (glob) | |
|
194 | 194 | % qnew -m |
|
195 | 195 | # HG changeset patch |
|
196 | 196 | # Parent |
@@ -1,3 +1,5 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
1 | 3 | $ fixheaders() |
|
2 | 4 | > { |
|
3 | 5 | > sed -e 's/\(Message-Id:.*@\).*/\1/' \ |
@@ -1,3 +1,5 b'' | |||
|
1 | $ "$TESTDIR/hghave" system-sh || exit 80 | |
|
2 | ||
|
1 | 3 | Verify that pending changesets are seen by pretxn* hooks but not by other |
|
2 | 4 | processes that access the destination repo while the hooks are running. |
|
3 | 5 |
@@ -1,3 +1,5 b'' | |||
|
1 | $ "$TESTDIR/hghave" unix-permissions || exit 80 | |
|
2 | ||
|
1 | 3 | $ hg init a |
|
2 | 4 | $ cd a |
|
3 | 5 | $ echo foo > b |
@@ -107,7 +107,7 b' help (bad mq)' | |||
|
107 | 107 | |
|
108 | 108 | $ echo "mq=nonexistant" >> $HGRCPATH |
|
109 | 109 | $ hg help qrecord |
|
110 |
*** failed to import extension mq from nonexistant: [Errno 2] |
|
|
110 | *** failed to import extension mq from nonexistant: [Errno 2] * (glob) | |
|
111 | 111 | hg qrecord [OPTION]... PATCH [FILE]... |
|
112 | 112 | |
|
113 | 113 | interactively record a new patch |
@@ -372,7 +372,7 b' Ensure --continue restores a correct sta' | |||
|
372 | 372 | [255] |
|
373 | 373 | $ hg resolve --all -t internal:local |
|
374 | 374 | $ hg rebase -c |
|
375 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg | |
|
375 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) | |
|
376 | 376 | $ hg tglog |
|
377 | 377 | @ 8: 'H2' |
|
378 | 378 | | |
@@ -82,7 +82,7 b' should show b deleted' | |||
|
82 | 82 | should not find b |
|
83 | 83 | |
|
84 | 84 | $ hg status b |
|
85 | b: No such file or directory | |
|
85 | b: * (glob) | |
|
86 | 86 | |
|
87 | 87 | should show a c e |
|
88 | 88 |
@@ -134,7 +134,7 b' hg status:' | |||
|
134 | 134 | hg status modified added removed deleted unknown never-existed ignored: |
|
135 | 135 | |
|
136 | 136 | $ hg status --color=always modified added removed deleted unknown never-existed ignored |
|
137 | never-existed: No such file or directory | |
|
137 | never-existed: * (glob) | |
|
138 | 138 | \x1b[0;32;1mA added\x1b[0m (esc) |
|
139 | 139 | \x1b[0;31;1mR removed\x1b[0m (esc) |
|
140 | 140 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) |
@@ -127,7 +127,7 b' hg status:' | |||
|
127 | 127 | hg status modified added removed deleted unknown never-existed ignored: |
|
128 | 128 | |
|
129 | 129 | $ hg status modified added removed deleted unknown never-existed ignored |
|
130 | never-existed: No such file or directory | |
|
130 | never-existed: * (glob) | |
|
131 | 131 | A added |
|
132 | 132 | R removed |
|
133 | 133 | ! deleted |
@@ -23,10 +23,10 b' Add files --- .hgsub files must go first' | |||
|
23 | 23 | $ hg add -S .hgsub |
|
24 | 24 | $ hg add -S foo/.hgsub |
|
25 | 25 | $ hg add -S foo/bar |
|
26 | adding foo/bar/z.txt | |
|
26 | adding foo/bar/z.txt (glob) | |
|
27 | 27 | $ hg add -S |
|
28 | 28 | adding x.txt |
|
29 | adding foo/y.txt | |
|
29 | adding foo/y.txt (glob) | |
|
30 | 30 | |
|
31 | 31 | Test recursive status without committing anything: |
|
32 | 32 | |
@@ -67,7 +67,7 b' The --subrepos flag overwrite the config' | |||
|
67 | 67 | |
|
68 | 68 | $ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos |
|
69 | 69 | committing subrepository foo |
|
70 | committing subrepository foo/bar | |
|
70 | committing subrepository foo/bar (glob) | |
|
71 | 71 | |
|
72 | 72 | $ cd foo |
|
73 | 73 | $ echo y2 >> y.txt |
@@ -186,7 +186,7 b' Cleanup and final commit:' | |||
|
186 | 186 | $ rm -r dir |
|
187 | 187 | $ hg commit --subrepos -m 2-3-2 |
|
188 | 188 | committing subrepository foo |
|
189 | committing subrepository foo/bar | |
|
189 | committing subrepository foo/bar (glob) | |
|
190 | 190 | |
|
191 | 191 | Log with the relationships between repo and its subrepo: |
|
192 | 192 | |
@@ -342,7 +342,7 b' cloned:' | |||
|
342 | 342 | archiving (foo/bar) [================================>] 1/1 (glob) |
|
343 | 343 | |
|
344 | 344 | cloning subrepo foo from $TESTTMP/repo/foo |
|
345 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar | |
|
345 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) | |
|
346 | 346 | |
|
347 | 347 | The newly cloned subrepos contain no working copy: |
|
348 | 348 | |
@@ -365,7 +365,7 b' created by archive:' | |||
|
365 | 365 | $ echo f > foo/f |
|
366 | 366 | $ hg archive --subrepos -r tip archive |
|
367 | 367 | cloning subrepo foo from $TESTTMP/empty/foo |
|
368 | abort: destination '$TESTTMP/almost-empty/foo' is not empty | |
|
368 | abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob) | |
|
369 | 369 | [255] |
|
370 | 370 | |
|
371 | 371 | Clone and test outgoing: |
@@ -374,11 +374,11 b' Clone and test outgoing:' | |||
|
374 | 374 | $ hg clone repo repo2 |
|
375 | 375 | updating to branch default |
|
376 | 376 | cloning subrepo foo from $TESTTMP/repo/foo |
|
377 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar | |
|
377 | cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob) | |
|
378 | 378 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
379 | 379 | $ cd repo2 |
|
380 | 380 | $ hg outgoing -S |
|
381 | comparing with $TESTTMP/repo | |
|
381 | comparing with $TESTTMP/repo (glob) | |
|
382 | 382 | searching for changes |
|
383 | 383 | no changes found |
|
384 | 384 | comparing with $TESTTMP/repo/foo |
@@ -404,7 +404,7 b' Make nested change:' | |||
|
404 | 404 | $ hg commit --subrepos -m 3-4-2 |
|
405 | 405 | committing subrepository foo |
|
406 | 406 | $ hg outgoing -S |
|
407 | comparing with $TESTTMP/repo | |
|
407 | comparing with $TESTTMP/repo (glob) | |
|
408 | 408 | searching for changes |
|
409 | 409 | changeset: 3:2655b8ecc4ee |
|
410 | 410 | tag: tip |
@@ -434,7 +434,7 b' Switch to original repo and setup defaul' | |||
|
434 | 434 | Test incoming: |
|
435 | 435 | |
|
436 | 436 | $ hg incoming -S |
|
437 | comparing with $TESTTMP/repo2 | |
|
437 | comparing with $TESTTMP/repo2 (glob) | |
|
438 | 438 | searching for changes |
|
439 | 439 | changeset: 3:2655b8ecc4ee |
|
440 | 440 | tag: tip |
@@ -949,8 +949,8 b' Adding without a path or pattern with -S' | |||
|
949 | 949 | ? s/f9 |
|
950 | 950 | $ hg add -S |
|
951 | 951 | adding f8 |
|
952 | adding s/f10 | |
|
953 | adding s/f9 | |
|
952 | adding s/f10 (glob) | |
|
953 | adding s/f9 (glob) | |
|
954 | 954 | $ hg st -S |
|
955 | 955 | A f8 |
|
956 | 956 | A s/f10 |
@@ -993,7 +993,7 b' Adding with a pattern with -S also adds ' | |||
|
993 | 993 | ? s/fn18 |
|
994 | 994 | $ hg add -S 'glob:**fm*' |
|
995 | 995 | adding fm15 |
|
996 | adding s/fm17 | |
|
996 | adding s/fm17 (glob) | |
|
997 | 997 | $ hg st -S |
|
998 | 998 | A fm15 |
|
999 | 999 | A s/fm17 |
@@ -274,7 +274,7 b' Test patterns:' | |||
|
274 | 274 | f mammals/skunk mammals/skunk |
|
275 | 275 | $ hg debugwalk 'glob:j*' |
|
276 | 276 | $ hg debugwalk NOEXIST |
|
277 | NOEXIST: No such file or directory | |
|
277 | NOEXIST: * (glob) | |
|
278 | 278 | |
|
279 | 279 | $ mkfifo fifo |
|
280 | 280 | $ hg debugwalk fifo |
@@ -112,7 +112,7 b' and now for something completely differe' | |||
|
112 | 112 | abort: pretxncommit.crlf hook failed |
|
113 | 113 | [255] |
|
114 | 114 | $ hg revert -a |
|
115 | forgetting d/f2 | |
|
115 | forgetting d/f2 (glob) | |
|
116 | 116 | $ rm d/f2 |
|
117 | 117 | |
|
118 | 118 | $ hg rem f |
@@ -177,10 +177,10 b' and now for something completely differe' | |||
|
177 | 177 | |
|
178 | 178 | $ for x in a b c d; do echo content > dupe/$x; done |
|
179 | 179 | $ hg -R dupe add |
|
180 | adding dupe/a | |
|
181 | adding dupe/b | |
|
182 | adding dupe/c | |
|
183 | adding dupe/d | |
|
180 | adding dupe/a (glob) | |
|
181 | adding dupe/b (glob) | |
|
182 | adding dupe/c (glob) | |
|
183 | adding dupe/d (glob) | |
|
184 | 184 | $ python unix2dos.py dupe/b dupe/c dupe/d |
|
185 | 185 | $ hg -R dupe ci -m a dupe/a |
|
186 | 186 | $ hg -R dupe ci -m b/c dupe/[bc] |
General Comments 0
You need to be logged in to leave comments.
Login now