Show More
@@ -129,8 +129,14 b' def churn(ui, repo, *pats, **opts):' | |||
|
129 | 129 | aliases = repo.wjoin('.hgchurn') |
|
130 | 130 | if aliases: |
|
131 | 131 | for l in open(aliases, "r"): |
|
132 | try: | |
|
132 | 133 | alias, actual = l.split('=' in l and '=' or None, 1) |
|
133 | 134 | amap[alias.strip()] = actual.strip() |
|
135 | except ValueError: | |
|
136 | l = l.strip() | |
|
137 | if l: | |
|
138 | ui.warn(_("skipping malformed alias: %s\n" % l)) | |
|
139 | continue | |
|
134 | 140 | |
|
135 | 141 | rate = countrate(ui, repo, amap, *pats, **opts).items() |
|
136 | 142 | if not rate: |
@@ -227,7 +227,7 b' def sign(ui, repo, *revs, **opts):' | |||
|
227 | 227 | data = node2txt(repo, n, sigver) |
|
228 | 228 | sig = mygpg.sign(data) |
|
229 | 229 | if not sig: |
|
230 |
raise util. |
|
|
230 | raise util.abort(_("error while signing")) | |
|
231 | 231 | sig = binascii.b2a_base64(sig) |
|
232 | 232 | sig = sig.replace("\n", "") |
|
233 | 233 | sigmessage += "%s %s %s\n" % (hexnode, sigver, sig) |
@@ -2106,7 +2106,7 b' def fold(ui, repo, *files, **opts):' | |||
|
2106 | 2106 | if not files: |
|
2107 | 2107 | raise util.Abort(_('qfold requires at least one patch name')) |
|
2108 | 2108 | if not q.check_toppatch(repo)[0]: |
|
2109 |
raise util.Abort(_(' |
|
|
2109 | raise util.Abort(_('no patches applied')) | |
|
2110 | 2110 | q.check_localchanges(repo) |
|
2111 | 2111 | |
|
2112 | 2112 | message = cmdutil.logmessage(opts) |
@@ -2133,7 +2133,7 b' def fold(ui, repo, *files, **opts):' | |||
|
2133 | 2133 | pf = q.join(p) |
|
2134 | 2134 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
2135 | 2135 | if not patchsuccess: |
|
2136 |
raise util.Abort(_(' |
|
|
2136 | raise util.Abort(_('error folding patch %s') % p) | |
|
2137 | 2137 | patch.updatedir(ui, repo, files) |
|
2138 | 2138 | |
|
2139 | 2139 | if not message: |
@@ -2883,7 +2883,7 b' def mqinit(orig, ui, *args, **kwargs):' | |||
|
2883 | 2883 | else: |
|
2884 | 2884 | repopath = cmdutil.findrepo(os.getcwd()) |
|
2885 | 2885 | if not repopath: |
|
2886 |
raise util.Abort(_(' |
|
|
2886 | raise util.Abort(_('there is no Mercurial repository here ' | |
|
2887 | 2887 | '(.hg not found)')) |
|
2888 | 2888 | repo = hg.repository(ui, repopath) |
|
2889 | 2889 | return qinit(ui, repo, True) |
@@ -234,7 +234,7 b' class transplanter(object):' | |||
|
234 | 234 | p2 = node |
|
235 | 235 | self.log(user, date, message, p1, p2, merge=merge) |
|
236 | 236 | self.ui.write(str(inst) + '\n') |
|
237 |
raise util.Abort(_(' |
|
|
237 | raise util.Abort(_('fix up the merge and run ' | |
|
238 | 238 | 'hg transplant --continue')) |
|
239 | 239 | else: |
|
240 | 240 | files = None |
@@ -839,7 +839,7 b' def debugancestor(ui, repo, *args):' | |||
|
839 | 839 | lookup = r.lookup |
|
840 | 840 | elif len(args) == 2: |
|
841 | 841 | if not repo: |
|
842 |
raise util.Abort(_(" |
|
|
842 | raise util.Abort(_("there is no Mercurial repository here " | |
|
843 | 843 | "(.hg not found)")) |
|
844 | 844 | rev1, rev2 = args |
|
845 | 845 | r = repo.changelog |
@@ -2102,7 +2102,7 b' def identify(ui, repo, source=None,' | |||
|
2102 | 2102 | """ |
|
2103 | 2103 | |
|
2104 | 2104 | if not repo and not source: |
|
2105 |
raise util.Abort(_(" |
|
|
2105 | raise util.Abort(_("there is no Mercurial repository here " | |
|
2106 | 2106 | "(.hg not found)")) |
|
2107 | 2107 | |
|
2108 | 2108 | hexfunc = ui.debugflag and hex or short |
@@ -198,7 +198,7 b' class changectx(object):' | |||
|
198 | 198 | if match(fn): |
|
199 | 199 | yield fn |
|
200 | 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 | 202 | yield fn |
|
203 | 203 | |
|
204 | 204 | def sub(self, path): |
@@ -463,9 +463,9 b' def _dispatch(ui, args):' | |||
|
463 | 463 | cmd, func, args, options, cmdoptions = _parse(lui, args) |
|
464 | 464 | |
|
465 | 465 | if options["config"]: |
|
466 |
raise util.Abort(_(" |
|
|
466 | raise util.Abort(_("option --config may not be abbreviated!")) | |
|
467 | 467 | if options["cwd"]: |
|
468 |
raise util.Abort(_(" |
|
|
468 | raise util.Abort(_("option --cwd may not be abbreviated!")) | |
|
469 | 469 | if options["repository"]: |
|
470 | 470 | raise util.Abort(_( |
|
471 | 471 | "Option -R has to be separated from other options (e.g. not -qR) " |
@@ -63,7 +63,7 b' def bisect(changelog, state):' | |||
|
63 | 63 | if not ancestors: # now we're confused |
|
64 | 64 | if len(state['bad']) == 1 and len(state['good']) == 1: |
|
65 | 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 | 67 | % (badrev, short(bad))) |
|
68 | 68 | |
|
69 | 69 | # build children dict |
@@ -1205,7 +1205,7 b' class localrepository(repo.repository):' | |||
|
1205 | 1205 | cg = remote.changegroup(fetch, 'pull') |
|
1206 | 1206 | else: |
|
1207 | 1207 | if not remote.capable('changegroupsubset'): |
|
1208 |
raise util.Abort(_(" |
|
|
1208 | raise util.Abort(_("partial pull cannot be done because " | |
|
1209 | 1209 | "other repository doesn't support " |
|
1210 | 1210 | "changegroupsubset.")) |
|
1211 | 1211 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
@@ -1284,7 +1284,7 b' def internalpatch(patchobj, ui, strip, c' | |||
|
1284 | 1284 | if eolmode is None: |
|
1285 | 1285 | eolmode = ui.config('patch', 'eol', 'strict') |
|
1286 | 1286 | if eolmode.lower() not in eolmodes: |
|
1287 |
raise util.Abort(_(' |
|
|
1287 | raise util.Abort(_('unsupported line endings type: %s') % eolmode) | |
|
1288 | 1288 | eolmode = eolmode.lower() |
|
1289 | 1289 | |
|
1290 | 1290 | try: |
@@ -19,6 +19,6 b'' | |||
|
19 | 19 | $ hg cat -r 0 b |
|
20 | 20 | 0 |
|
21 | 21 | $ hg cat -r 1 a |
|
22 |
a: |
|
|
22 | a: no such file in rev 03f6b0774996 | |
|
23 | 23 | $ hg cat -r 1 b |
|
24 | 24 | 1 |
@@ -38,7 +38,9 b' cd ..' | |||
|
38 | 38 | echo % churn with aliases |
|
39 | 39 | cat > ../aliases <<EOF |
|
40 | 40 | user1 alias1 |
|
41 | ||
|
41 | 42 | user3 alias3 |
|
43 | not-an-alias | |
|
42 | 44 | EOF |
|
43 | 45 | hg churn --aliases ../aliases |
|
44 | 46 | echo % churn with .hgchurn |
@@ -16,10 +16,12 b' user1 2 ***************************' | |||
|
16 | 16 | user2 2 *************************************************************** |
|
17 | 17 | user1 1 ******************************** |
|
18 | 18 | % churn with aliases |
|
19 | skipping malformed alias: not-an-alias | |
|
19 | 20 | alias3 3 ************************************************************** |
|
20 | 21 | alias1 3 ************************************************************** |
|
21 | 22 | user2 2 ***************************************** |
|
22 | 23 | % churn with .hgchurn |
|
24 | skipping malformed alias: not-an-alias | |
|
23 | 25 | alias3 3 ************************************************************** |
|
24 | 26 | alias1 3 ************************************************************** |
|
25 | 27 | user2 2 ***************************************** |
@@ -32,6 +32,6 b' options:' | |||
|
32 | 32 | use "hg -v help cat" to show global options |
|
33 | 33 | % [defaults] |
|
34 | 34 | a |
|
35 |
a: |
|
|
35 | a: no such file in rev 000000000000 | |
|
36 | 36 | % no repo |
|
37 | 37 | abort: There is no Mercurial repository here (.hg not found)! |
@@ -56,8 +56,8 b' summary: a' | |||
|
56 | 56 | %% earlygetopt short option without following space |
|
57 | 57 | 0:b6c483daf290 |
|
58 | 58 | %% earlygetopt with illegal abbreviations |
|
59 |
abort: |
|
|
60 |
abort: |
|
|
59 | abort: option --config may not be abbreviated! | |
|
60 | abort: option --cwd may not be abbreviated! | |
|
61 | 61 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
62 | 62 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
|
63 | 63 | abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo! |
@@ -3,7 +3,7 b'' | |||
|
3 | 3 | no repo |
|
4 | 4 | |
|
5 | 5 | $ hg id |
|
6 |
abort: |
|
|
6 | abort: there is no Mercurial repository here (.hg not found) | |
|
7 | 7 | |
|
8 | 8 | create repo |
|
9 | 9 |
@@ -36,7 +36,7 b' invalid eol' | |||
|
36 | 36 | |
|
37 | 37 | $ hg --config patch.eol='LFCR' import eol.diff |
|
38 | 38 | applying eol.diff |
|
39 |
abort: |
|
|
39 | abort: unsupported line endings type: LFCR | |
|
40 | 40 | $ hg revert -a |
|
41 | 41 | |
|
42 | 42 |
@@ -195,7 +195,7 b' init --mq without repo' | |||
|
195 | 195 | $ mkdir f |
|
196 | 196 | $ cd f |
|
197 | 197 | $ hg init --mq |
|
198 |
abort: |
|
|
198 | abort: there is no Mercurial repository here (.hg not found) | |
|
199 | 199 | $ cd .. |
|
200 | 200 | |
|
201 | 201 | init --mq with repo path |
@@ -37,7 +37,7 b' no changes needed to a' | |||
|
37 | 37 | %% should say file not managed |
|
38 | 38 | file not managed: q |
|
39 | 39 | %% should say file not found |
|
40 |
notfound: |
|
|
40 | notfound: no such file in rev 095eacd0c0d7 | |
|
41 | 41 | A z |
|
42 | 42 | ? e.orig |
|
43 | 43 | %% should add a, remove d, forget z |
@@ -206,7 +206,7 b' transplant --continue' | |||
|
206 | 206 | Hunk #1 FAILED at 0 |
|
207 | 207 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
|
208 | 208 | patch failed to apply |
|
209 |
abort: |
|
|
209 | abort: fix up the merge and run hg transplant --continue | |
|
210 | 210 | |
|
211 | 211 | transplant -c shouldn't use an old changeset |
|
212 | 212 | |
@@ -219,7 +219,7 b" transplant -c shouldn't use an old chang" | |||
|
219 | 219 | Hunk #1 FAILED at 0 |
|
220 | 220 | 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
|
221 | 221 | patch failed to apply |
|
222 |
abort: |
|
|
222 | abort: fix up the merge and run hg transplant --continue | |
|
223 | 223 | $ hg transplant --continue |
|
224 | 224 | a1e30dd1b8e7 transplanted as f1563cf27039 |
|
225 | 225 | $ hg transplant 1:3 |
@@ -319,7 +319,7 b' test filter with failed patch' | |||
|
319 | 319 | file b1 already exists |
|
320 | 320 | 1 out of 1 hunks FAILED -- saving rejects to file b1.rej |
|
321 | 321 | patch failed to apply |
|
322 |
abort: |
|
|
322 | abort: fix up the merge and run hg transplant --continue | |
|
323 | 323 | $ cd .. |
|
324 | 324 | |
|
325 | 325 |
General Comments 0
You need to be logged in to leave comments.
Login now