##// END OF EJS Templates
tests: add exit codes to unified tests
Matt Mackall -
r12316:4134686b default
parent child Browse files
Show More
@@ -474,7 +474,7 b' def tsttest(test, options):'
474 after.setdefault(pos, []).append(l)
474 after.setdefault(pos, []).append(l)
475 prepos = pos
475 prepos = pos
476 pos = n
476 pos = n
477 script.append('echo %s %s\n' % (salt, n))
477 script.append('echo %s %s $?\n' % (salt, n))
478 script.append(l[4:])
478 script.append(l[4:])
479 elif l.startswith(' > '): # continuations
479 elif l.startswith(' > '): # continuations
480 after.setdefault(prepos, []).append(l)
480 after.setdefault(prepos, []).append(l)
@@ -486,6 +486,8 b' def tsttest(test, options):'
486 # non-command/result - queue up for merged output
486 # non-command/result - queue up for merged output
487 after.setdefault(pos, []).append(l)
487 after.setdefault(pos, []).append(l)
488
488
489 script.append('echo %s %s $?\n' % (salt, n + 1))
490
489 fd, name = tempfile.mkstemp(suffix='hg-tst')
491 fd, name = tempfile.mkstemp(suffix='hg-tst')
490
492
491 try:
493 try:
@@ -508,8 +510,13 b' def tsttest(test, options):'
508
510
509 pos = -1
511 pos = -1
510 postout = []
512 postout = []
513 ret = 0
511 for n, l in enumerate(output):
514 for n, l in enumerate(output):
512 if l.startswith(salt):
515 if l.startswith(salt):
516 # add on last return code
517 ret = int(l.split()[2])
518 if ret != 0:
519 postout.append(" [%s]\n" % ret)
513 if pos in after:
520 if pos in after:
514 postout += after.pop(pos)
521 postout += after.pop(pos)
515 pos = int(l.split()[1])
522 pos = int(l.split()[1])
@@ -24,10 +24,12 b' called and .hg/journal.dirstate will not'
24 transaction abort!
24 transaction abort!
25 rollback completed
25 rollback completed
26 abort: no commits allowed
26 abort: no commits allowed
27 [255]
27 $ hg ci -m foo
28 $ hg ci -m foo
28 error: pretxncommit.nocommits hook failed: no commits allowed
29 error: pretxncommit.nocommits hook failed: no commits allowed
29 transaction abort!
30 transaction abort!
30 rollback completed
31 rollback completed
31 abort: no commits allowed
32 abort: no commits allowed
33 [255]
32
34
33 $ exit 0
35 $ exit 0
@@ -54,6 +54,7 b' should fail'
54 merging a failed!
54 merging a failed!
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
55 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
56 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
57 [1]
57 $ hg st
58 $ hg st
58 M a
59 M a
59 ? a.orig
60 ? a.orig
@@ -86,9 +87,11 b' issue683'
86
87
87 $ hg add c && echo "unexpected addition of missing file"
88 $ hg add c && echo "unexpected addition of missing file"
88 c: No such file or directory
89 c: No such file or directory
90 [1]
89 $ echo c > c
91 $ echo c > c
90 $ hg add d c && echo "unexpected addition of missing file"
92 $ hg add d c && echo "unexpected addition of missing file"
91 d: No such file or directory
93 d: No such file or directory
94 [1]
92 $ hg st
95 $ hg st
93 M a
96 M a
94 A c
97 A c
@@ -59,10 +59,13 b' should all fail'
59
59
60 $ hg addremove -s foo
60 $ hg addremove -s foo
61 abort: similarity must be a number
61 abort: similarity must be a number
62 [255]
62 $ hg addremove -s -1
63 $ hg addremove -s -1
63 abort: similarity must be between 0 and 100
64 abort: similarity must be between 0 and 100
65 [255]
64 $ hg addremove -s 1e6
66 $ hg addremove -s 1e6
65 abort: similarity must be between 0 and 100
67 abort: similarity must be between 0 and 100
68 [255]
66
69
67 $ cd ..
70 $ cd ..
68
71
@@ -197,5 +197,6 b' invalid arguments'
197 Returns 0 on success.
197 Returns 0 on success.
198
198
199 use "hg -v help rt" to show global options
199 use "hg -v help rt" to show global options
200 [255]
200
201
201 $ exit 0
202 $ exit 0
@@ -164,6 +164,7 b' archives and rename them afterwards.'
164
164
165 $ hg archive -t zip -p /illegal test.zip
165 $ hg archive -t zip -p /illegal test.zip
166 abort: archive prefix contains illegal components
166 abort: archive prefix contains illegal components
167 [255]
167 $ hg archive -t zip -p very/../bad test.zip
168 $ hg archive -t zip -p very/../bad test.zip
168
169
169 $ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip
170 $ hg archive --config ui.archivemeta=false -t zip -r 2 test.zip
@@ -205,6 +206,7 b' test .hg_archival.txt'
205
206
206 $ hg archive -t bogus test.bogus
207 $ hg archive -t bogus test.bogus
207 abort: unknown archive type 'bogus'
208 abort: unknown archive type 'bogus'
209 [255]
208
210
209 server errors
211 server errors
210
212
@@ -216,5 +218,6 b' empty repo'
216 $ cd ../empty
218 $ cd ../empty
217 $ hg archive ../test-empty
219 $ hg archive ../test-empty
218 abort: no working directory: please specify a revision
220 abort: no working directory: please specify a revision
221 [255]
219
222
220 $ exit 0
223 $ exit 0
@@ -4,6 +4,7 b' should fail'
4
4
5 $ hg add .hg/00changelog.i
5 $ hg add .hg/00changelog.i
6 abort: path contains illegal component: .hg/00changelog.i
6 abort: path contains illegal component: .hg/00changelog.i
7 [255]
7
8
8 $ mkdir a
9 $ mkdir a
9 $ echo a > a/a
10 $ echo a > a/a
@@ -16,6 +17,7 b' should fail'
16
17
17 $ hg add b/b
18 $ hg add b/b
18 abort: path 'b/b' traverses symbolic link 'b'
19 abort: path 'b/b' traverses symbolic link 'b'
20 [255]
19
21
20 should succeed
22 should succeed
21
23
@@ -25,6 +27,7 b' should still fail - maybe'
25
27
26 $ hg add b/b
28 $ hg add b/b
27 abort: path 'b/b' traverses symbolic link 'b'
29 abort: path 'b/b' traverses symbolic link 'b'
30 [255]
28
31
29 unbundle tampered bundle
32 unbundle tampered bundle
30
33
@@ -43,6 +46,7 b' attack .hg/test'
43 .hg/test
46 .hg/test
44 $ hg update -Cr0
47 $ hg update -Cr0
45 abort: path contains illegal component: .hg/test
48 abort: path contains illegal component: .hg/test
49 [255]
46
50
47 attack foo/.hg/test
51 attack foo/.hg/test
48
52
@@ -50,6 +54,7 b' attack foo/.hg/test'
50 foo/.hg/test
54 foo/.hg/test
51 $ hg update -Cr1
55 $ hg update -Cr1
52 abort: path 'foo/.hg/test' is inside repo 'foo'
56 abort: path 'foo/.hg/test' is inside repo 'foo'
57 [255]
53
58
54 attack back/test where back symlinks to ..
59 attack back/test where back symlinks to ..
55
60
@@ -58,6 +63,7 b' attack back/test where back symlinks to '
58 back/test
63 back/test
59 $ hg update -Cr2
64 $ hg update -Cr2
60 abort: path 'back/test' traverses symbolic link 'back'
65 abort: path 'back/test' traverses symbolic link 'back'
66 [255]
61
67
62 attack ../test
68 attack ../test
63
69
@@ -65,6 +71,7 b' attack ../test'
65 ../test
71 ../test
66 $ hg update -Cr3
72 $ hg update -Cr3
67 abort: path contains illegal component: ../test
73 abort: path contains illegal component: ../test
74 [255]
68
75
69 attack /tmp/test
76 attack /tmp/test
70
77
@@ -72,5 +79,6 b' attack /tmp/test'
72 /tmp/test
79 /tmp/test
73 $ hg update -Cr4
80 $ hg update -Cr4
74 abort: No such file or directory: .*/test-audit-path.t/target//tmp/test
81 abort: No such file or directory: .*/test-audit-path.t/target//tmp/test
82 [255]
75
83
76 $ exit 0
84 $ exit 0
@@ -7,8 +7,10 b''
7
7
8 $ hg backout
8 $ hg backout
9 abort: please specify a revision to backout
9 abort: please specify a revision to backout
10 [255]
10 $ hg backout -r 0 0
11 $ hg backout -r 0 0
11 abort: please specify just one revision
12 abort: please specify just one revision
13 [255]
12
14
13 # basic operation
15 # basic operation
14
16
@@ -69,6 +71,7 b' should fail'
69
71
70 $ hg backout 1
72 $ hg backout 1
71 abort: cannot backout change on a different branch
73 abort: cannot backout change on a different branch
74 [255]
72 $ echo c > c
75 $ echo c > c
73 $ hg ci -Am2
76 $ hg ci -Am2
74 adding c
77 adding c
@@ -78,6 +81,7 b' should fail'
78
81
79 $ hg backout 1
82 $ hg backout 1
80 abort: cannot backout change on a different branch
83 abort: cannot backout change on a different branch
84 [255]
81
85
82 # backout with merge
86 # backout with merge
83
87
@@ -138,6 +142,7 b' check line 1 is back'
138 $ hg update -C tip
142 $ hg update -C tip
139 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
143 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
140 $ hg locate b
144 $ hg locate b
145 [1]
141
146
142 $ cd ..
147 $ cd ..
143 $ hg init m
148 $ hg init m
@@ -166,16 +171,19 b' check line 1 is back'
166
171
167 $ hg backout 4
172 $ hg backout 4
168 abort: cannot backout a merge changeset without --parent
173 abort: cannot backout a merge changeset without --parent
174 [255]
169
175
170 # backout of merge with bad parent should fail
176 # backout of merge with bad parent should fail
171
177
172 $ hg backout --parent 0 4
178 $ hg backout --parent 0 4
173 abort: cb9a9f314b8b is not a parent of b2f3bb92043e
179 abort: cb9a9f314b8b is not a parent of b2f3bb92043e
180 [255]
174
181
175 # backout of non-merge with parent should fail
182 # backout of non-merge with parent should fail
176
183
177 $ hg backout --parent 0 3
184 $ hg backout --parent 0 3
178 abort: cannot use --parent on non-merge changeset
185 abort: cannot use --parent on non-merge changeset
186 [255]
179
187
180 # backout with valid parent should be ok
188 # backout with valid parent should be ok
181
189
@@ -1,5 +1,6 b''
1 $ hg clone http://localhost:$HGPORT/ copy
1 $ hg clone http://localhost:$HGPORT/ copy
2 abort: error: Connection refused
2 abort: error: Connection refused
3 [255]
3
4
4 $ echo $?
5 $ echo $?
5 0
6 0
@@ -27,6 +28,7 b' give the server some time to start runni'
27
28
28 $ hg clone http://localhost:$HGPORT/foo copy2 2>&1
29 $ hg clone http://localhost:$HGPORT/foo copy2 2>&1
29 abort: HTTP Error 404: .*
30 abort: HTTP Error 404: .*
31 [255]
30
32
31 $ echo $?
33 $ echo $?
32 0
34 0
@@ -132,6 +132,7 b''
132
132
133 $ heads -r 3 .
133 $ heads -r 3 .
134 no open branch heads found on branches c (started at 3)
134 no open branch heads found on branches c (started at 3)
135 [1]
135 $ echo $?
136 $ echo $?
136 0
137 0
137 $ heads -r 2 .
138 $ heads -r 2 .
@@ -157,6 +158,7 b''
157 -------
158 -------
158 $ heads -r 7 .
159 $ heads -r 7 .
159 no open branch heads found on branches b (started at 7)
160 no open branch heads found on branches b (started at 7)
161 [1]
160 $ echo $?
162 $ echo $?
161 0
163 0
162
164
@@ -386,6 +386,7 b' assuming that the shell returns 127 if c'
386 $ hg bisect -r
386 $ hg bisect -r
387 $ hg bisect --command 'exit 127'
387 $ hg bisect --command 'exit 127'
388 abort: failed to execute exit 127
388 abort: failed to execute exit 127
389 [255]
389
390
390
391
391 test bisecting command
392 test bisecting command
@@ -393,6 +393,7 b' test unrelated revs:'
393 $ hg bisect -b 7
393 $ hg bisect -b 7
394 $ hg bisect -g 14
394 $ hg bisect -g 14
395 abort: starting revisions are not directly related
395 abort: starting revisions are not directly related
396 [255]
396 $ hg bisect --reset
397 $ hg bisect --reset
397
398
398 end at merge: 17 bad, 11 good (but 9 is first bad)
399 end at merge: 17 bad, 11 good (but 9 is first bad)
@@ -60,6 +60,8 b" push/pull name that doesn't exist"
60
60
61 $ hg push -B badname ../a
61 $ hg push -B badname ../a
62 bookmark badname does not exist on the local or remote repository!
62 bookmark badname does not exist on the local or remote repository!
63 [2]
63 $ hg pull -B anotherbadname ../a
64 $ hg pull -B anotherbadname ../a
64 abort: remote bookmark anotherbadname not found!
65 abort: remote bookmark anotherbadname not found!
66 [255]
65 $ true
67 $ true
@@ -89,11 +89,13 b' rename nonexistent bookmark'
89
89
90 $ hg bookmark -m A B
90 $ hg bookmark -m A B
91 abort: a bookmark of this name does not exist
91 abort: a bookmark of this name does not exist
92 [255]
92
93
93 rename to existent bookmark
94 rename to existent bookmark
94
95
95 $ hg bookmark -m X Y
96 $ hg bookmark -m X Y
96 abort: a bookmark of the same name already exists
97 abort: a bookmark of the same name already exists
98 [255]
97
99
98 force rename to existent bookmark
100 force rename to existent bookmark
99
101
@@ -110,16 +112,19 b' rename without new name'
110
112
111 $ hg bookmark -m Y
113 $ hg bookmark -m Y
112 abort: new bookmark name required
114 abort: new bookmark name required
115 [255]
113
116
114 delete without name
117 delete without name
115
118
116 $ hg bookmark -d
119 $ hg bookmark -d
117 abort: bookmark name required
120 abort: bookmark name required
121 [255]
118
122
119 delete nonexistent bookmark
123 delete nonexistent bookmark
120
124
121 $ hg bookmark -d A
125 $ hg bookmark -d A
122 abort: a bookmark of this name does not exist
126 abort: a bookmark of this name does not exist
127 [255]
123
128
124 bookmark name with spaces should be stripped
129 bookmark name with spaces should be stripped
125
130
@@ -151,11 +156,13 b' reject bookmark name with newline'
151 $ hg bookmark '
156 $ hg bookmark '
152 > '
157 > '
153 abort: bookmark name cannot contain newlines
158 abort: bookmark name cannot contain newlines
159 [255]
154
160
155 bookmark with existing name
161 bookmark with existing name
156
162
157 $ hg bookmark Z
163 $ hg bookmark Z
158 abort: a bookmark of the same name already exists
164 abort: a bookmark of the same name already exists
165 [255]
159
166
160 force bookmark with existing name
167 force bookmark with existing name
161
168
@@ -173,10 +180,12 b' revision but no bookmark name'
173
180
174 $ hg bookmark -r .
181 $ hg bookmark -r .
175 abort: bookmark name required
182 abort: bookmark name required
183 [255]
176
184
177 bookmark name with whitespace only
185 bookmark name with whitespace only
178
186
179 $ hg bookmark ' '
187 $ hg bookmark ' '
180 abort: bookmark names cannot consist entirely of whitespace
188 abort: bookmark names cannot consist entirely of whitespace
189 [255]
181
190
182 $ true
191 $ true
@@ -57,10 +57,12 b' unknown branch and fallback'
57
57
58 $ hg in -qbz
58 $ hg in -qbz
59 abort: unknown branch 'z'!
59 abort: unknown branch 'z'!
60 [255]
60 $ hg in -q ../branch#z
61 $ hg in -q ../branch#z
61 2:f25d57ab0566
62 2:f25d57ab0566
62 $ hg out -qbz
63 $ hg out -qbz
63 abort: unknown branch 'z'!
64 abort: unknown branch 'z'!
65 [255]
64
66
65 in rev c branch a
67 in rev c branch a
66
68
@@ -43,10 +43,13 b''
43
43
44 $ hg branch tip
44 $ hg branch tip
45 abort: the name 'tip' is reserved
45 abort: the name 'tip' is reserved
46 [255]
46 $ hg branch null
47 $ hg branch null
47 abort: the name 'null' is reserved
48 abort: the name 'null' is reserved
49 [255]
48 $ hg branch .
50 $ hg branch .
49 abort: the name '.' is reserved
51 abort: the name '.' is reserved
52 [255]
50
53
51 $ echo 'd' >d
54 $ echo 'd' >d
52 $ hg add d
55 $ hg add d
@@ -235,6 +238,7 b''
235 a branch name much longer than the default justification used by branches 7:10ff5895aa57
238 a branch name much longer than the default justification used by branches 7:10ff5895aa57
236 $ hg heads b
239 $ hg heads b
237 no open branch heads found on branches b
240 no open branch heads found on branches b
241 [1]
238 $ hg heads --closed b
242 $ hg heads --closed b
239 changeset: 12:2da6583810df
243 changeset: 12:2da6583810df
240 branch: b
244 branch: b
@@ -316,6 +320,7 b' branch a'
316
320
317 $ hg heads --active a
321 $ hg heads --active a
318 no open branch heads found on branches a
322 no open branch heads found on branches a
323 [1]
319
324
320 branch b
325 branch b
321
326
@@ -207,8 +207,10 b' should fail'
207
207
208 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
208 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
209 abort: --base is incompatible with specifying a destination
209 abort: --base is incompatible with specifying a destination
210 [255]
210 $ hg -R test bundle -r tip test-bundle-branch1.hg
211 $ hg -R test bundle -r tip test-bundle-branch1.hg
211 abort: repository default-push not found!
212 abort: repository default-push not found!
213 [255]
212
214
213 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
215 $ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
214 2 changesets found
216 2 changesets found
@@ -223,6 +225,7 b' empty bundle'
223
225
224 $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
226 $ hg -R test bundle --base 7 --base 8 test-bundle-empty.hg
225 no changes found
227 no changes found
228 [1]
226
229
227 issue76 msg2163
230 issue76 msg2163
228
231
@@ -248,6 +251,7 b' revision 2'
248 transaction abort!
251 transaction abort!
249 rollback completed
252 rollback completed
250 abort: 00changelog.i@eebf5a27f8ca: unknown parent!
253 abort: 00changelog.i@eebf5a27f8ca: unknown parent!
254 [255]
251
255
252 revision 2
256 revision 2
253
257
@@ -88,6 +88,7 b' test garbage file'
88 $ cd tgarbage
88 $ cd tgarbage
89 $ hg pull ../bgarbage
89 $ hg pull ../bgarbage
90 abort: ../bgarbage: not a Mercurial bundle
90 abort: ../bgarbage: not a Mercurial bundle
91 [255]
91 $ cd ..
92 $ cd ..
92
93
93 test invalid bundle type
94 test invalid bundle type
@@ -96,4 +97,5 b' test invalid bundle type'
96 $ hg bundle -a -t garbage ../bgarbage
97 $ hg bundle -a -t garbage ../bgarbage
97 1 changesets found
98 1 changesets found
98 abort: unknown bundle type specified with --type
99 abort: unknown bundle type specified with --type
100 [255]
99 $ cd ..
101 $ cd ..
@@ -62,6 +62,7 b' Unbundle full.hg in test'
62 Verify empty
62 Verify empty
63
63
64 $ hg -R empty heads
64 $ hg -R empty heads
65 [1]
65 $ hg -R empty verify
66 $ hg -R empty verify
66 checking changesets
67 checking changesets
67 checking manifests
68 checking manifests
@@ -371,6 +372,7 b' Outgoing -R does-not-exist.hg vs partial'
371
372
372 $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
373 $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
373 abort: No such file or directory: ../does-not-exist.hg
374 abort: No such file or directory: ../does-not-exist.hg
375 [255]
374 $ cd ..
376 $ cd ..
375
377
376 Direct clone from bundle (all-history)
378 Direct clone from bundle (all-history)
@@ -462,11 +464,13 b' partial history bundle, fails w/ unkown '
462
464
463 $ hg -R bundle.hg verify
465 $ hg -R bundle.hg verify
464 abort: 00changelog.i@bbd179dfa0a7: unknown parent!
466 abort: 00changelog.i@bbd179dfa0a7: unknown parent!
467 [255]
465
468
466 full history bundle, refuses to verify non-local repo
469 full history bundle, refuses to verify non-local repo
467
470
468 $ hg -R all.hg verify
471 $ hg -R all.hg verify
469 abort: cannot verify bundle or remote repos
472 abort: cannot verify bundle or remote repos
473 [255]
470
474
471 but, regular verify must continue to work
475 but, regular verify must continue to work
472
476
@@ -18,5 +18,6 b''
18 0
18 0
19 $ hg cat -r 1 a
19 $ hg cat -r 1 a
20 a: no such file in rev 7040230c159c
20 a: no such file in rev 7040230c159c
21 [1]
21 $ hg cat -r 1 b
22 $ hg cat -r 1 b
22 1
23 1
@@ -21,6 +21,7 b''
21
21
22 $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
22 $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
23 abort: cannot specify both --noupdate and --updaterev
23 abort: cannot specify both --noupdate and --updaterev
24 [255]
24
25
25 $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
26 $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
26 requesting all changes
27 requesting all changes
@@ -74,6 +74,7 b" Check that we drop the 'file:' from the "
74 updating to branch default
74 updating to branch default
75 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
75 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
76 $ grep 'file:' e/.hg/hgrc
76 $ grep 'file:' e/.hg/hgrc
77 [1]
77
78
78 Check that path aliases are expanded:
79 Check that path aliases are expanded:
79
80
@@ -160,6 +161,7 b' Testing --noupdate with --updaterev (mus'
160
161
161 $ hg clone --noupdate --updaterev 1 a ua
162 $ hg clone --noupdate --updaterev 1 a ua
162 abort: cannot specify both --noupdate and --updaterev
163 abort: cannot specify both --noupdate and --updaterev
164 [255]
163
165
164
166
165 Testing clone -u:
167 Testing clone -u:
@@ -437,23 +437,27 b' Error if style not readable:'
437 $ chmod 0 q
437 $ chmod 0 q
438 $ hg log --style ./q
438 $ hg log --style ./q
439 abort: Permission denied: ./q
439 abort: Permission denied: ./q
440 [255]
440
441
441 Error if no style:
442 Error if no style:
442
443
443 $ hg log --style notexist
444 $ hg log --style notexist
444 abort: style not found: notexist
445 abort: style not found: notexist
446 [255]
445
447
446 Error if style missing key:
448 Error if style missing key:
447
449
448 $ echo 'q = q' > t
450 $ echo 'q = q' > t
449 $ hg log --style ./t
451 $ hg log --style ./t
450 abort: ./t: no key named 'changeset'
452 abort: ./t: no key named 'changeset'
453 [255]
451
454
452 Error if include fails:
455 Error if include fails:
453
456
454 $ echo 'changeset = q' >> t
457 $ echo 'changeset = q' >> t
455 $ hg log --style ./t
458 $ hg log --style ./t
456 abort: template file ./q: Permission denied
459 abort: template file ./q: Permission denied
460 [255]
457
461
458 Include works:
462 Include works:
459
463
@@ -1192,6 +1196,7 b' Error on syntax:'
1192 $ echo 'x = "f' >> t
1196 $ echo 'x = "f' >> t
1193 $ hg log
1197 $ hg log
1194 abort: t:3: unmatched quotes
1198 abort: t:3: unmatched quotes
1199 [255]
1195
1200
1196 $ cd ..
1201 $ cd ..
1197
1202
@@ -32,12 +32,14 b' Merging a conflict araises'
32 merging A failed!
32 merging A failed!
33 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
33 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
34 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
34 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
35 [1]
35
36
36 Correct the conflict without marking the file as resolved
37 Correct the conflict without marking the file as resolved
37
38
38 $ echo "ABCD" > A
39 $ echo "ABCD" > A
39 $ hg commit -m "Merged"
40 $ hg commit -m "Merged"
40 abort: unresolved merge conflicts (see hg resolve)
41 abort: unresolved merge conflicts (see hg resolve)
42 [255]
41
43
42 Mark the conflict as resolved and commit
44 Mark the conflict as resolved and commit
43
45
@@ -6,17 +6,22 b' commit date test'
6 $ hg add foo
6 $ hg add foo
7 $ HGEDITOR=true hg commit -m ""
7 $ HGEDITOR=true hg commit -m ""
8 abort: empty commit message
8 abort: empty commit message
9 [255]
9 $ hg commit -d '0 0' -m commit-1
10 $ hg commit -d '0 0' -m commit-1
10 $ echo foo >> foo
11 $ echo foo >> foo
11 $ hg commit -d '1 4444444' -m commit-3
12 $ hg commit -d '1 4444444' -m commit-3
12 abort: impossible time zone offset: 4444444
13 abort: impossible time zone offset: 4444444
14 [255]
13 $ hg commit -d '1 15.1' -m commit-4
15 $ hg commit -d '1 15.1' -m commit-4
14 abort: invalid date: '1\t15.1'
16 abort: invalid date: '1\t15.1'
17 [255]
15 $ hg commit -d 'foo bar' -m commit-5
18 $ hg commit -d 'foo bar' -m commit-5
16 abort: invalid date: 'foo bar'
19 abort: invalid date: 'foo bar'
20 [255]
17 $ hg commit -d ' 1 4444' -m commit-6
21 $ hg commit -d ' 1 4444' -m commit-6
18 $ hg commit -d '111111111111 0' -m commit-7
22 $ hg commit -d '111111111111 0' -m commit-7
19 abort: date exceeds 32 bits: 111111111111
23 abort: date exceeds 32 bits: 111111111111
24 [255]
20
25
21 commit added file that has been deleted
26 commit added file that has been deleted
22
27
@@ -25,8 +30,10 b' commit added file that has been deleted'
25 $ rm bar
30 $ rm bar
26 $ hg commit -m commit-8
31 $ hg commit -m commit-8
27 nothing changed
32 nothing changed
33 [1]
28 $ hg commit -m commit-8-2 bar
34 $ hg commit -m commit-8-2 bar
29 abort: bar: file not found!
35 abort: bar: file not found!
36 [255]
30
37
31 $ hg -q revert -a --no-backup
38 $ hg -q revert -a --no-backup
32
39
@@ -43,6 +50,7 b' commit added file that has been deleted'
43 adding dir.file
50 adding dir.file
44 $ hg commit -m commit-10 dir dir.file
51 $ hg commit -m commit-10 dir dir.file
45 abort: dir: no match under directory!
52 abort: dir: no match under directory!
53 [255]
46
54
47 $ echo >> dir/file
55 $ echo >> dir/file
48 $ mkdir bleh
56 $ mkdir bleh
@@ -50,8 +58,10 b' commit added file that has been deleted'
50 $ cd bleh
58 $ cd bleh
51 $ hg commit -m commit-11 .
59 $ hg commit -m commit-11 .
52 abort: bleh: no match under directory!
60 abort: bleh: no match under directory!
61 [255]
53 $ hg commit -m commit-12 ../dir ../dir2
62 $ hg commit -m commit-12 ../dir ../dir2
54 abort: dir2: no match under directory!
63 abort: dir2: no match under directory!
64 [255]
55 $ hg -v commit -m commit-13 ../dir
65 $ hg -v commit -m commit-13 ../dir
56 dir/file
66 dir/file
57 committed changeset 3:1cd62a2d8db5
67 committed changeset 3:1cd62a2d8db5
@@ -59,12 +69,15 b' commit added file that has been deleted'
59
69
60 $ hg commit -m commit-14 does-not-exist
70 $ hg commit -m commit-14 does-not-exist
61 abort: does-not-exist: No such file or directory
71 abort: does-not-exist: No such file or directory
72 [255]
62 $ ln -s foo baz
73 $ ln -s foo baz
63 $ hg commit -m commit-15 baz
74 $ hg commit -m commit-15 baz
64 abort: baz: file not tracked!
75 abort: baz: file not tracked!
76 [255]
65 $ touch quux
77 $ touch quux
66 $ hg commit -m commit-16 quux
78 $ hg commit -m commit-16 quux
67 abort: quux: file not tracked!
79 abort: quux: file not tracked!
80 [255]
68 $ echo >> dir/file
81 $ echo >> dir/file
69 $ hg -v commit -m commit-17 dir/file
82 $ hg -v commit -m commit-17 dir/file
70 dir/file
83 dir/file
@@ -75,6 +88,7 b' An empty date was interpreted as epoch o'
75 $ echo foo >> foo
88 $ echo foo >> foo
76 $ hg commit -d '' -m commit-no-date
89 $ hg commit -d '' -m commit-no-date
77 $ hg tip --template '{date|isodate}\n' | grep '1970'
90 $ hg tip --template '{date|isodate}\n' | grep '1970'
91 [1]
78 $ cd ..
92 $ cd ..
79
93
80
94
@@ -212,11 +226,13 b' should fail because we are specifying a '
212
226
213 $ hg ci -mmerge a
227 $ hg ci -mmerge a
214 abort: cannot partially commit a merge (do not specify files or patterns)
228 abort: cannot partially commit a merge (do not specify files or patterns)
229 [255]
215
230
216 should fail because we are specifying a pattern
231 should fail because we are specifying a pattern
217
232
218 $ hg ci -mmerge -I a
233 $ hg ci -mmerge -I a
219 abort: cannot partially commit a merge (do not specify files or patterns)
234 abort: cannot partially commit a merge (do not specify files or patterns)
235 [255]
220
236
221 should succeed
237 should succeed
222
238
@@ -248,6 +264,7 b' test commit message content'
248 HG: changed changed
264 HG: changed changed
249 HG: removed removed
265 HG: removed removed
250 abort: empty commit message
266 abort: empty commit message
267 [255]
251 $ cd ..
268 $ cd ..
252
269
253 $ exit 0
270 $ exit 0
@@ -50,6 +50,7 b''
50 $ echo "username = " >> .hg/hgrc
50 $ echo "username = " >> .hg/hgrc
51 $ hg commit -m commit-1
51 $ hg commit -m commit-1
52 abort: no username supplied (see "hg help config")
52 abort: no username supplied (see "hg help config")
53 [255]
53 $ rm .hg/hgrc
54 $ rm .hg/hgrc
54 $ hg commit -m commit-1 2>&1
55 $ hg commit -m commit-1 2>&1
55 No username found, using '[^']*' instead
56 No username found, using '[^']*' instead
@@ -59,5 +60,6 b''
59 transaction abort!
60 transaction abort!
60 rollback completed
61 rollback completed
61 abort: empty username!
62 abort: empty username!
63 [255]
62
64
63 $ true
65 $ true
@@ -16,6 +16,7 b''
16 merging a failed!
16 merging a failed!
17 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
17 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
18 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
18 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
19 [1]
19
20
20 $ hg id
21 $ hg id
21 32e80765d7fe+75234512624c+ tip
22 32e80765d7fe+75234512624c+ tip
@@ -60,6 +60,7 b' Revert should fail:'
60
60
61 $ hg revert --all
61 $ hg revert --all
62 abort: uncommitted merge - please provide a specific revision
62 abort: uncommitted merge - please provide a specific revision
63 [255]
63
64
64 Revert should be ok now:
65 Revert should be ok now:
65
66
@@ -4,6 +4,7 b' should fail - foo is not managed'
4 $ hg mv foo bar
4 $ hg mv foo bar
5 foo: not copying - file is not managed
5 foo: not copying - file is not managed
6 abort: no files to copy
6 abort: no files to copy
7 [255]
7 $ hg st -A
8 $ hg st -A
8 ? foo
9 ? foo
9 $ hg add foo
10 $ hg add foo
@@ -60,6 +60,7 b' Problem encoding:'
60 $ hg add morestuff.txt
60 $ hg add morestuff.txt
61 $ hg ci -m morestuff
61 $ hg ci -m morestuff
62 abort: missing header "Copyright 2046, The Masters" in morestuff.txt
62 abort: missing header "Copyright 2046, The Masters" in morestuff.txt
63 [255]
63 $ hg stat
64 $ hg stat
64 M stuff.txt
65 M stuff.txt
65 A morestuff.txt
66 A morestuff.txt
@@ -173,6 +173,7 b' Show an error if we use --options with a'
173 $ hg debugcomplete --options s
173 $ hg debugcomplete --options s
174 hg: command 's' is ambiguous:
174 hg: command 's' is ambiguous:
175 serve showconfig status summary
175 serve showconfig status summary
176 [255]
176
177
177 Show all commands + options
178 Show all commands + options
178 $ hg debugcommands
179 $ hg debugcommands
@@ -46,6 +46,7 b' invalid --unified'
46
46
47 $ hg diff --nodates -U foo
47 $ hg diff --nodates -U foo
48 abort: diff context lines count must be an integer, not 'foo'
48 abort: diff context lines count must be an integer, not 'foo'
49 [255]
49
50
50
51
51 $ hg diff --nodates -U 2
52 $ hg diff --nodates -U 2
@@ -86,6 +87,7 b' invalid diff.unified'
86
87
87 $ hg --config diff.unified=foo diff --nodates
88 $ hg --config diff.unified=foo diff --nodates
88 abort: diff context lines count must be an integer, not 'foo'
89 abort: diff context lines count must be an integer, not 'foo'
90 [255]
89
91
90 test off-by-one error with diff -p
92 test off-by-one error with diff -p
91
93
@@ -244,6 +244,7 b' git=abort: fail on execute bit change'
244
244
245 $ hg autodiff --git=abort regular setexec
245 $ hg autodiff --git=abort regular setexec
246 abort: losing data for setexec
246 abort: losing data for setexec
247 [255]
247
248
248 git=abort: succeed on regular file
249 git=abort: succeed on regular file
249
250
@@ -34,7 +34,9 b''
34
34
35 $ hg diff -r ""
35 $ hg diff -r ""
36 abort: 00changelog.i@: ambiguous identifier!
36 abort: 00changelog.i@: ambiguous identifier!
37 [255]
37 $ hg diff -r tip -r ""
38 $ hg diff -r tip -r ""
38 abort: 00changelog.i@: ambiguous identifier!
39 abort: 00changelog.i@: ambiguous identifier!
40 [255]
39
41
40 $ true
42 $ true
@@ -43,6 +43,7 b' Missing arg:'
43 [+] marked option can be specified multiple times
43 [+] marked option can be specified multiple times
44
44
45 use "hg -v help cat" to show global options
45 use "hg -v help cat" to show global options
46 [255]
46
47
47 [defaults]
48 [defaults]
48
49
@@ -54,12 +55,14 b' Missing arg:'
54 > EOF
55 > EOF
55 $ hg cat a
56 $ hg cat a
56 a: no such file in rev 000000000000
57 a: no such file in rev 000000000000
58 [1]
57
59
58 No repo:
60 No repo:
59
61
60 $ cd $dir
62 $ cd $dir
61 $ hg cat
63 $ hg cat
62 abort: There is no Mercurial repository here (.hg not found)!
64 abort: There is no Mercurial repository here (.hg not found)!
65 [255]
63
66
64 $ exit 0
67 $ exit 0
65
68
@@ -97,11 +97,13 b' Compare repos:'
97 comparing with repo-a
97 comparing with repo-a
98 searching for changes
98 searching for changes
99 no changes found
99 no changes found
100 [1]
100
101
101 $ hg -R repo-a incoming repo-c
102 $ hg -R repo-a incoming repo-c
102 comparing with repo-c
103 comparing with repo-c
103 searching for changes
104 searching for changes
104 no changes found
105 no changes found
106 [1]
105
107
106 $ exit 0
108 $ exit 0
107
109
@@ -7,6 +7,7 b' Try some commands:'
7
7
8 $ hg log
8 $ hg log
9 $ hg grep wah
9 $ hg grep wah
10 [1]
10 $ hg manifest
11 $ hg manifest
11 $ hg verify
12 $ hg verify
12 checking changesets
13 checking changesets
@@ -14,6 +14,7 b' Should diff cloned directories:'
14 $ hg extdiff -o -r $opt
14 $ hg extdiff -o -r $opt
15 Only in a: a
15 Only in a: a
16 Only in a: b
16 Only in a: b
17 [1]
17
18
18 $ echo "[extdiff]" >> $HGRCPATH
19 $ echo "[extdiff]" >> $HGRCPATH
19 $ echo "cmd.falabala=echo" >> $HGRCPATH
20 $ echo "cmd.falabala=echo" >> $HGRCPATH
@@ -21,6 +22,7 b' Should diff cloned directories:'
21
22
22 $ hg falabala
23 $ hg falabala
23 diffing a.000000000000 a
24 diffing a.000000000000 a
25 [1]
24
26
25 $ hg help falabala
27 $ hg help falabala
26 hg falabala [OPTION]... [FILE]...
28 hg falabala [OPTION]... [FILE]...
@@ -56,6 +58,7 b' Should diff cloned files directly:'
56
58
57 $ hg falabala -r 0:1
59 $ hg falabala -r 0:1
58 diffing a.8a5febb7f867/a a.34eed99112ab/a
60 diffing a.8a5febb7f867/a a.34eed99112ab/a
61 [1]
59
62
60 Test diff during merge:
63 Test diff during merge:
61
64
@@ -72,6 +75,7 b' Test diff during merge:'
72 Should diff cloned file against wc file:
75 Should diff cloned file against wc file:
73
76
74 $ hg falabala > out
77 $ hg falabala > out
78 [1]
75
79
76 Cleanup the output since the wc is a tmp directory:
80 Cleanup the output since the wc is a tmp directory:
77
81
@@ -83,6 +87,7 b' Test --change option:'
83 $ hg ci -d '2 0' -mtest3
87 $ hg ci -d '2 0' -mtest3
84 $ hg falabala -c 1
88 $ hg falabala -c 1
85 diffing a.8a5febb7f867/a a.34eed99112ab/a
89 diffing a.8a5febb7f867/a a.34eed99112ab/a
90 [1]
86
91
87 Check diff are made from the first parent:
92 Check diff are made from the first parent:
88
93
@@ -133,6 +138,7 b' Prepare custom diff/edit tool:'
133 # will change to /tmp/extdiff.TMP and populate directories a.TMP and a
138 # will change to /tmp/extdiff.TMP and populate directories a.TMP and a
134 # and start tool
139 # and start tool
135 $ hg extdiff -p "`pwd`/diff tool.py"
140 $ hg extdiff -p "`pwd`/diff tool.py"
141 [1]
136
142
137 Diff in working directory, after:
143 Diff in working directory, after:
138
144
@@ -158,9 +164,11 b' Test extdiff with --option:'
158
164
159 $ hg extdiff -p echo -o this -c 1
165 $ hg extdiff -p echo -o this -c 1
160 this a.8a5febb7f867/a a.34eed99112ab/a
166 this a.8a5febb7f867/a a.34eed99112ab/a
167 [1]
161
168
162 $ hg falabala -o this -c 1
169 $ hg falabala -o this -c 1
163 diffing this a.8a5febb7f867/a a.34eed99112ab/a
170 diffing this a.8a5febb7f867/a a.34eed99112ab/a
171 [1]
164
172
165 $ true
173 $ true
166
174
@@ -275,6 +275,7 b' Disabled extension commands:'
275 mq manage a stack of patches
275 mq manage a stack of patches
276
276
277 use "hg help extensions" for information on enabling extensions
277 use "hg help extensions" for information on enabling extensions
278 [255]
278 $ hg churn
279 $ hg churn
279 hg: unknown command 'churn'
280 hg: unknown command 'churn'
280 'churn' is provided by the following extension:
281 'churn' is provided by the following extension:
@@ -282,6 +283,7 b' Disabled extension commands:'
282 churn command to display statistics about repository history
283 churn command to display statistics about repository history
283
284
284 use "hg help extensions" for information on enabling extensions
285 use "hg help extensions" for information on enabling extensions
286 [255]
285
287
286 Disabled extensions:
288 Disabled extensions:
287
289
@@ -315,6 +317,7 b' Broken disabled extension and command:'
315
317
316 $ hg --config extensions.path=./path.py help foo > /dev/null
318 $ hg --config extensions.path=./path.py help foo > /dev/null
317 hg: unknown command 'foo'
319 hg: unknown command 'foo'
320 [255]
318
321
319 $ exit 0
322 $ exit 0
320
323
@@ -41,6 +41,7 b' Creating branch b:'
41 We shouldn't have anything but n state here:
41 We shouldn't have anything but n state here:
42
42
43 $ hg debugstate --nodates | grep -v "^n"
43 $ hg debugstate --nodates | grep -v "^n"
44 [1]
44
45
45 Merging:
46 Merging:
46
47
@@ -54,6 +54,7 b' Testing verify:'
54 3 files, 3 changesets, 3 total revisions
54 3 files, 3 changesets, 3 total revisions
55 3 integrity errors encountered!
55 3 integrity errors encountered!
56 (first damaged changeset appears to be 0)
56 (first damaged changeset appears to be 0)
57 [1]
57 $ cd ..
58 $ cd ..
58
59
59 Non store repo:
60 Non store repo:
@@ -192,6 +192,7 b' Rename and modify:'
192 8:c32b0d7e6f44
192 8:c32b0d7e6f44
193
193
194 $ hg locate copy2
194 $ hg locate copy2
195 [1]
195 $ hg cat rename2
196 $ hg cat rename2
196 a
197 a
197 a
198 a
@@ -60,10 +60,13 b' Implicit -R:'
60 0: a
60 0: a
61 $ hg ann a/a b/b
61 $ hg ann a/a b/b
62 abort: There is no Mercurial repository here (.hg not found)!
62 abort: There is no Mercurial repository here (.hg not found)!
63 [255]
63 $ hg -R b ann a/a
64 $ hg -R b ann a/a
64 abort: a/a not under root
65 abort: a/a not under root
66 [255]
65 $ hg log
67 $ hg log
66 abort: There is no Mercurial repository here (.hg not found)!
68 abort: There is no Mercurial repository here (.hg not found)!
69 [255]
67
70
68 Abbreviation of long option:
71 Abbreviation of long option:
69
72
@@ -103,16 +106,22 b' earlygetopt with illegal abbreviations:'
103
106
104 $ hg --confi "foo.bar=baz"
107 $ hg --confi "foo.bar=baz"
105 abort: option --config may not be abbreviated!
108 abort: option --config may not be abbreviated!
109 [255]
106 $ hg --cw a tip
110 $ hg --cw a tip
107 abort: option --cwd may not be abbreviated!
111 abort: option --cwd may not be abbreviated!
112 [255]
108 $ hg --rep a tip
113 $ hg --rep a tip
109 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
114 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
115 [255]
110 $ hg --repositor a tip
116 $ hg --repositor a tip
111 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
117 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
118 [255]
112 $ hg -qR a tip
119 $ hg -qR a tip
113 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
120 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
121 [255]
114 $ hg -qRa tip
122 $ hg -qRa tip
115 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
123 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
124 [255]
116
125
117 Testing --cwd:
126 Testing --cwd:
118
127
@@ -179,14 +188,19 b' Testing --config:'
179 quuxfoo
188 quuxfoo
180 $ hg --cwd c --config '' tip -q
189 $ hg --cwd c --config '' tip -q
181 abort: malformed --config option: '' (use --config section.name=value)
190 abort: malformed --config option: '' (use --config section.name=value)
191 [255]
182 $ hg --cwd c --config a.b tip -q
192 $ hg --cwd c --config a.b tip -q
183 abort: malformed --config option: 'a.b' (use --config section.name=value)
193 abort: malformed --config option: 'a.b' (use --config section.name=value)
194 [255]
184 $ hg --cwd c --config a tip -q
195 $ hg --cwd c --config a tip -q
185 abort: malformed --config option: 'a' (use --config section.name=value)
196 abort: malformed --config option: 'a' (use --config section.name=value)
197 [255]
186 $ hg --cwd c --config a.= tip -q
198 $ hg --cwd c --config a.= tip -q
187 abort: malformed --config option: 'a.=' (use --config section.name=value)
199 abort: malformed --config option: 'a.=' (use --config section.name=value)
200 [255]
188 $ hg --cwd c --config .b= tip -q
201 $ hg --cwd c --config .b= tip -q
189 abort: malformed --config option: '.b=' (use --config section.name=value)
202 abort: malformed --config option: '.b=' (use --config section.name=value)
203 [255]
190
204
191 Testing --debug:
205 Testing --debug:
192
206
@@ -20,6 +20,7 b' pattern error'
20
20
21 $ hg grep '**test**'
21 $ hg grep '**test**'
22 grep: invalid match pattern: nothing to repeat
22 grep: invalid match pattern: nothing to repeat
23 [1]
23
24
24 simple
25 simple
25
26
@@ -79,7 +80,9 b' follow'
79 $ hg init t2
80 $ hg init t2
80 $ cd t2
81 $ cd t2
81 $ hg grep foobar foo
82 $ hg grep foobar foo
83 [1]
82 $ hg grep foobar
84 $ hg grep foobar
85 [1]
83 $ echo blue >> color
86 $ echo blue >> color
84 $ echo black >> color
87 $ echo black >> color
85 $ hg add color
88 $ hg add color
@@ -400,6 +400,7 b' Test help option with version option'
400 [+] marked option can be specified multiple times
400 [+] marked option can be specified multiple times
401
401
402 use "hg -v help add" to show global options
402 use "hg -v help add" to show global options
403 [255]
403
404
404 Test ambiguous command help
405 Test ambiguous command help
405
406
@@ -573,6 +574,7 b' Test command without options'
573 update update working directory (or switch revisions)
574 update update working directory (or switch revisions)
574
575
575 use "hg help" for the full list of commands or "hg -v" for details
576 use "hg help" for the full list of commands or "hg -v" for details
577 [255]
576
578
577 $ hg skjdfks
579 $ hg skjdfks
578 hg: unknown command 'skjdfks'
580 hg: unknown command 'skjdfks'
@@ -599,6 +601,7 b' Test command without options'
599 update update working directory (or switch revisions)
601 update update working directory (or switch revisions)
600
602
601 use "hg help" for the full list of commands or "hg -v" for details
603 use "hg help" for the full list of commands or "hg -v" for details
604 [255]
602
605
603 $ cat > helpext.py <<EOF
606 $ cat > helpext.py <<EOF
604 > import os
607 > import os
@@ -70,6 +70,7 b''
70 $ hg id
70 $ hg id
71 pre-identify hook: HG_ARGS=id HG_OPTS={'tags': None, 'rev': '', 'num': None, 'branch': None, 'id': None} HG_PATS=[]
71 pre-identify hook: HG_ARGS=id HG_OPTS={'tags': None, 'rev': '', 'num': None, 'branch': None, 'id': None} HG_PATS=[]
72 warning: pre-identify hook exited with status 1
72 warning: pre-identify hook exited with status 1
73 [1]
73 $ hg cat b
74 $ hg cat b
74 pre-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b']
75 pre-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b']
75 post-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] HG_RESULT=0
76 post-cat hook: HG_ARGS=cat b HG_OPTS={'rev': '', 'decode': None, 'exclude': [], 'output': '', 'include': []} HG_PATS=['b'] HG_RESULT=0
@@ -114,10 +115,12 b''
114 pretag hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
115 pretag hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
115 pretag.forbid hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
116 pretag.forbid hook: HG_LOCAL=0 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fa
116 abort: pretag.forbid hook exited with status 1
117 abort: pretag.forbid hook exited with status 1
118 [255]
117 $ hg tag -l fla
119 $ hg tag -l fla
118 pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
120 pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
119 pretag.forbid hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
121 pretag.forbid hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=fla
120 abort: pretag.forbid hook exited with status 1
122 abort: pretag.forbid hook exited with status 1
123 [255]
121
124
122 # pretxncommit hook can see changeset, can roll back txn, changeset
125 # pretxncommit hook can see changeset, can roll back txn, changeset
123 # no more there after
126 # no more there after
@@ -137,6 +140,7 b''
137 transaction abort!
140 transaction abort!
138 rollback completed
141 rollback completed
139 abort: pretxncommit.forbid1 hook exited with status 1
142 abort: pretxncommit.forbid1 hook exited with status 1
143 [255]
140 $ hg -q tip
144 $ hg -q tip
141 4:539e4b31b6dc
145 4:539e4b31b6dc
142
146
@@ -147,6 +151,7 b''
147 precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
151 precommit hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
148 precommit.forbid hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
152 precommit.forbid hook: HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10
149 abort: precommit.forbid hook exited with status 1
153 abort: precommit.forbid hook exited with status 1
154 [255]
150 $ hg -q tip
155 $ hg -q tip
151 4:539e4b31b6dc
156 4:539e4b31b6dc
152
157
@@ -177,6 +182,7 b''
177 pulling from ../a
182 pulling from ../a
178 searching for changes
183 searching for changes
179 abort: prechangegroup.forbid hook exited with status 1
184 abort: prechangegroup.forbid hook exited with status 1
185 [255]
180
186
181 # pretxnchangegroup hook can see incoming changes, can roll back txn,
187 # pretxnchangegroup hook can see incoming changes, can roll back txn,
182 # incoming changes no longer there after
188 # incoming changes no longer there after
@@ -196,6 +202,7 b''
196 transaction abort!
202 transaction abort!
197 rollback completed
203 rollback completed
198 abort: pretxnchangegroup.forbid1 hook exited with status 1
204 abort: pretxnchangegroup.forbid1 hook exited with status 1
205 [255]
199 $ hg -q tip
206 $ hg -q tip
200 3:07f3376c1e65
207 3:07f3376c1e65
201
208
@@ -227,6 +234,7 b''
227 pulling from ../a
234 pulling from ../a
228 searching for changes
235 searching for changes
229 abort: preoutgoing.forbid hook exited with status 1
236 abort: preoutgoing.forbid hook exited with status 1
237 [255]
230
238
231 # outgoing hooks work for local clones
239 # outgoing hooks work for local clones
232
240
@@ -248,6 +256,7 b''
248 preoutgoing hook: HG_SOURCE=clone
256 preoutgoing hook: HG_SOURCE=clone
249 preoutgoing.forbid hook: HG_SOURCE=clone
257 preoutgoing.forbid hook: HG_SOURCE=clone
250 abort: preoutgoing.forbid hook exited with status 1
258 abort: preoutgoing.forbid hook exited with status 1
259 [255]
251 $ cd b
260 $ cd b
252
261
253 $ cat > hooktests.py <<EOF
262 $ cat > hooktests.py <<EOF
@@ -309,6 +318,7 b''
309 searching for changes
318 searching for changes
310 error: preoutgoing.abort hook failed: raise abort from hook
319 error: preoutgoing.abort hook failed: raise abort from hook
311 abort: raise abort from hook
320 abort: raise abort from hook
321 [255]
312
322
313 $ echo '[hooks]' > ../a/.hg/hgrc
323 $ echo '[hooks]' > ../a/.hg/hgrc
314 $ echo 'preoutgoing.fail = python:hooktests.failhook' >> ../a/.hg/hgrc
324 $ echo 'preoutgoing.fail = python:hooktests.failhook' >> ../a/.hg/hgrc
@@ -319,6 +329,7 b''
319 hooktype preoutgoing
329 hooktype preoutgoing
320 source pull
330 source pull
321 abort: preoutgoing.fail hook failed
331 abort: preoutgoing.fail hook failed
332 [255]
322
333
323 $ echo '[hooks]' > ../a/.hg/hgrc
334 $ echo '[hooks]' > ../a/.hg/hgrc
324 $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc
335 $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc
@@ -326,6 +337,7 b''
326 pulling from ../a
337 pulling from ../a
327 searching for changes
338 searching for changes
328 abort: preoutgoing.uncallable hook is invalid ("hooktests.uncallable" is not callable)
339 abort: preoutgoing.uncallable hook is invalid ("hooktests.uncallable" is not callable)
340 [255]
329
341
330 $ echo '[hooks]' > ../a/.hg/hgrc
342 $ echo '[hooks]' > ../a/.hg/hgrc
331 $ echo 'preoutgoing.nohook = python:hooktests.nohook' >> ../a/.hg/hgrc
343 $ echo 'preoutgoing.nohook = python:hooktests.nohook' >> ../a/.hg/hgrc
@@ -333,6 +345,7 b''
333 pulling from ../a
345 pulling from ../a
334 searching for changes
346 searching for changes
335 abort: preoutgoing.nohook hook is invalid ("hooktests.nohook" is not defined)
347 abort: preoutgoing.nohook hook is invalid ("hooktests.nohook" is not defined)
348 [255]
336
349
337 $ echo '[hooks]' > ../a/.hg/hgrc
350 $ echo '[hooks]' > ../a/.hg/hgrc
338 $ echo 'preoutgoing.nomodule = python:nomodule' >> ../a/.hg/hgrc
351 $ echo 'preoutgoing.nomodule = python:nomodule' >> ../a/.hg/hgrc
@@ -340,6 +353,7 b''
340 pulling from ../a
353 pulling from ../a
341 searching for changes
354 searching for changes
342 abort: preoutgoing.nomodule hook is invalid ("nomodule" not in a module)
355 abort: preoutgoing.nomodule hook is invalid ("nomodule" not in a module)
356 [255]
343
357
344 $ echo '[hooks]' > ../a/.hg/hgrc
358 $ echo '[hooks]' > ../a/.hg/hgrc
345 $ echo 'preoutgoing.badmodule = python:nomodule.nowhere' >> ../a/.hg/hgrc
359 $ echo 'preoutgoing.badmodule = python:nomodule.nowhere' >> ../a/.hg/hgrc
@@ -347,6 +361,7 b''
347 pulling from ../a
361 pulling from ../a
348 searching for changes
362 searching for changes
349 abort: preoutgoing.badmodule hook is invalid (import of "nomodule" failed)
363 abort: preoutgoing.badmodule hook is invalid (import of "nomodule" failed)
364 [255]
350
365
351 $ echo '[hooks]' > ../a/.hg/hgrc
366 $ echo '[hooks]' > ../a/.hg/hgrc
352 $ echo 'preoutgoing.unreachable = python:hooktests.container.unreachable' >> ../a/.hg/hgrc
367 $ echo 'preoutgoing.unreachable = python:hooktests.container.unreachable' >> ../a/.hg/hgrc
@@ -354,6 +369,7 b''
354 pulling from ../a
369 pulling from ../a
355 searching for changes
370 searching for changes
356 abort: preoutgoing.unreachable hook is invalid (import of "hooktests.container" failed)
371 abort: preoutgoing.unreachable hook is invalid (import of "hooktests.container" failed)
372 [255]
357
373
358 $ echo '[hooks]' > ../a/.hg/hgrc
374 $ echo '[hooks]' > ../a/.hg/hgrc
359 $ echo 'preoutgoing.pass = python:hooktests.passhook' >> ../a/.hg/hgrc
375 $ echo 'preoutgoing.pass = python:hooktests.passhook' >> ../a/.hg/hgrc
@@ -426,6 +442,7 b''
426 $ hg commit -d '0 0'
442 $ hg commit -d '0 0'
427 hook works
443 hook works
428 nothing changed
444 nothing changed
445 [1]
429
446
430 $ cd ../../b
447 $ cd ../../b
431
448
@@ -4,6 +4,7 b' no repo'
4
4
5 $ hg id
5 $ hg id
6 abort: there is no Mercurial repository here (.hg not found)
6 abort: there is no Mercurial repository here (.hg not found)
7 [255]
7
8
8 create repo
9 create repo
9
10
@@ -65,5 +66,6 b' remote with tags?'
65
66
66 $ hg id -t http://localhost:$HGPORT1/
67 $ hg id -t http://localhost:$HGPORT1/
67 abort: can't query remote revision number, branch, or tags
68 abort: can't query remote revision number, branch, or tags
69 [255]
68
70
69 $ true # ends with util.Abort -> returns 255
71 $ true # ends with util.Abort -> returns 255
@@ -37,6 +37,7 b' invalid eol'
37 $ hg --config patch.eol='LFCR' import eol.diff
37 $ hg --config patch.eol='LFCR' import eol.diff
38 applying eol.diff
38 applying eol.diff
39 abort: unsupported line endings type: LFCR
39 abort: unsupported line endings type: LFCR
40 [255]
40 $ hg revert -a
41 $ hg revert -a
41
42
42
43
@@ -74,6 +74,7 b' import of plain diff should fail without'
74 $ hg --cwd b import ../tip.patch
74 $ hg --cwd b import ../tip.patch
75 applying ../tip.patch
75 applying ../tip.patch
76 abort: empty commit message
76 abort: empty commit message
77 [255]
77 $ rm -r b
78 $ rm -r b
78
79
79
80
@@ -287,6 +288,7 b' plain diff in email, no subject, no mess'
287 $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
288 $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import -
288 applying patch from stdin
289 applying patch from stdin
289 abort: empty commit message
290 abort: empty commit message
291 [255]
290 $ rm -r b
292 $ rm -r b
291
293
292
294
@@ -605,6 +607,7 b' test paths outside repo root'
605 > EOF
607 > EOF
606 applying patch from stdin
608 applying patch from stdin
607 abort: ../outside/foo not under root
609 abort: ../outside/foo not under root
610 [255]
608 $ cd ..
611 $ cd ..
609
612
610
613
@@ -65,6 +65,7 b' test failure'
65
65
66 $ hg init local
66 $ hg init local
67 abort: repository local already exists!
67 abort: repository local already exists!
68 [255]
68
69
69 init+push to remote2
70 init+push to remote2
70
71
@@ -100,12 +101,14 b' init to existing repo'
100 $ hg init -e "python ./dummyssh" ssh://user@dummy/remote1
101 $ hg init -e "python ./dummyssh" ssh://user@dummy/remote1
101 abort: repository remote1 already exists!
102 abort: repository remote1 already exists!
102 abort: could not create remote repo!
103 abort: could not create remote repo!
104 [255]
103
105
104 clone to existing repo
106 clone to existing repo
105
107
106 $ hg clone -e "python ./dummyssh" local ssh://user@dummy/remote1
108 $ hg clone -e "python ./dummyssh" local ssh://user@dummy/remote1
107 abort: repository remote1 already exists!
109 abort: repository remote1 already exists!
108 abort: could not create remote repo!
110 abort: could not create remote repo!
111 [255]
109
112
110 output of dummyssh
113 output of dummyssh
111
114
@@ -19,5 +19,6 b' hg debuginstall with no username'
19 no username supplied (see "hg help config")
19 no username supplied (see "hg help config")
20 (specify a username in your configuration file)
20 (specify a username in your configuration file)
21 1 problems detected, please check your install!
21 1 problems detected, please check your install!
22 [1]
22
23
23 $ true
24 $ true
@@ -15,6 +15,7 b' Should fail - would corrupt dirstate:'
15
15
16 $ hg add a/a
16 $ hg add a/a
17 abort: file 'a' in dirstate clashes with 'a/a'
17 abort: file 'a' in dirstate clashes with 'a/a'
18 [255]
18
19
19 $ cd ..
20 $ cd ..
20
21
@@ -34,6 +35,7 b' Should fail - would corrupt dirstate:'
34
35
35 $ hg add a
36 $ hg add a
36 abort: directory 'a' already in dirstate
37 abort: directory 'a' already in dirstate
38 [255]
37
39
38 $ cd ..
40 $ cd ..
39
41
@@ -53,6 +55,7 b' Should fail - would corrupt dirstate:'
53
55
54 $ hg add b
56 $ hg add b
55 abort: directory 'b' already in dirstate
57 abort: directory 'b' already in dirstate
58 [255]
56
59
57 $ exit 0
60 $ exit 0
58
61
@@ -7,6 +7,7 b''
7
7
8 $ hg parents -r 0 doesnotexist
8 $ hg parents -r 0 doesnotexist
9 abort: 'doesnotexist' not found in manifest!
9 abort: 'doesnotexist' not found in manifest!
10 [255]
10
11
11 $ true
12 $ true
12
13
@@ -25,6 +25,7 b' Bogus fast-forward should fail:'
25
25
26 $ hg merge b
26 $ hg merge b
27 abort: merging with a working directory ancestor has no effect
27 abort: merging with a working directory ancestor has no effect
28 [255]
28
29
29 $ true
30 $ true
30
31
@@ -18,6 +18,7 b' Should fail - would corrupt dirstate:'
18
18
19 $ hg add a/a
19 $ hg add a/a
20 abort: file 'a' in dirstate clashes with 'a/a'
20 abort: file 'a' in dirstate clashes with 'a/a'
21 [255]
21
22
22 Removing shadow:
23 Removing shadow:
23
24
@@ -36,6 +37,7 b' Should fail - would corrupt dirstate:'
36
37
37 $ hg add b
38 $ hg add b
38 abort: directory 'b' already in dirstate
39 abort: directory 'b' already in dirstate
40 [255]
39
41
40 Removing shadow:
42 Removing shadow:
41
43
@@ -58,6 +60,7 b' Revert reintroducing shadow - should fai'
58 $ rm -r a b
60 $ rm -r a b
59 $ hg revert b/b
61 $ hg revert b/b
60 abort: file 'b' in dirstate clashes with 'b/b'
62 abort: file 'b' in dirstate clashes with 'b/b'
63 [255]
61
64
62 Revert all - should succeed:
65 Revert all - should succeed:
63
66
@@ -110,6 +113,7 b' Should fail - would corrupt dirstate:'
110
113
111 $ hg add d
114 $ hg add d
112 abort: directory 'd' already in dirstate
115 abort: directory 'd' already in dirstate
116 [255]
113
117
114 Removing shadow:
118 Removing shadow:
115
119
@@ -10,6 +10,7 b''
10 $ echo foo > a
10 $ echo foo > a
11 $ hg ci -Am0
11 $ hg ci -Am0
12 abort: abandoned transaction found - run hg recover!
12 abort: abandoned transaction found - run hg recover!
13 [255]
13
14
14 $ hg recover
15 $ hg recover
15 rolling back interrupted transaction
16 rolling back interrupted transaction
@@ -27,6 +28,7 b' Check that zero-size journals are correc'
27 $ hg -R foo unbundle repo.hg
28 $ hg -R foo unbundle repo.hg
28 adding changesets
29 adding changesets
29 abort: Permission denied: .*
30 abort: Permission denied: .*
31 [255]
30
32
31 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
33 $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
32
34
@@ -116,6 +116,7 b' Interrupted commit should not change sta'
116
116
117 $ hg --debug commit
117 $ hg --debug commit
118 abort: empty commit message
118 abort: empty commit message
119 [255]
119 $ hg status
120 $ hg status
120 A a
121 A a
121 A b
122 A b
@@ -540,6 +541,7 b' Interrupted commit should not change sta'
540
541
541 $ hg commit
542 $ hg commit
542 abort: empty commit message
543 abort: empty commit message
544 [255]
543 $ hg status
545 $ hg status
544 M a
546 M a
545 ? c
547 ? c
@@ -689,6 +691,7 b' kwexpand x/a should abort'
689
691
690 $ hg --verbose kwexpand x/a
692 $ hg --verbose kwexpand x/a
691 abort: outstanding uncommitted changes
693 abort: outstanding uncommitted changes
694 [255]
692 $ cd x
695 $ cd x
693 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
696 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
694 x/a
697 x/a
@@ -818,6 +821,7 b' conflict: keyword should stay outside co'
818 merging m failed!
821 merging m failed!
819 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
822 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
820 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
823 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
824 [1]
821 $ cat m
825 $ cat m
822 $Id$
826 $Id$
823 <<<<<<< local
827 <<<<<<< local
@@ -42,8 +42,11 b''
42 $ hg ci -m m
42 $ hg ci -m m
43
43
44 $ hg locate a
44 $ hg locate a
45 [1]
45 $ hg locate NONEXISTENT
46 $ hg locate NONEXISTENT
47 [1]
46 $ hg locate relpath:NONEXISTENT
48 $ hg locate relpath:NONEXISTENT
49 [1]
47 $ hg locate
50 $ hg locate
48 b
51 b
49 dir.h/foo
52 dir.h/foo
@@ -54,7 +57,9 b''
54 $ hg locate -r 0 a
57 $ hg locate -r 0 a
55 a
58 a
56 $ hg locate -r 0 NONEXISTENT
59 $ hg locate -r 0 NONEXISTENT
60 [1]
57 $ hg locate -r 0 relpath:NONEXISTENT
61 $ hg locate -r 0 relpath:NONEXISTENT
62 [1]
58 $ hg locate -r 0
63 $ hg locate -r 0
59 a
64 a
60 b
65 b
@@ -16,6 +16,7 b''
16 $ hg -R b push a
16 $ hg -R b push a
17 pushing to a
17 pushing to a
18 abort: could not lock repository a: Permission denied
18 abort: could not lock repository a: Permission denied
19 [255]
19
20
20 $ chmod 700 a/.hg/store
21 $ chmod 700 a/.hg/store
21
22
@@ -31,6 +31,7 b''
31
31
32 $ hg log -f dir
32 $ hg log -f dir
33 abort: cannot follow nonexistent file: "dir"
33 abort: cannot follow nonexistent file: "dir"
34 [255]
34
35
35 -f, but no args
36 -f, but no args
36
37
@@ -495,11 +496,13 b' log -r ""'
495
496
496 $ hg log -r ''
497 $ hg log -r ''
497 hg: parse error: empty query
498 hg: parse error: empty query
499 [255]
498
500
499 log -r <some unknown node id>
501 log -r <some unknown node id>
500
502
501 $ hg log -r 1000000000000000000000000000000000000000
503 $ hg log -r 1000000000000000000000000000000000000000
502 abort: unknown revision '1000000000000000000000000000000000000000'!
504 abort: unknown revision '1000000000000000000000000000000000000000'!
505 [255]
503
506
504 log -k r1
507 log -k r1
505
508
@@ -658,6 +661,7 b' log -b dummy'
658
661
659 $ hg log -b dummy
662 $ hg log -b dummy
660 abort: unknown revision 'dummy'!
663 abort: unknown revision 'dummy'!
664 [255]
661
665
662
666
663 log -b .
667 log -b .
@@ -899,6 +903,7 b' log -p -R repo'
899 merging foo failed!
903 merging foo failed!
900 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
904 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
901 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
905 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
906 [1]
902 $ echo 'merge 1' > foo
907 $ echo 'merge 1' > foo
903 $ hg resolve -m foo
908 $ hg resolve -m foo
904 $ hg ci -m "First merge, related"
909 $ hg ci -m "First merge, related"
@@ -909,6 +914,7 b' log -p -R repo'
909 merging foo failed!
914 merging foo failed!
910 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
915 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
911 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
916 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
917 [1]
912 $ echo 'merge 2' > foo
918 $ echo 'merge 2' > foo
913 $ hg resolve -m foo
919 $ hg resolve -m foo
914 $ hg ci -m "Last merge, related"
920 $ hg ci -m "Last merge, related"
@@ -60,9 +60,11 b' The next two calls are expected to abort'
60
60
61 $ hg manifest -r 2
61 $ hg manifest -r 2
62 abort: unknown revision '2'!
62 abort: unknown revision '2'!
63 [255]
63
64
64 $ hg manifest -r tip tip
65 $ hg manifest -r tip tip
65 abort: please specify just one revision
66 abort: please specify just one revision
67 [255]
66
68
67
69
68 $ true
70 $ true
@@ -44,6 +44,7 b' fail with three heads'
44 $ hg merge
44 $ hg merge
45 abort: branch 'default' has 3 heads - please merge with an explicit rev
45 abort: branch 'default' has 3 heads - please merge with an explicit rev
46 (run 'hg heads .' to see heads)
46 (run 'hg heads .' to see heads)
47 [255]
47
48
48 close one of the heads
49 close one of the heads
49 $ hg up -C 6
50 $ hg up -C 6
@@ -29,6 +29,7 b' Should fail because not at a head:'
29 $ hg merge
29 $ hg merge
30 abort: branch 'default' has 3 heads - please merge with an explicit rev
30 abort: branch 'default' has 3 heads - please merge with an explicit rev
31 (run 'hg heads .' to see heads)
31 (run 'hg heads .' to see heads)
32 [255]
32
33
33 $ hg up
34 $ hg up
34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -39,6 +40,7 b' Should fail because > 2 heads:'
39 $ hg merge
40 $ hg merge
40 abort: branch 'default' has 3 heads - please merge with an explicit rev
41 abort: branch 'default' has 3 heads - please merge with an explicit rev
41 (run 'hg heads .' to see heads)
42 (run 'hg heads .' to see heads)
43 [255]
42
44
43 Should succeed:
45 Should succeed:
44
46
@@ -65,6 +67,7 b' Should fail because at tip:'
65
67
66 $ hg merge
68 $ hg merge
67 abort: there is nothing to merge
69 abort: there is nothing to merge
70 [255]
68
71
69 $ hg up 0
72 $ hg up 0
70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
73 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -73,6 +76,7 b' Should fail because there is only one he'
73
76
74 $ hg merge
77 $ hg merge
75 abort: there is nothing to merge - use "hg update" instead
78 abort: there is nothing to merge - use "hg update" instead
79 [255]
76
80
77 $ hg up 3
81 $ hg up 3
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -87,6 +91,7 b' Should fail because merge with other bra'
87 $ hg merge
91 $ hg merge
88 abort: branch 'foobranch' has one head - please merge with an explicit rev
92 abort: branch 'foobranch' has one head - please merge with an explicit rev
89 (run 'hg heads' to see all heads)
93 (run 'hg heads' to see all heads)
94 [255]
90
95
91
96
92 Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
97 Test for issue2043: ensure that 'merge -P' shows ancestors of 6 that
@@ -20,6 +20,7 b' Should fail, since there are deleted fil'
20
20
21 $ hg merge
21 $ hg merge
22 abort: outstanding uncommitted changes (use 'hg status' to list changes)
22 abort: outstanding uncommitted changes (use 'hg status' to list changes)
23 [255]
23
24
24 Should succeed with --force:
25 Should succeed with --force:
25
26
@@ -43,6 +43,7 b' Merge using internal:fail tool:'
43 $ hg merge
43 $ hg merge
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
45 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
45 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
46 [1]
46
47
47 $ cat f
48 $ cat f
48 line 1
49 line 1
@@ -57,6 +57,7 b' Local merge with bad merge tool:'
57 merging zzz2_merge_bad failed!
57 merging zzz2_merge_bad failed!
58 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
58 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
59 use 'hg resolve' to retry unresolved file merges
59 use 'hg resolve' to retry unresolved file merges
60 [1]
60
61
61 $ hg co 0
62 $ hg co 0
62 merging zzz1_merge_ok
63 merging zzz1_merge_ok
@@ -65,6 +66,7 b' Local merge with bad merge tool:'
65 merging zzz2_merge_bad failed!
66 merging zzz2_merge_bad failed!
66 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
67 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
67 use 'hg resolve' to retry unresolved file merges
68 use 'hg resolve' to retry unresolved file merges
69 [1]
68
70
69 $ hg diff --nodates | grep "^[+-][^<>]"
71 $ hg diff --nodates | grep "^[+-][^<>]"
70 --- a/zzz1_merge_ok
72 --- a/zzz1_merge_ok
@@ -89,6 +91,7 b' Local merge with conflicts:'
89 merging zzz2_merge_bad failed!
91 merging zzz2_merge_bad failed!
90 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
92 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
91 use 'hg resolve' to retry unresolved file merges
93 use 'hg resolve' to retry unresolved file merges
94 [1]
92
95
93 $ hg co 0
96 $ hg co 0
94 merging zzz1_merge_ok
97 merging zzz1_merge_ok
@@ -97,6 +100,7 b' Local merge with conflicts:'
97 merging zzz2_merge_bad failed!
100 merging zzz2_merge_bad failed!
98 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
101 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
99 use 'hg resolve' to retry unresolved file merges
102 use 'hg resolve' to retry unresolved file merges
103 [1]
100
104
101 $ hg diff --nodates | grep "^[+-][^<>]"
105 $ hg diff --nodates | grep "^[+-][^<>]"
102 --- a/zzz1_merge_ok
106 --- a/zzz1_merge_ok
@@ -48,6 +48,7 b''
48 merging file1 failed!
48 merging file1 failed!
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
50 use 'hg resolve' to retry unresolved file merges
50 use 'hg resolve' to retry unresolved file merges
51 [1]
51
52
52 $ hg diff --nodates
53 $ hg diff --nodates
53 diff -r dfab7f3c2efb file1
54 diff -r dfab7f3c2efb file1
@@ -69,6 +69,7 b' no merges expected'
69 merge should fail
69 merge should fail
70 $ hg merge 1
70 $ hg merge 1
71 abort: untracked file in working directory differs from file in requested revision: 'b'
71 abort: untracked file in working directory differs from file in requested revision: 'b'
72 [255]
72 merge of b expected
73 merge of b expected
73 $ hg merge -f 1
74 $ hg merge -f 1
74 merging for b
75 merging for b
@@ -111,6 +112,7 b' Contents of b should be "this is file b1'
111 merge fails
112 merge fails
112 $ hg merge 2
113 $ hg merge 2
113 abort: outstanding uncommitted changes (use 'hg status' to list changes)
114 abort: outstanding uncommitted changes (use 'hg status' to list changes)
115 [255]
114 $ echo %% merge expected!
116 $ echo %% merge expected!
115 %% merge expected!
117 %% merge expected!
116 $ hg merge -f 2
118 $ hg merge -f 2
@@ -148,6 +150,7 b' merge fails'
148 merge of b should fail
150 merge of b should fail
149 $ hg merge 2
151 $ hg merge 2
150 abort: outstanding uncommitted changes (use 'hg status' to list changes)
152 abort: outstanding uncommitted changes (use 'hg status' to list changes)
153 [255]
151 merge of b expected
154 merge of b expected
152 $ hg merge -f 2
155 $ hg merge -f 2
153 merging for b
156 merging for b
@@ -15,6 +15,7 b''
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 $ hg update
16 $ hg update
17 abort: crosses branches (use 'hg merge' or use 'hg update -c')
17 abort: crosses branches (use 'hg merge' or use 'hg update -c')
18 [255]
18 $ hg update -c
19 $ hg update -c
19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20 $ mv a c
21 $ mv a c
@@ -27,6 +28,7 b' Should abort:'
27
28
28 $ hg update -y 1
29 $ hg update -y 1
29 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
30 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
31 [255]
30 $ mv c a
32 $ mv c a
31
33
32 Should succeed:
34 Should succeed:
@@ -48,6 +48,7 b' now pull and merge from test-a'
48 merging test.txt failed!
48 merging test.txt failed!
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
50 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
51 [1]
51 resolve conflict
52 resolve conflict
52 $ cat >test.txt <<"EOF"
53 $ cat >test.txt <<"EOF"
53 > one
54 > one
@@ -92,6 +93,7 b' pull and merge from test-a again'
92 merging test.txt failed!
93 merging test.txt failed!
93 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
94 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
94 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
95 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
96 [1]
95
97
96 $ cat test.txt
98 $ cat test.txt
97 one
99 one
@@ -31,6 +31,7 b' test with the rename on the remote side'
31 merging foo and baz to baz
31 merging foo and baz to baz
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
34 [1]
34 $ hg resolve -l
35 $ hg resolve -l
35 U bar
36 U bar
36 R baz
37 R baz
@@ -44,6 +45,7 b' test with the rename on the local side'
44 merging baz and foo to baz
45 merging baz and foo to baz
45 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
47 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
48 [1]
47
49
48 show unresolved
50 show unresolved
49 $ hg resolve -l
51 $ hg resolve -l
@@ -75,12 +77,14 b' after resolve'
75 resolve all warning
77 resolve all warning
76 $ hg resolve
78 $ hg resolve
77 abort: no files or directories specified; use --all to remerge all files
79 abort: no files or directories specified; use --all to remerge all files
80 [255]
78
81
79 resolve all
82 resolve all
80 $ hg resolve -a
83 $ hg resolve -a
81 merging bar
84 merging bar
82 warning: conflicts during merge.
85 warning: conflicts during merge.
83 merging bar failed!
86 merging bar failed!
87 [1]
84
88
85 after
89 after
86 $ hg resolve -l
90 $ hg resolve -l
@@ -60,6 +60,7 b' should fail in strict mode'
60 patch failed, unable to continue (try -v)
60 patch failed, unable to continue (try -v)
61 patch failed, rejects left in working dir
61 patch failed, rejects left in working dir
62 errors during apply, please fix and refresh eol.diff
62 errors during apply, please fix and refresh eol.diff
63 [2]
63 $ hg qpop
64 $ hg qpop
64 popping eol.diff
65 popping eol.diff
65 patch queue now empty
66 patch queue now empty
@@ -71,6 +72,7 b' invalid eol'
71 patch failed, unable to continue (try -v)
72 patch failed, unable to continue (try -v)
72 patch failed, rejects left in working dir
73 patch failed, rejects left in working dir
73 errors during apply, please fix and refresh eol.diff
74 errors during apply, please fix and refresh eol.diff
75 [2]
74 $ hg qpop
76 $ hg qpop
75 popping eol.diff
77 popping eol.diff
76 patch queue now empty
78 patch queue now empty
@@ -34,12 +34,14 b' should fail'
34
34
35 $ hg qguard does-not-exist.patch +bleh
35 $ hg qguard does-not-exist.patch +bleh
36 abort: no patch named does-not-exist.patch
36 abort: no patch named does-not-exist.patch
37 [255]
37
38
38
39
39 should fail
40 should fail
40
41
41 $ hg qguard +fail
42 $ hg qguard +fail
42 abort: no patches applied
43 abort: no patches applied
44 [255]
43
45
44 $ hg qpush
46 $ hg qpush
45 applying a.patch
47 applying a.patch
@@ -62,6 +64,7 b' should fail'
62
64
63 $ hg qpush a.patch
65 $ hg qpush a.patch
64 cannot push 'a.patch' - guarded by ['+a']
66 cannot push 'a.patch' - guarded by ['+a']
67 [1]
65
68
66 $ hg qguard a.patch
69 $ hg qguard a.patch
67 a.patch: +a
70 a.patch: +a
@@ -80,6 +83,7 b' test selection of an empty guard'
80
83
81 $ hg qselect ""
84 $ hg qselect ""
82 abort: guard cannot be an empty string
85 abort: guard cannot be an empty string
86 [255]
83 $ hg qselect a
87 $ hg qselect a
84 number of unguarded, unapplied patches has changed from 2 to 3
88 number of unguarded, unapplied patches has changed from 2 to 3
85
89
@@ -23,6 +23,7 b' try to commit on top of a patch'
23 $ echo quux >> foo
23 $ echo quux >> foo
24 $ hg ci -m 'append quux'
24 $ hg ci -m 'append quux'
25 abort: cannot commit over an applied mq patch
25 abort: cannot commit over an applied mq patch
26 [255]
26
27
27
28
28 cheat a bit...
29 cheat a bit...
@@ -36,18 +37,23 b' qpop/qrefresh on the wrong revision'
36
37
37 $ hg qpop
38 $ hg qpop
38 abort: popping would remove a revision not managed by this patch queue
39 abort: popping would remove a revision not managed by this patch queue
40 [255]
39 $ hg qpop -n patches
41 $ hg qpop -n patches
40 using patch queue: .*/repo/.hg/patches
42 using patch queue: .*/repo/.hg/patches
41 abort: popping would remove a revision not managed by this patch queue
43 abort: popping would remove a revision not managed by this patch queue
44 [255]
42 $ hg qrefresh
45 $ hg qrefresh
43 abort: working directory revision is not qtip
46 abort: working directory revision is not qtip
47 [255]
44
48
45 $ hg up -C qtip
49 $ hg up -C qtip
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
47 $ hg qpop
51 $ hg qpop
48 abort: popping would remove a revision not managed by this patch queue
52 abort: popping would remove a revision not managed by this patch queue
53 [255]
49 $ hg qrefresh
54 $ hg qrefresh
50 abort: cannot refresh a revision with children
55 abort: cannot refresh a revision with children
56 [255]
51 $ hg tip --template '{rev} {desc}\n'
57 $ hg tip --template '{rev} {desc}\n'
52 3 append quux
58 3 append quux
53
59
@@ -136,6 +136,7 b' qinit -c should create both files if the'
136 $ cat .hg/patches/series
136 $ cat .hg/patches/series
137 $ hg qinit -c
137 $ hg qinit -c
138 abort: repository .* already exists!
138 abort: repository .* already exists!
139 [255]
139 $ cd ..
140 $ cd ..
140
141
141 $ echo '% qinit; <stuff>; qinit -c'
142 $ echo '% qinit; <stuff>; qinit -c'
@@ -196,6 +197,7 b' init --mq without repo'
196 $ cd f
197 $ cd f
197 $ hg init --mq
198 $ hg init --mq
198 abort: there is no Mercurial repository here (.hg not found)
199 abort: there is no Mercurial repository here (.hg not found)
200 [255]
199 $ cd ..
201 $ cd ..
200
202
201 init --mq with repo path
203 init --mq with repo path
@@ -209,6 +211,7 b' init --mq with nonexistent directory'
209
211
210 $ hg init --mq nonexistentdir
212 $ hg init --mq nonexistentdir
211 abort: repository nonexistentdir not found!
213 abort: repository nonexistentdir not found!
214 [255]
212
215
213
216
214 init --mq with bundle (non "local")
217 init --mq with bundle (non "local")
@@ -216,6 +219,7 b' init --mq with bundle (non "local")'
216 $ hg -R a bundle --all a.bundle >/dev/null
219 $ hg -R a bundle --all a.bundle >/dev/null
217 $ hg init --mq a.bundle
220 $ hg init --mq a.bundle
218 abort: only a local queue repository may be initialized
221 abort: only a local queue repository may be initialized
222 [255]
219
223
220 $ cd a
224 $ cd a
221
225
@@ -370,6 +374,7 b' next'
370
374
371 $ hg qunapp -1
375 $ hg qunapp -1
372 all patches applied
376 all patches applied
377 [1]
373
378
374 $ hg qpop
379 $ hg qpop
375 popping test2.patch
380 popping test2.patch
@@ -379,12 +384,14 b' commit should fail'
379
384
380 $ hg commit
385 $ hg commit
381 abort: cannot commit over an applied mq patch
386 abort: cannot commit over an applied mq patch
387 [255]
382
388
383 push should fail
389 push should fail
384
390
385 $ hg push ../../k
391 $ hg push ../../k
386 pushing to ../../k
392 pushing to ../../k
387 abort: source has mq patches applied
393 abort: source has mq patches applied
394 [255]
388
395
389
396
390 import should fail
397 import should fail
@@ -395,6 +402,7 b' import should fail'
395 $ hg revert --no-backup ../a
402 $ hg revert --no-backup ../a
396 $ hg import ../../import.diff
403 $ hg import ../../import.diff
397 abort: cannot import over an applied patch
404 abort: cannot import over an applied patch
405 [255]
398 $ hg st
406 $ hg st
399
407
400 import --no-commit should succeed
408 import --no-commit should succeed
@@ -454,6 +462,7 b' qpush --move'
454 $ hg qguard test2.patch -- +posguard
462 $ hg qguard test2.patch -- +posguard
455 $ hg qpush --move test2.patch # can't move guarded patch
463 $ hg qpush --move test2.patch # can't move guarded patch
456 cannot push 'test2.patch' - guarded by ['+posguard']
464 cannot push 'test2.patch' - guarded by ['+posguard']
465 [1]
457 $ hg qselect posguard
466 $ hg qselect posguard
458 number of unguarded, unapplied patches has changed from 2 to 3
467 number of unguarded, unapplied patches has changed from 2 to 3
459 $ hg qpush --move test2.patch # move to front
468 $ hg qpush --move test2.patch # move to front
@@ -490,10 +499,13 b' cleaning up'
490 now at: test1b.patch
499 now at: test1b.patch
491 $ hg qpush --move bogus # nonexistent patch
500 $ hg qpush --move bogus # nonexistent patch
492 abort: patch bogus not in series
501 abort: patch bogus not in series
502 [255]
493 $ hg qpush --move # no patch
503 $ hg qpush --move # no patch
494 abort: please specify the patch to move
504 abort: please specify the patch to move
505 [255]
495 $ hg qpush --move test.patch # already applied
506 $ hg qpush --move test.patch # already applied
496 abort: cannot push to a previous patch: test.patch
507 abort: cannot push to a previous patch: test.patch
508 [255]
497 $ hg qpush
509 $ hg qpush
498 applying test2.patch
510 applying test2.patch
499 now at: test2.patch
511 now at: test2.patch
@@ -520,6 +532,7 b' qapplied -1 test.patch'
520
532
521 $ hg qapplied -1 test.patch
533 $ hg qapplied -1 test.patch
522 only one patch applied
534 only one patch applied
535 [1]
523
536
524 qapplied -1 test1b.patch
537 qapplied -1 test1b.patch
525
538
@@ -553,6 +566,7 b' qunapplied -1'
553
566
554 $ hg qunapplied -1
567 $ hg qunapplied -1
555 all patches applied
568 all patches applied
569 [1]
556
570
557 qunapplied
571 qunapplied
558
572
@@ -582,6 +596,7 b' qunapplied -1 test2.patch'
582
596
583 $ hg qunapplied -1 test2.patch
597 $ hg qunapplied -1 test2.patch
584 all patches applied
598 all patches applied
599 [1]
585
600
586 popping -a
601 popping -a
587
602
@@ -598,6 +613,7 b' qapplied -1'
598
613
599 $ hg qapplied -1
614 $ hg qapplied -1
600 no patches applied
615 no patches applied
616 [1]
601 $ hg qpush
617 $ hg qpush
602 applying test.patch
618 applying test.patch
603 now at: test.patch
619 now at: test.patch
@@ -760,6 +776,7 b' strip with local changes, should complai'
760 $ hg add y
776 $ hg add y
761 $ hg strip tip
777 $ hg strip tip
762 abort: local changes found
778 abort: local changes found
779 [255]
763
780
764 --force strip with local changes
781 --force strip with local changes
765
782
@@ -835,6 +852,7 b' qpush failure'
835 patch failed, unable to continue (try -v)
852 patch failed, unable to continue (try -v)
836 patch failed, rejects left in working dir
853 patch failed, rejects left in working dir
837 errors during apply, please fix and refresh bar
854 errors during apply, please fix and refresh bar
855 [2]
838 $ hg st
856 $ hg st
839 ? foo
857 ? foo
840 ? foo.rej
858 ? foo.rej
@@ -865,6 +883,7 b' bad node in status'
865 default 0:cb9a9f314b8b
883 default 0:cb9a9f314b8b
866 $ hg qpop
884 $ hg qpop
867 no patches applied
885 no patches applied
886 [1]
868
887
869 $ cat >>$HGRCPATH <<EOF
888 $ cat >>$HGRCPATH <<EOF
870 > [diff]
889 > [diff]
@@ -1064,6 +1083,7 b' check binary patches can be popped and p'
1064 popping addbucephalus
1083 popping addbucephalus
1065 now at: addalexander
1084 now at: addalexander
1066 $ test -f bucephalus && echo % bucephalus should not be there
1085 $ test -f bucephalus && echo % bucephalus should not be there
1086 [1]
1067 $ hg qpush
1087 $ hg qpush
1068 applying addbucephalus
1088 applying addbucephalus
1069 now at: addbucephalus
1089 now at: addbucephalus
@@ -1162,6 +1182,7 b' repo with unversioned patch dir'
1162
1182
1163 $ hg qclone qclonesource failure
1183 $ hg qclone qclonesource failure
1164 abort: versioned patch repository not found (see init --mq)
1184 abort: versioned patch repository not found (see init --mq)
1185 [255]
1165
1186
1166 $ cd qclonesource
1187 $ cd qclonesource
1167 $ hg qinit -c
1188 $ hg qinit -c
@@ -1254,6 +1275,7 b' qpush should fail, local changes'
1254
1275
1255 $ hg qpush
1276 $ hg qpush
1256 abort: local changes found, refresh first
1277 abort: local changes found, refresh first
1278 [255]
1257
1279
1258
1280
1259 apply force, should not discard changes with empty patch
1281 apply force, should not discard changes with empty patch
@@ -1299,6 +1321,7 b' qpush should fail, local changes'
1299
1321
1300 $ hg qpush
1322 $ hg qpush
1301 abort: local changes found, refresh first
1323 abort: local changes found, refresh first
1324 [255]
1302
1325
1303
1326
1304 apply force, should discard changes in hello, but not bye
1327 apply force, should discard changes in hello, but not bye
@@ -12,13 +12,16 b' Should fail:'
12
12
13 $ hg st b/x
13 $ hg st b/x
14 abort: path 'b/x' is inside repo 'b'
14 abort: path 'b/x' is inside repo 'b'
15 [255]
15 $ hg add b/x
16 $ hg add b/x
16 abort: path 'b/x' is inside repo 'b'
17 abort: path 'b/x' is inside repo 'b'
18 [255]
17
19
18 Should fail:
20 Should fail:
19
21
20 $ hg add b b/x
22 $ hg add b b/x
21 abort: path 'b/x' is inside repo 'b'
23 abort: path 'b/x' is inside repo 'b'
24 [255]
22 $ hg st
25 $ hg st
23
26
24 Should arguably print nothing:
27 Should arguably print nothing:
@@ -32,5 +35,6 b' Should fail:'
32
35
33 $ hg mv a b
36 $ hg mv a b
34 abort: path 'b/a' is inside repo 'b'
37 abort: path 'b/a' is inside repo 'b'
38 [255]
35 $ hg st
39 $ hg st
36
40
@@ -20,6 +20,7 b' Branch shadowing:'
20
20
21 $ hg branch default
21 $ hg branch default
22 abort: a branch of the same name already exists (use 'hg update' to switch to it)
22 abort: a branch of the same name already exists (use 'hg update' to switch to it)
23 [255]
23
24
24 $ hg branch -f default
25 $ hg branch -f default
25 marked working directory as branch default
26 marked working directory as branch default
@@ -186,6 +187,7 b' Update with no arguments: tipmost revisi'
186
187
187 $ hg up
188 $ hg up
188 abort: branch foobar not found
189 abort: branch foobar not found
190 [255]
189
191
190 Fastforward merge:
192 Fastforward merge:
191
193
@@ -292,6 +294,7 b' Implicit merge with test branch as paren'
292 $ hg merge
294 $ hg merge
293 abort: branch 'test' has one head - please merge with an explicit rev
295 abort: branch 'test' has one head - please merge with an explicit rev
294 (run 'hg heads' to see all heads)
296 (run 'hg heads' to see all heads)
297 [255]
295 $ hg up -C default
298 $ hg up -C default
296 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
299 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
297
300
@@ -300,6 +303,7 b' Implicit merge with default branch as pa'
300 $ hg merge
303 $ hg merge
301 abort: branch 'default' has 3 heads - please merge with an explicit rev
304 abort: branch 'default' has 3 heads - please merge with an explicit rev
302 (run 'hg heads .' to see heads)
305 (run 'hg heads .' to see heads)
306 [255]
303
307
304 3 branch heads, explicit merge required:
308 3 branch heads, explicit merge required:
305
309
@@ -54,6 +54,7 b' hg parents c, single revision'
54
54
55 $ hg parents -r 3 c
55 $ hg parents -r 3 c
56 abort: 'c' not found in manifest!
56 abort: 'c' not found in manifest!
57 [255]
57
58
58 $ hg parents -r 2
59 $ hg parents -r 2
59 changeset: 1:d786049f033a
60 changeset: 1:d786049f033a
@@ -71,6 +72,7 b' hg parents c, single revision'
71
72
72 $ hg parents -r 2 ../a
73 $ hg parents -r 2 ../a
73 abort: ../a not under root
74 abort: ../a not under root
75 [255]
74
76
75
77
76 cd dir; hg parents -r 2 ../a
78 cd dir; hg parents -r 2 ../a
@@ -93,6 +95,7 b' cd dir; hg parents -r 2 ../a'
93
95
94 $ hg parents -r 2 glob:a
96 $ hg parents -r 2 glob:a
95 abort: can only specify an explicit filename
97 abort: can only specify an explicit filename
98 [255]
96
99
97
100
98 merge working dir with 2 parents, hg parents c
101 merge working dir with 2 parents, hg parents c
@@ -18,10 +18,13 b' This runs with TZ="GMT"'
18 $ echo "fail" >> a
18 $ echo "fail" >> a
19 $ hg ci -d "should fail" -m "fail"
19 $ hg ci -d "should fail" -m "fail"
20 abort: invalid date: 'should fail'
20 abort: invalid date: 'should fail'
21 [255]
21 $ hg ci -d "100000000000000000 1400" -m "fail"
22 $ hg ci -d "100000000000000000 1400" -m "fail"
22 abort: date exceeds 32 bits: 100000000000000000
23 abort: date exceeds 32 bits: 100000000000000000
24 [255]
23 $ hg ci -d "100000 1400000" -m "fail"
25 $ hg ci -d "100000 1400000" -m "fail"
24 abort: impossible time zone offset: 1400000
26 abort: impossible time zone offset: 1400000
27 [255]
25
28
26 Check with local timezone other than GMT and with DST
29 Check with local timezone other than GMT and with DST
27
30
@@ -62,6 +62,7 b''
62 1 files changed, 1 insertions(+), 0 deletions(-)
62 1 files changed, 1 insertions(+), 0 deletions(-)
63
63
64 are you sure you want to send (yn)? abort: patchbomb canceled
64 are you sure you want to send (yn)? abort: patchbomb canceled
65 [255]
65
66
66 $ echo b > b
67 $ echo b > b
67 $ hg commit -Amb -d '2 0'
68 $ hg commit -Amb -d '2 0'
@@ -1447,6 +1448,7 b' test inreplyto:'
1447 This patch series consists of 2 patches.
1448 This patch series consists of 2 patches.
1448
1449
1449 abort: Subject: [PATCH 0 of 2] Please enter a valid value
1450 abort: Subject: [PATCH 0 of 2] Please enter a valid value
1451 [255]
1450
1452
1451 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1453 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1452 > -s test -r 0:1 | fixheaders
1454 > -s test -r 0:1 | fixheaders
@@ -8,8 +8,10 b''
8 $ hg in dupe
8 $ hg in dupe
9 comparing with .*/test-paths.t/b
9 comparing with .*/test-paths.t/b
10 no changes found
10 no changes found
11 [1]
11 $ cd ..
12 $ cd ..
12 $ hg -R a in dupe
13 $ hg -R a in dupe
13 comparing with .*/test-paths.t/b
14 comparing with .*/test-paths.t/b
14 no changes found
15 no changes found
16 [1]
15 $ true
17 $ true
@@ -34,6 +34,7 b' Pull a missing revision:'
34
34
35 $ hg pull -qr missing ../repo
35 $ hg pull -qr missing ../repo
36 abort: unknown revision 'missing'!
36 abort: unknown revision 'missing'!
37 [255]
37
38
38 Pull multiple revisions with update:
39 Pull multiple revisions with update:
39
40
@@ -69,6 +69,7 b" Test 'file:' uri handling:"
69
69
70 $ hg pull -q file://../test-doesnt-exist
70 $ hg pull -q file://../test-doesnt-exist
71 abort: repository /test-doesnt-exist not found!
71 abort: repository /test-doesnt-exist not found!
72 [255]
72
73
73 $ hg pull -q file:../test
74 $ hg pull -q file:../test
74
75
@@ -35,6 +35,7 b' Expected to fail:'
35 2 files, 2 changesets, 2 total revisions
35 2 files, 2 changesets, 2 total revisions
36 1 integrity errors encountered!
36 1 integrity errors encountered!
37 (first damaged changeset appears to be 1)
37 (first damaged changeset appears to be 1)
38 [1]
38
39
39 Expected to fail:
40 Expected to fail:
40
41
@@ -47,6 +48,7 b' Expected to fail:'
47 transaction abort!
48 transaction abort!
48 rollback completed
49 rollback completed
49 abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
50 abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
51 [255]
50
52
51 $ true
53 $ true
52
54
@@ -28,6 +28,7 b''
28 searching for changes
28 searching for changes
29 abort: push creates new remote heads on branch 'default'!
29 abort: push creates new remote heads on branch 'default'!
30 (you should pull and merge or use push -f to force)
30 (you should pull and merge or use push -f to force)
31 [255]
31
32
32 $ hg pull ../a
33 $ hg pull ../a
33 pulling from ../a
34 pulling from ../a
@@ -43,6 +44,7 b''
43 searching for changes
44 searching for changes
44 abort: push creates new remote heads on branch 'default'!
45 abort: push creates new remote heads on branch 'default'!
45 (did you forget to merge? use push -f to force)
46 (did you forget to merge? use push -f to force)
47 [255]
46
48
47 $ hg merge
49 $ hg merge
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -139,6 +141,7 b''
139 comparing with ../c
141 comparing with ../c
140 searching for changes
142 searching for changes
141 no changes found
143 no changes found
144 [1]
142
145
143
146
144 Issue 450:
147 Issue 450:
@@ -315,6 +318,7 b' Failed push of new named branch:'
315
318
316 $ echo 12 > foo
319 $ echo 12 > foo
317 $ hg -q ci -m 12a
320 $ hg -q ci -m 12a
321 [1]
318 $ hg -q up 11
322 $ hg -q up 11
319 $ echo 13 > foo
323 $ echo 13 > foo
320 $ hg -q branch e
324 $ hg -q branch e
@@ -372,6 +376,7 b' multiple new heads:'
372 searching for changes
376 searching for changes
373 abort: push creates new remote heads on branch 'default'!
377 abort: push creates new remote heads on branch 'default'!
374 (you should pull and merge or use push -f to force)
378 (you should pull and merge or use push -f to force)
379 [255]
375
380
376
381
377 Check prepush logic with merged branches:
382 Check prepush logic with merged branches:
@@ -405,6 +410,7 b' Check prepush logic with merged branches'
405 searching for changes
410 searching for changes
406 abort: push creates new remote branches: b!
411 abort: push creates new remote branches: b!
407 (use 'hg push --new-branch' to create new remote branches)
412 (use 'hg push --new-branch' to create new remote branches)
413 [255]
408
414
409
415
410 Prepush -r should not allow you to sneak in new heads:
416 Prepush -r should not allow you to sneak in new heads:
@@ -440,6 +446,7 b' Prepush -r should not allow you to sneak'
440 searching for changes
446 searching for changes
441 abort: push creates new remote heads on branch 'a'!
447 abort: push creates new remote heads on branch 'a'!
442 (did you forget to merge? use push -f to force)
448 (did you forget to merge? use push -f to force)
449 [255]
443
450
444 $ cd ..
451 $ cd ..
445
452
@@ -685,17 +692,20 b' outgoing:'
685 searching for changes
692 searching for changes
686 abort: push creates new remote heads on branch 'A'!
693 abort: push creates new remote heads on branch 'A'!
687 (did you forget to merge? use push -f to force)
694 (did you forget to merge? use push -f to force)
695 [255]
688
696
689 $ hg push inner -r4 -r5
697 $ hg push inner -r4 -r5
690 pushing to inner
698 pushing to inner
691 searching for changes
699 searching for changes
692 abort: push creates new remote heads on branch 'A'!
700 abort: push creates new remote heads on branch 'A'!
693 (did you forget to merge? use push -f to force)
701 (did you forget to merge? use push -f to force)
702 [255]
694
703
695 $ hg in inner
704 $ hg in inner
696 comparing with inner
705 comparing with inner
697 searching for changes
706 searching for changes
698 no changes found
707 no changes found
708 [1]
699
709
700 $ cd ..
710 $ cd ..
701
711
@@ -32,6 +32,7 b' help (no mq, so no qrecord)'
32 update update working directory (or switch revisions)
32 update update working directory (or switch revisions)
33
33
34 use "hg help" for the full list of commands or "hg -v" for details
34 use "hg help" for the full list of commands or "hg -v" for details
35 [255]
35
36
36 help (mq present)
37 help (mq present)
37
38
@@ -86,6 +86,7 b' Select files but no hunks'
86 new file mode 100644
86 new file mode 100644
87 examine changes to 'empty-rw'? [Ynsfdaq?]
87 examine changes to 'empty-rw'? [Ynsfdaq?]
88 abort: empty commit message
88 abort: empty commit message
89 [255]
89
90
90 $ hg tip -p
91 $ hg tip -p
91 changeset: -1:000000000000
92 changeset: -1:000000000000
@@ -698,6 +699,7 b' Help, quit'
698 ? - display help
699 ? - display help
699 examine changes to 'subdir/f1'? [Ynsfdaq?]
700 examine changes to 'subdir/f1'? [Ynsfdaq?]
700 abort: user quit
701 abort: user quit
702 [255]
701
703
702 Skip
704 Skip
703
705
@@ -710,6 +712,7 b' Skip'
710 diff --git a/subdir/f2 b/subdir/f2
712 diff --git a/subdir/f2 b/subdir/f2
711 1 hunks, 1 lines changed
713 1 hunks, 1 lines changed
712 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
714 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
715 [255]
713
716
714 No
717 No
715
718
@@ -722,6 +725,7 b' No'
722 diff --git a/subdir/f2 b/subdir/f2
725 diff --git a/subdir/f2 b/subdir/f2
723 1 hunks, 1 lines changed
726 1 hunks, 1 lines changed
724 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
727 examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected
728 [255]
725
729
726 f, quit
730 f, quit
727
731
@@ -736,6 +740,7 b' f, quit'
736 1 hunks, 1 lines changed
740 1 hunks, 1 lines changed
737 examine changes to 'subdir/f2'? [Ynsfdaq?]
741 examine changes to 'subdir/f2'? [Ynsfdaq?]
738 abort: user quit
742 abort: user quit
743 [255]
739
744
740 s, all
745 s, all
741
746
@@ -926,6 +931,7 b' Abort early when a merge is in progress'
926
931
927 $ hg record -m'will abort'
932 $ hg record -m'will abort'
928 abort: cannot partially commit a merge (use hg commit instead)
933 abort: cannot partially commit a merge (use hg commit instead)
934 [255]
929
935
930 $ hg up -C
936 $ hg up -C
931 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
937 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -10,4 +10,5 b" test that 'hg commit' does not crash if "
10 $ hg commit -A -m"comment #1"
10 $ hg commit -A -m"comment #1"
11 removing b
11 removing b
12 nothing changed
12 nothing changed
13 [1]
13 $ exit 0
14 $ exit 0
@@ -268,6 +268,7 b' overwrite existing files (d2/b)'
268 @@ -1 +1 @@
268 @@ -1 +1 @@
269 -d1/b
269 -d1/b
270 +d2/b
270 +d2/b
271 [1]
271 $ hg update -C
272 $ hg update -C
272 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
273 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
273 $ rm d2/a d2/ba d2/d11/a1
274 $ rm d2/a d2/ba d2/d11/a1
@@ -276,6 +277,7 b' attempt to move one file into a non-exis'
276
277
277 $ hg rename d1/a dx/
278 $ hg rename d1/a dx/
278 abort: destination dx/ is not a directory
279 abort: destination dx/ is not a directory
280 [255]
279 $ hg status -C
281 $ hg status -C
280 $ hg update -C
282 $ hg update -C
281 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
283 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -284,6 +286,7 b' attempt to move potentially more than on'
284
286
285 $ hg rename 'glob:d1/**' dx
287 $ hg rename 'glob:d1/**' dx
286 abort: with multiple sources, destination must be an existing directory
288 abort: with multiple sources, destination must be an existing directory
289 [255]
287
290
288 move every file under d1 to d2/d21 (glob)
291 move every file under d1 to d2/d21 (glob)
289
292
@@ -560,14 +563,17 b' check illegal path components'
560
563
561 $ hg rename d1/d11/a1 .hg/foo
564 $ hg rename d1/d11/a1 .hg/foo
562 abort: path contains illegal component: .hg/foo
565 abort: path contains illegal component: .hg/foo
566 [255]
563 $ hg status -C
567 $ hg status -C
564 $ hg rename d1/d11/a1 ../foo
568 $ hg rename d1/d11/a1 ../foo
565 abort: ../foo not under root
569 abort: ../foo not under root
570 [255]
566 $ hg status -C
571 $ hg status -C
567
572
568 $ mv d1/d11/a1 .hg/foo
573 $ mv d1/d11/a1 .hg/foo
569 $ hg rename --after d1/d11/a1 .hg/foo
574 $ hg rename --after d1/d11/a1 .hg/foo
570 abort: path contains illegal component: .hg/foo
575 abort: path contains illegal component: .hg/foo
576 [255]
571 $ hg status -C
577 $ hg status -C
572 ! d1/d11/a1
578 ! d1/d11/a1
573 $ hg update -C
579 $ hg update -C
@@ -576,14 +582,17 b' check illegal path components'
576
582
577 $ hg rename d1/d11/a1 .hg
583 $ hg rename d1/d11/a1 .hg
578 abort: path contains illegal component: .hg/a1
584 abort: path contains illegal component: .hg/a1
585 [255]
579 $ hg status -C
586 $ hg status -C
580 $ hg rename d1/d11/a1 ..
587 $ hg rename d1/d11/a1 ..
581 abort: ../a1 not under root
588 abort: ../a1 not under root
589 [255]
582 $ hg status -C
590 $ hg status -C
583
591
584 $ mv d1/d11/a1 .hg
592 $ mv d1/d11/a1 .hg
585 $ hg rename --after d1/d11/a1 .hg
593 $ hg rename --after d1/d11/a1 .hg
586 abort: path contains illegal component: .hg/a1
594 abort: path contains illegal component: .hg/a1
595 [255]
587 $ hg status -C
596 $ hg status -C
588 ! d1/d11/a1
597 ! d1/d11/a1
589 $ hg update -C
598 $ hg update -C
@@ -592,8 +601,10 b' check illegal path components'
592
601
593 $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
602 $ (cd d1/d11; hg rename ../../d2/b ../../.hg/foo)
594 abort: path contains illegal component: .hg/foo
603 abort: path contains illegal component: .hg/foo
604 [255]
595 $ hg status -C
605 $ hg status -C
596 $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
606 $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
597 abort: ../../../foo not under root
607 abort: ../../../foo not under root
608 [255]
598 $ hg status -C
609 $ hg status -C
599
610
@@ -7,8 +7,10 b''
7 $ rm .hg/requires
7 $ rm .hg/requires
8 $ hg tip
8 $ hg tip
9 abort: index 00changelog.i unknown format 2!
9 abort: index 00changelog.i unknown format 2!
10 [255]
10 $ echo indoor-pool > .hg/requires
11 $ echo indoor-pool > .hg/requires
11 $ hg tip
12 $ hg tip
12 abort: requirement 'indoor-pool' not supported!
13 abort: requirement 'indoor-pool' not supported!
14 [255]
13
15
14 $ true
16 $ true
@@ -24,6 +24,7 b' failing merge'
24 $ HGMERGE=internal:fail hg merge
24 $ HGMERGE=internal:fail hg merge
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
27 [1]
27
28
28 $ echo resolved > file
29 $ echo resolved > file
29 $ hg resolve -m file
30 $ hg resolve -m file
@@ -186,6 +186,7 b' should fail - no arguments'
186
186
187 $ hg revert -rtip
187 $ hg revert -rtip
188 abort: no files or directories specified; use --all to revert the whole repo
188 abort: no files or directories specified; use --all to revert the whole repo
189 [255]
189
190
190 should succeed
191 should succeed
191
192
@@ -61,6 +61,7 b''
61 marked working directory as branch all
61 marked working directory as branch all
62 $ hg ci --close-branch -Aqm8
62 $ hg ci --close-branch -Aqm8
63 abort: can only close branch heads
63 abort: can only close branch heads
64 [255]
64
65
65 $ hg co 4
66 $ hg co 4
66 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -97,11 +98,13 b' names that should work without quoting'
97 7
98 7
98 $ try -- '-a-b-c-' # complains
99 $ try -- '-a-b-c-' # complains
99 hg: parse error at 7: not a prefix: end
100 hg: parse error at 7: not a prefix: end
101 [255]
100 $ log -a-b-c- # succeeds with fallback
102 $ log -a-b-c- # succeeds with fallback
101 4
103 4
102 $ try -- -a-b-c--a # complains
104 $ try -- -a-b-c--a # complains
103 ('minus', ('minus', ('minus', ('negate', ('symbol', 'a')), ('symbol', 'b')), ('symbol', 'c')), ('negate', ('symbol', 'a')))
105 ('minus', ('minus', ('minus', ('negate', ('symbol', 'a')), ('symbol', 'b')), ('symbol', 'c')), ('negate', ('symbol', 'a')))
104 abort: unknown revision '-a'!
106 abort: unknown revision '-a'!
107 [255]
105 $ try é
108 $ try é
106 ('symbol', '\xc3\xa9')
109 ('symbol', '\xc3\xa9')
107 9
110 9
@@ -143,21 +146,28 b' quoting needed'
143 4
146 4
144 $ log 'date(this is a test)'
147 $ log 'date(this is a test)'
145 hg: parse error at 10: unexpected token: symbol
148 hg: parse error at 10: unexpected token: symbol
149 [255]
146 $ log 'date()'
150 $ log 'date()'
147 hg: parse error: date wants a string
151 hg: parse error: date wants a string
152 [255]
148 $ log 'date'
153 $ log 'date'
149 hg: parse error: can't use date here
154 hg: parse error: can't use date here
155 [255]
150 $ log 'date('
156 $ log 'date('
151 hg: parse error at 5: not a prefix: end
157 hg: parse error at 5: not a prefix: end
158 [255]
152 $ log 'date(tip)'
159 $ log 'date(tip)'
153 abort: invalid date: 'tip'
160 abort: invalid date: 'tip'
161 [255]
154 $ log '"date"'
162 $ log '"date"'
155 abort: unknown revision 'date'!
163 abort: unknown revision 'date'!
164 [255]
156 $ log 'date(2005) and 1::'
165 $ log 'date(2005) and 1::'
157 4
166 4
158
167
159 $ log 'ancestor(1)'
168 $ log 'ancestor(1)'
160 hg: parse error: ancestor wants two arguments
169 hg: parse error: ancestor wants two arguments
170 [255]
161 $ log 'ancestor(4,5)'
171 $ log 'ancestor(4,5)'
162 1
172 1
163 $ log 'ancestor(4,5) and 4'
173 $ log 'ancestor(4,5) and 4'
@@ -268,6 +268,7 b' test unknown color'
268 merging b failed!
268 merging b failed!
269 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
269 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
270 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
270 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
271 [1]
271 $ hg resolve -m b
272 $ hg resolve -m b
272
273
273 hg resolve with one unresolved, one resolved:
274 hg resolve with one unresolved, one resolved:
@@ -35,6 +35,7 b''
35 update update working directory (or switch revisions)
35 update update working directory (or switch revisions)
36
36
37 use "hg help" for the full list of commands or "hg -v" for details
37 use "hg help" for the full list of commands or "hg -v" for details
38 [255]
38 $ hg annotate a
39 $ hg annotate a
39 0: a
40 0: a
40
41
@@ -29,5 +29,6 b' test bad subpaths pattern'
29 > EOF
29 > EOF
30 $ hg debugsub
30 $ hg debugsub
31 abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference
31 abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference
32 [255]
32
33
33 $ exit 0
34 $ exit 0
@@ -253,6 +253,7 b' Clone and test outgoing:'
253 comparing with .*/test-subrepo-recursion.t/repo/foo
253 comparing with .*/test-subrepo-recursion.t/repo/foo
254 searching for changes
254 searching for changes
255 no changes found
255 no changes found
256 [1]
256 $ echo $?
257 $ echo $?
257 0
258 0
258
259
@@ -315,6 +316,7 b' Test incoming:'
315
316
316 $ hg incoming -S --bundle incoming.hg
317 $ hg incoming -S --bundle incoming.hg
317 abort: cannot combine --bundle and --subrepos
318 abort: cannot combine --bundle and --subrepos
319 [255]
318
320
319 Test missing subrepo:
321 Test missing subrepo:
320
322
@@ -153,6 +153,7 b' this commit fails because of externals c'
153 $ hg ci -m 'amend externals from hg'
153 $ hg ci -m 'amend externals from hg'
154 committing subrepository s
154 committing subrepository s
155 abort: cannot commit svn externals
155 abort: cannot commit svn externals
156 [255]
156 $ hg diff --subrepos -r 1:2 | grep -v diff
157 $ hg diff --subrepos -r 1:2 | grep -v diff
157 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
158 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
158 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
159 +++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
@@ -173,6 +174,7 b' this commit fails because of externals m'
173 $ hg ci -m 'amend externals from hg'
174 $ hg ci -m 'amend externals from hg'
174 committing subrepository s
175 committing subrepository s
175 abort: cannot commit svn externals
176 abort: cannot commit svn externals
177 [255]
176 $ svn revert -q s/externals/other
178 $ svn revert -q s/externals/other
177
179
178 clone
180 clone
@@ -21,6 +21,7 b' issue2232 - committing a subrepo without'
21
21
22 $ hg ci -mbad s
22 $ hg ci -mbad s
23 abort: can't commit subrepos without .hgsub
23 abort: can't commit subrepos without .hgsub
24 [255]
24
25
25 $ hg -R s ci -Ams0
26 $ hg -R s ci -Ams0
26 adding a
27 adding a
@@ -302,6 +303,7 b' push -f'
302 searching for changes
303 searching for changes
303 abort: push creates new remote heads on branch 'default'!
304 abort: push creates new remote heads on branch 'default'!
304 (did you forget to merge? use push -f to force)
305 (did you forget to merge? use push -f to force)
306 [255]
305 $ hg push -f
307 $ hg push -f
306 pushing .*sub/t
308 pushing .*sub/t
307 pushing .*sub/t/s/ss
309 pushing .*sub/t/s/ss
@@ -361,6 +363,7 b' bogus subrepo path aborts'
361 $ echo 'bogus=[boguspath' >> .hgsub
363 $ echo 'bogus=[boguspath' >> .hgsub
362 $ hg ci -m 'bogus subrepo path'
364 $ hg ci -m 'bogus subrepo path'
363 abort: missing ] in subrepo source
365 abort: missing ] in subrepo source
366 [255]
364
367
365 issue 1986
368 issue 1986
366
369
@@ -577,6 +580,7 b' issue 1977'
577 $ hg -q -R repo2 push
580 $ hg -q -R repo2 push
578 abort: push creates new remote heads on branch 'default'!
581 abort: push creates new remote heads on branch 'default'!
579 (did you forget to merge? use push -f to force)
582 (did you forget to merge? use push -f to force)
583 [255]
580 $ hg -R repo update
584 $ hg -R repo update
581 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
585 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
582 $ rm -rf repo2 repo
586 $ rm -rf repo2 repo
@@ -178,6 +178,7 b' now addremove should remove old files'
178 $ ln -s nothing dangling
178 $ ln -s nothing dangling
179 $ hg commit -m 'commit symlink without adding' dangling
179 $ hg commit -m 'commit symlink without adding' dangling
180 abort: dangling: file not tracked!
180 abort: dangling: file not tracked!
181 [255]
181 $ hg add dangling
182 $ hg add dangling
182 $ hg commit -m 'add symlink'
183 $ hg commit -m 'add symlink'
183
184
@@ -14,6 +14,7 b''
14
14
15 $ hg tag ' '
15 $ hg tag ' '
16 abort: tag names cannot consist entirely of whitespace
16 abort: tag names cannot consist entirely of whitespace
17 [255]
17
18
18 $ hg tag "bleah"
19 $ hg tag "bleah"
19 $ hg history
20 $ hg history
@@ -88,8 +89,10 b''
88 $ hg tag -l 'xx
89 $ hg tag -l 'xx
89 > newline'
90 > newline'
90 abort: '\n' cannot be used in a tag name
91 abort: '\n' cannot be used in a tag name
92 [255]
91 $ hg tag -l 'xx:xx'
93 $ hg tag -l 'xx:xx'
92 abort: ':' cannot be used in a tag name
94 abort: ':' cannot be used in a tag name
95 [255]
93
96
94 cloning local tags
97 cloning local tags
95
98
@@ -242,6 +242,7 b' Remove nonexistent tag:'
242
242
243 $ hg tag --remove foobar
243 $ hg tag --remove foobar
244 abort: tag 'foobar' does not exist
244 abort: tag 'foobar' does not exist
245 [255]
245 $ hg tip
246 $ hg tip
246 changeset: 5:5f6e8655b1c7
247 changeset: 5:5f6e8655b1c7
247 tag: tip
248 tag: tip
@@ -290,6 +291,7 b" Don't allow moving tag without -f:"
290
291
291 $ hg tag -r 3 bar
292 $ hg tag -r 3 bar
292 abort: tag 'bar' already exists (use -f to force)
293 abort: tag 'bar' already exists (use -f to force)
294 [255]
293 $ hg tags
295 $ hg tags
294 tip 6:735c3ca72986
296 tip 6:735c3ca72986
295 bar 0:bbd179dfa0a7
297 bar 0:bbd179dfa0a7
@@ -356,10 +358,12 b' to remove a tag of type X which actually'
356 $ hg tag -r 0 -l localtag
358 $ hg tag -r 0 -l localtag
357 $ hg tag --remove localtag
359 $ hg tag --remove localtag
358 abort: tag 'localtag' is not a global tag
360 abort: tag 'localtag' is not a global tag
361 [255]
359 $
362 $
360 $ hg tag -r 0 globaltag
363 $ hg tag -r 0 globaltag
361 $ hg tag --remove -l globaltag
364 $ hg tag --remove -l globaltag
362 abort: tag 'globaltag' is not a local tag
365 abort: tag 'globaltag' is not a local tag
366 [255]
363 $ hg tags -v
367 $ hg tags -v
364 tip 1:a0b6fe111088
368 tip 1:a0b6fe111088
365 localtag 0:bbd179dfa0a7 local
369 localtag 0:bbd179dfa0a7 local
@@ -207,6 +207,7 b' transplant --continue'
207 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
207 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
208 patch failed to apply
208 patch failed to apply
209 abort: fix up the merge and run hg transplant --continue
209 abort: fix up the merge and run hg transplant --continue
210 [255]
210
211
211 transplant -c shouldn't use an old changeset
212 transplant -c shouldn't use an old changeset
212
213
@@ -220,6 +221,7 b" transplant -c shouldn't use an old chang"
220 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
221 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
221 patch failed to apply
222 patch failed to apply
222 abort: fix up the merge and run hg transplant --continue
223 abort: fix up the merge and run hg transplant --continue
224 [255]
223 $ hg transplant --continue
225 $ hg transplant --continue
224 a1e30dd1b8e7 transplanted as f1563cf27039
226 a1e30dd1b8e7 transplanted as f1563cf27039
225 $ hg transplant 1:3
227 $ hg transplant 1:3
@@ -320,6 +322,7 b' test filter with failed patch'
320 1 out of 1 hunks FAILED -- saving rejects to file b1.rej
322 1 out of 1 hunks FAILED -- saving rejects to file b1.rej
321 patch failed to apply
323 patch failed to apply
322 abort: fix up the merge and run hg transplant --continue
324 abort: fix up the merge and run hg transplant --continue
325 [255]
323 $ cd ..
326 $ cd ..
324
327
325
328
@@ -345,6 +348,7 b' test with a win32ext like setup (differi'
345 $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
348 $ python -c "file('b', 'wb').write('b\r\nb\r\n')"
346 $ hg ci -m addb
349 $ hg ci -m addb
347 nothing changed
350 nothing changed
351 [1]
348 $ hg transplant -s ../twin1 tip
352 $ hg transplant -s ../twin1 tip
349 applying 2e849d776c17
353 applying 2e849d776c17
350 2e849d776c17 transplanted to 589cea8ba85b
354 2e849d776c17 transplanted to 589cea8ba85b
@@ -17,6 +17,7 b''
17 pulling from ../a
17 pulling from ../a
18 searching for changes
18 searching for changes
19 abort: repository is unrelated
19 abort: repository is unrelated
20 [255]
20
21
21 $ hg pull -f ../a
22 $ hg pull -f ../a
22 pulling from ../a
23 pulling from ../a
@@ -10,6 +10,7 b''
10 $ echo dirty > foo
10 $ echo dirty > foo
11 $ hg up -c
11 $ hg up -c
12 abort: uncommitted local changes
12 abort: uncommitted local changes
13 [255]
13 $ hg up -q
14 $ hg up -q
14 $ cat foo
15 $ cat foo
15 dirty
16 dirty
@@ -23,6 +24,7 b' Validate update of standalone execute bi'
23 $ chmod -x foo
24 $ chmod -x foo
24 $ hg ci -m removeexec
25 $ hg ci -m removeexec
25 nothing changed
26 nothing changed
27 [1]
26 $ hg up -C 0
28 $ hg up -C 0
27 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 $ hg up
30 $ hg up
@@ -24,6 +24,7 b''
24 merging b failed!
24 merging b failed!
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
26 use 'hg resolve' to retry unresolved file merges
26 use 'hg resolve' to retry unresolved file merges
27 [1]
27
28
28 $ cd ..
29 $ cd ..
29
30
@@ -10,15 +10,18 b''
10 adding a
10 adding a
11 abort: username 'foo\nbar1' contains a newline
11 abort: username 'foo\nbar1' contains a newline
12
12
13 [255]
13 $ rm .hg/hgrc
14 $ rm .hg/hgrc
14
15
15 $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
16 $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
16 abort: username 'foo\nbar2' contains a newline
17 abort: username 'foo\nbar2' contains a newline
17
18
19 [255]
18 $ hg ci -Am m -u "`(echo foo; echo bar3)`"
20 $ hg ci -Am m -u "`(echo foo; echo bar3)`"
19 transaction abort!
21 transaction abort!
20 rollback completed
22 rollback completed
21 abort: username 'foo\nbar3' contains a newline!
23 abort: username 'foo\nbar3' contains a newline!
24 [255]
22
25
23 $ true
26 $ true
24
27
@@ -56,6 +56,7 b' introduce some bugs in repo'
56 3 files, 1 changesets, 0 total revisions
56 3 files, 1 changesets, 0 total revisions
57 9 integrity errors encountered!
57 9 integrity errors encountered!
58 (first damaged changeset appears to be 0)
58 (first damaged changeset appears to be 0)
59 [1]
59
60
60 $ cd ..
61 $ cd ..
61
62
@@ -83,6 +84,7 b' test revlog corruption'
83 1 warnings encountered!
84 1 warnings encountered!
84 1 integrity errors encountered!
85 1 integrity errors encountered!
85 (first damaged changeset appears to be 0)
86 (first damaged changeset appears to be 0)
87 [1]
86
88
87 $ cd ..
89 $ cd ..
88
90
@@ -160,8 +160,10 b''
160 f mammals/skunk skunk
160 f mammals/skunk skunk
161 $ hg debugwalk .hg
161 $ hg debugwalk .hg
162 abort: path 'mammals/.hg' is inside repo 'mammals'
162 abort: path 'mammals/.hg' is inside repo 'mammals'
163 [255]
163 $ hg debugwalk ../.hg
164 $ hg debugwalk ../.hg
164 abort: path contains illegal component: .hg
165 abort: path contains illegal component: .hg
166 [255]
165 $ cd ..
167 $ cd ..
166
168
167 $ hg debugwalk -Ibeans
169 $ hg debugwalk -Ibeans
@@ -187,16 +189,22 b''
187 f mammals/skunk mammals/skunk
189 f mammals/skunk mammals/skunk
188 $ hg debugwalk ..
190 $ hg debugwalk ..
189 abort: .. not under root
191 abort: .. not under root
192 [255]
190 $ hg debugwalk beans/../..
193 $ hg debugwalk beans/../..
191 abort: beans/../.. not under root
194 abort: beans/../.. not under root
195 [255]
192 $ hg debugwalk .hg
196 $ hg debugwalk .hg
193 abort: path contains illegal component: .hg
197 abort: path contains illegal component: .hg
198 [255]
194 $ hg debugwalk beans/../.hg
199 $ hg debugwalk beans/../.hg
195 abort: path contains illegal component: .hg
200 abort: path contains illegal component: .hg
201 [255]
196 $ hg debugwalk beans/../.hg/data
202 $ hg debugwalk beans/../.hg/data
197 abort: path contains illegal component: .hg/data
203 abort: path contains illegal component: .hg/data
204 [255]
198 $ hg debugwalk beans/.hg
205 $ hg debugwalk beans/.hg
199 abort: path 'beans/.hg' is inside repo 'beans'
206 abort: path 'beans/.hg' is inside repo 'beans'
207 [255]
200
208
201 Test absolute paths:
209 Test absolute paths:
202
210
@@ -209,6 +217,7 b' Test absolute paths:'
209 f beans/turtle beans/turtle
217 f beans/turtle beans/turtle
210 $ hg debugwalk `pwd`/..
218 $ hg debugwalk `pwd`/..
211 abort: .*/.. not under root
219 abort: .*/.. not under root
220 [255]
212
221
213 Test patterns:
222 Test patterns:
214
223
General Comments 0
You need to be logged in to leave comments. Login now