Show More
@@ -459,7 +459,7 b' def dorecord(' | |||||
459 | ) |
|
459 | ) | |
460 |
|
460 | |||
461 | def fail(f, msg): |
|
461 | def fail(f, msg): | |
462 |
raise error. |
|
462 | raise error.InputError(b'%s: %s' % (f, msg)) | |
463 |
|
463 | |||
464 | force = opts.get(b'force') |
|
464 | force = opts.get(b'force') | |
465 | if not force: |
|
465 | if not force: |
@@ -2845,7 +2845,7 b' class localrepository(object):' | |||||
2845 | extra = {} |
|
2845 | extra = {} | |
2846 |
|
2846 | |||
2847 | def fail(f, msg): |
|
2847 | def fail(f, msg): | |
2848 |
raise error. |
|
2848 | raise error.InputError(b'%s: %s' % (f, msg)) | |
2849 |
|
2849 | |||
2850 | if not match: |
|
2850 | if not match: | |
2851 | match = matchmod.always() |
|
2851 | match = matchmod.always() |
@@ -61,7 +61,7 b' Abort for untracked' | |||||
61 | $ touch untracked |
|
61 | $ touch untracked | |
62 | $ hg commit -i -m should-fail empty-rw untracked |
|
62 | $ hg commit -i -m should-fail empty-rw untracked | |
63 | abort: untracked: file not tracked! |
|
63 | abort: untracked: file not tracked! | |
64 |
[ |
|
64 | [10] | |
65 | $ rm untracked |
|
65 | $ rm untracked | |
66 |
|
66 | |||
67 | Record empty file |
|
67 | Record empty file |
@@ -54,7 +54,7 b' commit added file that has been deleted' | |||||
54 | [1] |
|
54 | [1] | |
55 | $ hg commit -m commit-8-2 bar |
|
55 | $ hg commit -m commit-8-2 bar | |
56 | abort: bar: file not found! |
|
56 | abort: bar: file not found! | |
57 |
[ |
|
57 | [10] | |
58 |
|
58 | |||
59 | $ hg -q revert -a --no-backup |
|
59 | $ hg -q revert -a --no-backup | |
60 |
|
60 | |||
@@ -74,7 +74,7 b' commit added file that has been deleted' | |||||
74 | adding dir.file |
|
74 | adding dir.file | |
75 | $ hg commit -m commit-10 dir dir.file |
|
75 | $ hg commit -m commit-10 dir dir.file | |
76 | abort: dir: no match under directory! |
|
76 | abort: dir: no match under directory! | |
77 |
[ |
|
77 | [10] | |
78 |
|
78 | |||
79 | $ echo >> dir/file |
|
79 | $ echo >> dir/file | |
80 | $ mkdir bleh |
|
80 | $ mkdir bleh | |
@@ -82,10 +82,10 b' commit added file that has been deleted' | |||||
82 | $ cd bleh |
|
82 | $ cd bleh | |
83 | $ hg commit -m commit-11 . |
|
83 | $ hg commit -m commit-11 . | |
84 | abort: bleh: no match under directory! |
|
84 | abort: bleh: no match under directory! | |
85 |
[ |
|
85 | [10] | |
86 | $ hg commit -m commit-12 ../dir ../dir2 |
|
86 | $ hg commit -m commit-12 ../dir ../dir2 | |
87 | abort: dir2: no match under directory! |
|
87 | abort: dir2: no match under directory! | |
88 |
[ |
|
88 | [10] | |
89 | $ hg -v commit -m commit-13 ../dir |
|
89 | $ hg -v commit -m commit-13 ../dir | |
90 | committing files: |
|
90 | committing files: | |
91 | dir/file |
|
91 | dir/file | |
@@ -96,20 +96,20 b' commit added file that has been deleted' | |||||
96 |
|
96 | |||
97 | $ hg commit -m commit-14 does-not-exist |
|
97 | $ hg commit -m commit-14 does-not-exist | |
98 | abort: does-not-exist: * (glob) |
|
98 | abort: does-not-exist: * (glob) | |
99 |
[ |
|
99 | [10] | |
100 |
|
100 | |||
101 | #if symlink |
|
101 | #if symlink | |
102 | $ ln -s foo baz |
|
102 | $ ln -s foo baz | |
103 | $ hg commit -m commit-15 baz |
|
103 | $ hg commit -m commit-15 baz | |
104 | abort: baz: file not tracked! |
|
104 | abort: baz: file not tracked! | |
105 |
[ |
|
105 | [10] | |
106 | $ rm baz |
|
106 | $ rm baz | |
107 | #endif |
|
107 | #endif | |
108 |
|
108 | |||
109 | $ touch quux |
|
109 | $ touch quux | |
110 | $ hg commit -m commit-16 quux |
|
110 | $ hg commit -m commit-16 quux | |
111 | abort: quux: file not tracked! |
|
111 | abort: quux: file not tracked! | |
112 |
[ |
|
112 | [10] | |
113 | $ echo >> dir/file |
|
113 | $ echo >> dir/file | |
114 | $ hg -v commit -m commit-17 dir/file |
|
114 | $ hg -v commit -m commit-17 dir/file | |
115 | committing files: |
|
115 | committing files: |
@@ -412,7 +412,7 b' Committing directories containing only l' | |||||
412 | $ hg revert --quiet z |
|
412 | $ hg revert --quiet z | |
413 | $ hg commit -m "Empty subdir" z |
|
413 | $ hg commit -m "Empty subdir" z | |
414 | abort: z: no match under directory! |
|
414 | abort: z: no match under directory! | |
415 |
[ |
|
415 | [10] | |
416 | $ rm -rf z |
|
416 | $ rm -rf z | |
417 | $ hg ci -m "standin" .hglf |
|
417 | $ hg ci -m "standin" .hglf | |
418 | abort: file ".hglf" is a largefile standin |
|
418 | abort: file ".hglf" is a largefile standin |
@@ -198,7 +198,7 b' commit and update back' | |||||
198 | $ ln -s nothing dangling |
|
198 | $ ln -s nothing dangling | |
199 | $ hg commit -m 'commit symlink without adding' dangling |
|
199 | $ hg commit -m 'commit symlink without adding' dangling | |
200 | abort: dangling: file not tracked! |
|
200 | abort: dangling: file not tracked! | |
201 |
[ |
|
201 | [10] | |
202 | $ hg add dangling |
|
202 | $ hg add dangling | |
203 | $ hg commit -m 'add symlink' |
|
203 | $ hg commit -m 'add symlink' | |
204 |
|
204 |
General Comments 0
You need to be logged in to leave comments.
Login now