Show More
@@ -227,7 +227,7 b' def sign(ui, repo, *revs, **opts):' | |||||
227 | data = node2txt(repo, n, sigver) |
|
227 | data = node2txt(repo, n, sigver) | |
228 | sig = mygpg.sign(data) |
|
228 | sig = mygpg.sign(data) | |
229 | if not sig: |
|
229 | if not sig: | |
230 |
raise util. |
|
230 | raise util.abort(_("error while signing")) | |
231 | sig = binascii.b2a_base64(sig) |
|
231 | sig = binascii.b2a_base64(sig) | |
232 | sig = sig.replace("\n", "") |
|
232 | sig = sig.replace("\n", "") | |
233 | sigmessage += "%s %s %s\n" % (hexnode, sigver, sig) |
|
233 | sigmessage += "%s %s %s\n" % (hexnode, sigver, sig) |
@@ -2083,7 +2083,7 b' def fold(ui, repo, *files, **opts):' | |||||
2083 | if not files: |
|
2083 | if not files: | |
2084 | raise util.Abort(_('qfold requires at least one patch name')) |
|
2084 | raise util.Abort(_('qfold requires at least one patch name')) | |
2085 | if not q.check_toppatch(repo)[0]: |
|
2085 | if not q.check_toppatch(repo)[0]: | |
2086 |
raise util.Abort(_(' |
|
2086 | raise util.Abort(_('no patches applied')) | |
2087 | q.check_localchanges(repo) |
|
2087 | q.check_localchanges(repo) | |
2088 |
|
2088 | |||
2089 | message = cmdutil.logmessage(opts) |
|
2089 | message = cmdutil.logmessage(opts) | |
@@ -2110,7 +2110,7 b' def fold(ui, repo, *files, **opts):' | |||||
2110 | pf = q.join(p) |
|
2110 | pf = q.join(p) | |
2111 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
2111 | (patchsuccess, files, fuzz) = q.patch(repo, pf) | |
2112 | if not patchsuccess: |
|
2112 | if not patchsuccess: | |
2113 |
raise util.Abort(_(' |
|
2113 | raise util.Abort(_('error folding patch %s') % p) | |
2114 | patch.updatedir(ui, repo, files) |
|
2114 | patch.updatedir(ui, repo, files) | |
2115 |
|
2115 | |||
2116 | if not message: |
|
2116 | if not message: | |
@@ -2799,7 +2799,7 b' def mqinit(orig, ui, *args, **kwargs):' | |||||
2799 | else: |
|
2799 | else: | |
2800 | repopath = cmdutil.findrepo(os.getcwd()) |
|
2800 | repopath = cmdutil.findrepo(os.getcwd()) | |
2801 | if not repopath: |
|
2801 | if not repopath: | |
2802 |
raise util.Abort(_(' |
|
2802 | raise util.Abort(_('there is no Mercurial repository here ' | |
2803 | '(.hg not found)')) |
|
2803 | '(.hg not found)')) | |
2804 | repo = hg.repository(ui, repopath) |
|
2804 | repo = hg.repository(ui, repopath) | |
2805 | return qinit(ui, repo, True) |
|
2805 | return qinit(ui, repo, True) |
@@ -234,7 +234,7 b' class transplanter(object):' | |||||
234 | p2 = node |
|
234 | p2 = node | |
235 | self.log(user, date, message, p1, p2, merge=merge) |
|
235 | self.log(user, date, message, p1, p2, merge=merge) | |
236 | self.ui.write(str(inst) + '\n') |
|
236 | self.ui.write(str(inst) + '\n') | |
237 |
raise util.Abort(_(' |
|
237 | raise util.Abort(_('fix up the merge and run ' | |
238 | 'hg transplant --continue')) |
|
238 | 'hg transplant --continue')) | |
239 | else: |
|
239 | else: | |
240 | files = None |
|
240 | files = None |
@@ -846,7 +846,7 b' def debugancestor(ui, repo, *args):' | |||||
846 | lookup = r.lookup |
|
846 | lookup = r.lookup | |
847 | elif len(args) == 2: |
|
847 | elif len(args) == 2: | |
848 | if not repo: |
|
848 | if not repo: | |
849 |
raise util.Abort(_(" |
|
849 | raise util.Abort(_("there is no Mercurial repository here " | |
850 | "(.hg not found)")) |
|
850 | "(.hg not found)")) | |
851 | rev1, rev2 = args |
|
851 | rev1, rev2 = args | |
852 | r = repo.changelog |
|
852 | r = repo.changelog | |
@@ -2105,7 +2105,7 b' def identify(ui, repo, source=None,' | |||||
2105 | """ |
|
2105 | """ | |
2106 |
|
2106 | |||
2107 | if not repo and not source: |
|
2107 | if not repo and not source: | |
2108 |
raise util.Abort(_(" |
|
2108 | raise util.Abort(_("there is no Mercurial repository here " | |
2109 | "(.hg not found)")) |
|
2109 | "(.hg not found)")) | |
2110 |
|
2110 | |||
2111 | hexfunc = ui.debugflag and hex or short |
|
2111 | hexfunc = ui.debugflag and hex or short |
@@ -198,7 +198,7 b' class changectx(object):' | |||||
198 | if match(fn): |
|
198 | if match(fn): | |
199 | yield fn |
|
199 | yield fn | |
200 | for fn in sorted(fset): |
|
200 | for fn in sorted(fset): | |
201 |
if match.bad(fn, _(' |
|
201 | if match.bad(fn, _('no such file in rev %s') % self) and match(fn): | |
202 | yield fn |
|
202 | yield fn | |
203 |
|
203 | |||
204 | def sub(self, path): |
|
204 | def sub(self, path): |
@@ -424,9 +424,9 b' def _dispatch(ui, args):' | |||||
424 | cmd, func, args, options, cmdoptions = _parse(lui, args) |
|
424 | cmd, func, args, options, cmdoptions = _parse(lui, args) | |
425 |
|
425 | |||
426 | if options["config"]: |
|
426 | if options["config"]: | |
427 |
raise util.Abort(_(" |
|
427 | raise util.Abort(_("option --config may not be abbreviated!")) | |
428 | if options["cwd"]: |
|
428 | if options["cwd"]: | |
429 |
raise util.Abort(_(" |
|
429 | raise util.Abort(_("option --cwd may not be abbreviated!")) | |
430 | if options["repository"]: |
|
430 | if options["repository"]: | |
431 | raise util.Abort(_( |
|
431 | raise util.Abort(_( | |
432 | "Option -R has to be separated from other options (e.g. not -qR) " |
|
432 | "Option -R has to be separated from other options (e.g. not -qR) " |
@@ -63,7 +63,7 b' def bisect(changelog, state):' | |||||
63 | if not ancestors: # now we're confused |
|
63 | if not ancestors: # now we're confused | |
64 | if len(state['bad']) == 1 and len(state['good']) == 1: |
|
64 | if len(state['bad']) == 1 and len(state['good']) == 1: | |
65 | raise util.Abort(_("starting revisions are not directly related")) |
|
65 | raise util.Abort(_("starting revisions are not directly related")) | |
66 |
raise util.Abort(_(" |
|
66 | raise util.Abort(_("inconsistent state, %s:%s is good and bad") | |
67 | % (badrev, short(bad))) |
|
67 | % (badrev, short(bad))) | |
68 |
|
68 | |||
69 | # build children dict |
|
69 | # build children dict |
@@ -1199,7 +1199,7 b' class localrepository(repo.repository):' | |||||
1199 | cg = remote.changegroup(fetch, 'pull') |
|
1199 | cg = remote.changegroup(fetch, 'pull') | |
1200 | else: |
|
1200 | else: | |
1201 | if not remote.capable('changegroupsubset'): |
|
1201 | if not remote.capable('changegroupsubset'): | |
1202 |
raise util.Abort(_(" |
|
1202 | raise util.Abort(_("partial pull cannot be done because " | |
1203 | "other repository doesn't support " |
|
1203 | "other repository doesn't support " | |
1204 | "changegroupsubset.")) |
|
1204 | "changegroupsubset.")) | |
1205 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
|
1205 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
@@ -1284,7 +1284,7 b' def internalpatch(patchobj, ui, strip, c' | |||||
1284 | if eolmode is None: |
|
1284 | if eolmode is None: | |
1285 | eolmode = ui.config('patch', 'eol', 'strict') |
|
1285 | eolmode = ui.config('patch', 'eol', 'strict') | |
1286 | if eolmode.lower() not in eolmodes: |
|
1286 | if eolmode.lower() not in eolmodes: | |
1287 |
raise util.Abort(_(' |
|
1287 | raise util.Abort(_('unsupported line endings type: %s') % eolmode) | |
1288 | eolmode = eolmode.lower() |
|
1288 | eolmode = eolmode.lower() | |
1289 |
|
1289 | |||
1290 | try: |
|
1290 | try: |
@@ -4,5 +4,5 b' 0' | |||||
4 | 0 |
|
4 | 0 | |
5 | 0 |
|
5 | 0 | |
6 | 0 |
|
6 | 0 | |
7 |
a: |
|
7 | a: no such file in rev 03f6b0774996 | |
8 | 1 |
|
8 | 1 |
@@ -32,6 +32,6 b' options:' | |||||
32 | use "hg -v help cat" to show global options |
|
32 | use "hg -v help cat" to show global options | |
33 | % [defaults] |
|
33 | % [defaults] | |
34 | a |
|
34 | a | |
35 |
a: |
|
35 | a: no such file in rev 000000000000 | |
36 | % no repo |
|
36 | % no repo | |
37 | abort: There is no Mercurial repository here (.hg not found)! |
|
37 | abort: There is no Mercurial repository here (.hg not found)! |
@@ -56,8 +56,8 b' summary: a' | |||||
56 | %% earlygetopt short option without following space |
|
56 | %% earlygetopt short option without following space | |
57 | 0:b6c483daf290 |
|
57 | 0:b6c483daf290 | |
58 | %% earlygetopt with illegal abbreviations |
|
58 | %% earlygetopt with illegal abbreviations | |
59 |
abort: |
|
59 | abort: option --config may not be abbreviated! | |
60 |
abort: |
|
60 | abort: option --cwd may not be abbreviated! | |
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! | |
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
@@ -1,5 +1,5 b'' | |||||
1 | % no repo |
|
1 | % no repo | |
2 |
abort: |
|
2 | abort: there is no Mercurial repository here (.hg not found) | |
3 | % create repo |
|
3 | % create repo | |
4 | adding a |
|
4 | adding a | |
5 | % basic id usage |
|
5 | % basic id usage |
@@ -2,7 +2,7 b' adding .hgignore' | |||||
2 | adding a |
|
2 | adding a | |
3 | % invalid eol |
|
3 | % invalid eol | |
4 | applying eol.diff |
|
4 | applying eol.diff | |
5 |
abort: |
|
5 | abort: unsupported line endings type: LFCR | |
6 | % force LF |
|
6 | % force LF | |
7 | applying eol.diff |
|
7 | applying eol.diff | |
8 | 'a\nyyyy\ncc\n\nd\ne' |
|
8 | 'a\nyyyy\ncc\n\nd\ne' |
@@ -99,7 +99,7 b' B' | |||||
99 | [0;32;1mA B[0m |
|
99 | [0;32;1mA B[0m | |
100 | [0;32;1mA series[0m |
|
100 | [0;32;1mA series[0m | |
101 | % init --mq without repo |
|
101 | % init --mq without repo | |
102 |
abort: |
|
102 | abort: there is no Mercurial repository here (.hg not found) | |
103 | % init --mq with repo path |
|
103 | % init --mq with repo path | |
104 | ok |
|
104 | ok | |
105 | % init --mq with nonexistent directory |
|
105 | % init --mq with nonexistent directory |
@@ -37,7 +37,7 b' no changes needed to a' | |||||
37 | %% should say file not managed |
|
37 | %% should say file not managed | |
38 | file not managed: q |
|
38 | file not managed: q | |
39 | %% should say file not found |
|
39 | %% should say file not found | |
40 |
notfound: |
|
40 | notfound: no such file in rev 095eacd0c0d7 | |
41 | A z |
|
41 | A z | |
42 | ? e.orig |
|
42 | ? e.orig | |
43 | %% should add a, remove d, forget z |
|
43 | %% should add a, remove d, forget z |
@@ -112,14 +112,14 b' patching file foo' | |||||
112 | Hunk #1 FAILED at 0 |
|
112 | Hunk #1 FAILED at 0 | |
113 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
|
113 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej | |
114 | patch failed to apply |
|
114 | patch failed to apply | |
115 |
abort: |
|
115 | abort: fix up the merge and run hg transplant --continue | |
116 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
116 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
117 | applying a1e30dd1b8e7 |
|
117 | applying a1e30dd1b8e7 | |
118 | patching file foo |
|
118 | patching file foo | |
119 | Hunk #1 FAILED at 0 |
|
119 | Hunk #1 FAILED at 0 | |
120 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
|
120 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej | |
121 | patch failed to apply |
|
121 | patch failed to apply | |
122 |
abort: |
|
122 | abort: fix up the merge and run hg transplant --continue | |
123 | a1e30dd1b8e7 transplanted as f1563cf27039 |
|
123 | a1e30dd1b8e7 transplanted as f1563cf27039 | |
124 | skipping already applied revision 1:a1e30dd1b8e7 |
|
124 | skipping already applied revision 1:a1e30dd1b8e7 | |
125 | applying 1739ac5f6139 |
|
125 | applying 1739ac5f6139 | |
@@ -166,7 +166,7 b' adding test-filter' | |||||
166 | created new head |
|
166 | created new head | |
167 | file b1 already exists |
|
167 | file b1 already exists | |
168 | 1 out of 1 hunks FAILED -- saving rejects to file b1.rej |
|
168 | 1 out of 1 hunks FAILED -- saving rejects to file b1.rej | |
169 |
abort: |
|
169 | abort: fix up the merge and run hg transplant --continue | |
170 | filtering |
|
170 | filtering | |
171 | applying 348b36d0b6a5 |
|
171 | applying 348b36d0b6a5 | |
172 | patch failed to apply |
|
172 | patch failed to apply |
General Comments 0
You need to be logged in to leave comments.
Login now