Mercurial > hg-stable
changeset 12070:fddacca3202e
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 29 Aug 2010 22:55:37 +0200 |
| parents | d01e28657429 (current diff) 7c3c44413bc1 (diff) |
| children | 45ff6dcf82ea |
| files | hgext/churn.py hgext/mq.py mercurial/commands.py mercurial/context.py mercurial/dispatch.py mercurial/localrepo.py mercurial/patch.py tests/test-cat.t tests/test-identify.t tests/test-import-eol.t tests/test-mq.t tests/test-transplant.t |
| diffstat | 20 files changed, 36 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/churn.py Sat Aug 28 23:57:39 2010 +0200 +++ b/hgext/churn.py Sun Aug 29 22:55:37 2010 +0200 @@ -129,8 +129,14 @@ aliases = repo.wjoin('.hgchurn') if aliases: for l in open(aliases, "r"): - alias, actual = l.split('=' in l and '=' or None, 1) - amap[alias.strip()] = actual.strip() + try: + alias, actual = l.split('=' in l and '=' or None, 1) + amap[alias.strip()] = actual.strip() + except ValueError: + l = l.strip() + if l: + ui.warn(_("skipping malformed alias: %s\n" % l)) + continue rate = countrate(ui, repo, amap, *pats, **opts).items() if not rate:
--- a/hgext/gpg.py Sat Aug 28 23:57:39 2010 +0200 +++ b/hgext/gpg.py Sun Aug 29 22:55:37 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 Sat Aug 28 23:57:39 2010 +0200 +++ b/hgext/mq.py Sun Aug 29 22:55:37 2010 +0200 @@ -2106,7 +2106,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) @@ -2133,7 +2133,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: @@ -2883,7 +2883,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 Sat Aug 28 23:57:39 2010 +0200 +++ b/hgext/transplant.py Sun Aug 29 22:55:37 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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/commands.py Sun Aug 29 22:55:37 2010 +0200 @@ -839,7 +839,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 @@ -2102,7 +2102,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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/context.py Sun Aug 29 22:55:37 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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/dispatch.py Sun Aug 29 22:55:37 2010 +0200 @@ -463,9 +463,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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/hbisect.py Sun Aug 29 22:55:37 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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/localrepo.py Sun Aug 29 22:55:37 2010 +0200 @@ -1205,7 +1205,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 Sat Aug 28 23:57:39 2010 +0200 +++ b/mercurial/patch.py Sun Aug 29 22:55:37 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.t Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-cat.t Sun Aug 29 22:55:37 2010 +0200 @@ -19,6 +19,6 @@ $ hg cat -r 0 b 0 $ hg cat -r 1 a - a: No such file in rev 03f6b0774996 + a: no such file in rev 03f6b0774996 $ hg cat -r 1 b 1
--- a/tests/test-churn Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-churn Sun Aug 29 22:55:37 2010 +0200 @@ -38,7 +38,9 @@ echo % churn with aliases cat > ../aliases <<EOF user1 alias1 + user3 alias3 +not-an-alias EOF hg churn --aliases ../aliases echo % churn with .hgchurn
--- a/tests/test-churn.out Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-churn.out Sun Aug 29 22:55:37 2010 +0200 @@ -16,10 +16,12 @@ user2 2 *************************************************************** user1 1 ******************************** % churn with aliases +skipping malformed alias: not-an-alias alias3 3 ************************************************************** alias1 3 ************************************************************** user2 2 ***************************************** % churn with .hgchurn +skipping malformed alias: not-an-alias alias3 3 ************************************************************** alias1 3 ************************************************************** user2 2 *****************************************
--- a/tests/test-dispatch.out Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-dispatch.out Sun Aug 29 22:55:37 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 Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-globalopts.out Sun Aug 29 22:55:37 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.t Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-identify.t Sun Aug 29 22:55:37 2010 +0200 @@ -3,7 +3,7 @@ no repo $ hg id - abort: There is no Mercurial repository here (.hg not found) + abort: there is no Mercurial repository here (.hg not found) create repo
--- a/tests/test-import-eol.t Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-import-eol.t Sun Aug 29 22:55:37 2010 +0200 @@ -36,7 +36,7 @@ $ hg --config patch.eol='LFCR' import eol.diff applying eol.diff - abort: Unsupported line endings type: LFCR + abort: unsupported line endings type: LFCR $ hg revert -a
--- a/tests/test-mq.t Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-mq.t Sun Aug 29 22:55:37 2010 +0200 @@ -195,7 +195,7 @@ $ mkdir f $ cd f $ hg init --mq - abort: There is no Mercurial repository here (.hg not found) + abort: there is no Mercurial repository here (.hg not found) $ cd .. init --mq with repo path
--- a/tests/test-revert.out Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-revert.out Sun Aug 29 22:55:37 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.t Sat Aug 28 23:57:39 2010 +0200 +++ b/tests/test-transplant.t Sun Aug 29 22:55:37 2010 +0200 @@ -206,7 +206,7 @@ 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 transplant -c shouldn't use an old changeset @@ -219,7 +219,7 @@ 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 $ hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039 $ hg transplant 1:3 @@ -319,7 +319,7 @@ file b1 already exists 1 out of 1 hunks FAILED -- saving rejects to file b1.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 $ cd ..