--- a/hgext/gpg.py Thu Aug 26 23:11:03 2010 +0200
+++ b/hgext/gpg.py Sun Aug 29 22:37:58 2010 +0200
@@ -227,7 +227,7 @@
data = node2txt(repo, n, sigver)
sig = mygpg.sign(data)
if not sig:
- raise util.Abort(_("Error while signing"))
+ raise util.abort(_("error while signing"))
sig = binascii.b2a_base64(sig)
sig = sig.replace("\n", "")
sigmessage += "%s %s %s\n" % (hexnode, sigver, sig)
--- a/hgext/mq.py Thu Aug 26 23:11:03 2010 +0200
+++ b/hgext/mq.py Sun Aug 29 22:37:58 2010 +0200
@@ -2083,7 +2083,7 @@
if not files:
raise util.Abort(_('qfold requires at least one patch name'))
if not q.check_toppatch(repo)[0]:
- raise util.Abort(_('No patches applied'))
+ raise util.Abort(_('no patches applied'))
q.check_localchanges(repo)
message = cmdutil.logmessage(opts)
@@ -2110,7 +2110,7 @@
pf = q.join(p)
(patchsuccess, files, fuzz) = q.patch(repo, pf)
if not patchsuccess:
- raise util.Abort(_('Error folding patch %s') % p)
+ raise util.Abort(_('error folding patch %s') % p)
patch.updatedir(ui, repo, files)
if not message:
@@ -2799,7 +2799,7 @@
else:
repopath = cmdutil.findrepo(os.getcwd())
if not repopath:
- raise util.Abort(_('There is no Mercurial repository here '
+ raise util.Abort(_('there is no Mercurial repository here '
'(.hg not found)'))
repo = hg.repository(ui, repopath)
return qinit(ui, repo, True)
--- a/hgext/transplant.py Thu Aug 26 23:11:03 2010 +0200
+++ b/hgext/transplant.py Sun Aug 29 22:37:58 2010 +0200
@@ -234,7 +234,7 @@
p2 = node
self.log(user, date, message, p1, p2, merge=merge)
self.ui.write(str(inst) + '\n')
- raise util.Abort(_('Fix up the merge and run '
+ raise util.Abort(_('fix up the merge and run '
'hg transplant --continue'))
else:
files = None
--- a/mercurial/commands.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/commands.py Sun Aug 29 22:37:58 2010 +0200
@@ -846,7 +846,7 @@
lookup = r.lookup
elif len(args) == 2:
if not repo:
- raise util.Abort(_("There is no Mercurial repository here "
+ raise util.Abort(_("there is no Mercurial repository here "
"(.hg not found)"))
rev1, rev2 = args
r = repo.changelog
@@ -2105,7 +2105,7 @@
"""
if not repo and not source:
- raise util.Abort(_("There is no Mercurial repository here "
+ raise util.Abort(_("there is no Mercurial repository here "
"(.hg not found)"))
hexfunc = ui.debugflag and hex or short
--- a/mercurial/context.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/context.py Sun Aug 29 22:37:58 2010 +0200
@@ -198,7 +198,7 @@
if match(fn):
yield fn
for fn in sorted(fset):
- if match.bad(fn, _('No such file in rev %s') % self) and match(fn):
+ if match.bad(fn, _('no such file in rev %s') % self) and match(fn):
yield fn
def sub(self, path):
--- a/mercurial/dispatch.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/dispatch.py Sun Aug 29 22:37:58 2010 +0200
@@ -424,9 +424,9 @@
cmd, func, args, options, cmdoptions = _parse(lui, args)
if options["config"]:
- raise util.Abort(_("Option --config may not be abbreviated!"))
+ raise util.Abort(_("option --config may not be abbreviated!"))
if options["cwd"]:
- raise util.Abort(_("Option --cwd may not be abbreviated!"))
+ raise util.Abort(_("option --cwd may not be abbreviated!"))
if options["repository"]:
raise util.Abort(_(
"Option -R has to be separated from other options (e.g. not -qR) "
--- a/mercurial/hbisect.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/hbisect.py Sun Aug 29 22:37:58 2010 +0200
@@ -63,7 +63,7 @@
if not ancestors: # now we're confused
if len(state['bad']) == 1 and len(state['good']) == 1:
raise util.Abort(_("starting revisions are not directly related"))
- raise util.Abort(_("Inconsistent state, %s:%s is good and bad")
+ raise util.Abort(_("inconsistent state, %s:%s is good and bad")
% (badrev, short(bad)))
# build children dict
--- a/mercurial/localrepo.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/localrepo.py Sun Aug 29 22:37:58 2010 +0200
@@ -1199,7 +1199,7 @@
cg = remote.changegroup(fetch, 'pull')
else:
if not remote.capable('changegroupsubset'):
- raise util.Abort(_("Partial pull cannot be done because "
+ raise util.Abort(_("partial pull cannot be done because "
"other repository doesn't support "
"changegroupsubset."))
cg = remote.changegroupsubset(fetch, heads, 'pull')
--- a/mercurial/patch.py Thu Aug 26 23:11:03 2010 +0200
+++ b/mercurial/patch.py Sun Aug 29 22:37:58 2010 +0200
@@ -1284,7 +1284,7 @@
if eolmode is None:
eolmode = ui.config('patch', 'eol', 'strict')
if eolmode.lower() not in eolmodes:
- raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
+ raise util.Abort(_('unsupported line endings type: %s') % eolmode)
eolmode = eolmode.lower()
try:
--- a/tests/test-cat.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-cat.out Sun Aug 29 22:37:58 2010 +0200
@@ -4,5 +4,5 @@
0
0
0
-a: No such file in rev 03f6b0774996
+a: no such file in rev 03f6b0774996
1
--- a/tests/test-dispatch.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-dispatch.out Sun Aug 29 22:37:58 2010 +0200
@@ -32,6 +32,6 @@
use "hg -v help cat" to show global options
% [defaults]
a
-a: No such file in rev 000000000000
+a: no such file in rev 000000000000
% no repo
abort: There is no Mercurial repository here (.hg not found)!
--- a/tests/test-globalopts.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-globalopts.out Sun Aug 29 22:37:58 2010 +0200
@@ -56,8 +56,8 @@
%% earlygetopt short option without following space
0:b6c483daf290
%% earlygetopt with illegal abbreviations
-abort: Option --config may not be abbreviated!
-abort: Option --cwd may not be abbreviated!
+abort: option --config may not be abbreviated!
+abort: option --cwd may not be abbreviated!
abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
--- a/tests/test-identify.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-identify.out Sun Aug 29 22:37:58 2010 +0200
@@ -1,5 +1,5 @@
% no repo
-abort: There is no Mercurial repository here (.hg not found)
+abort: there is no Mercurial repository here (.hg not found)
% create repo
adding a
% basic id usage
--- a/tests/test-import-eol.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-import-eol.out Sun Aug 29 22:37:58 2010 +0200
@@ -2,7 +2,7 @@
adding a
% invalid eol
applying eol.diff
-abort: Unsupported line endings type: LFCR
+abort: unsupported line endings type: LFCR
% force LF
applying eol.diff
'a\nyyyy\ncc\n\nd\ne'
--- a/tests/test-mq.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-mq.out Sun Aug 29 22:37:58 2010 +0200
@@ -99,7 +99,7 @@
[0;32;1mA B[0m
[0;32;1mA series[0m
% init --mq without repo
-abort: There is no Mercurial repository here (.hg not found)
+abort: there is no Mercurial repository here (.hg not found)
% init --mq with repo path
ok
% init --mq with nonexistent directory
--- a/tests/test-revert.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-revert.out Sun Aug 29 22:37:58 2010 +0200
@@ -37,7 +37,7 @@
%% should say file not managed
file not managed: q
%% should say file not found
-notfound: No such file in rev 095eacd0c0d7
+notfound: no such file in rev 095eacd0c0d7
A z
? e.orig
%% should add a, remove d, forget z
--- a/tests/test-transplant.out Thu Aug 26 23:11:03 2010 +0200
+++ b/tests/test-transplant.out Sun Aug 29 22:37:58 2010 +0200
@@ -112,14 +112,14 @@
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed to apply
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying a1e30dd1b8e7
patching file foo
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file foo.rej
patch failed to apply
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
a1e30dd1b8e7 transplanted as f1563cf27039
skipping already applied revision 1:a1e30dd1b8e7
applying 1739ac5f6139
@@ -166,7 +166,7 @@
created new head
file b1 already exists
1 out of 1 hunks FAILED -- saving rejects to file b1.rej
-abort: Fix up the merge and run hg transplant --continue
+abort: fix up the merge and run hg transplant --continue
filtering
applying 348b36d0b6a5
patch failed to apply