Mercurial > hg
changeset 16232:877aea86fb73
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Mar 2012 15:59:33 -0600 |
| parents | 5cb2693e1a60 (current diff) ce292f1379ba (diff) |
| children | 3f79b110c4f0 |
| files | hgext/largefiles/overrides.py hgext/mq.py mercurial/commands.py tests/test-check-code-hg.t |
| diffstat | 7 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/churn.py Sun Mar 04 17:14:30 2012 -0600 +++ b/hgext/churn.py Thu Mar 08 15:59:33 2012 -0600 @@ -135,7 +135,7 @@ except ValueError: l = l.strip() if l: - ui.warn(_("skipping malformed alias: %s\n" % l)) + ui.warn(_("skipping malformed alias: %s\n") % l) continue rate = countrate(ui, repo, amap, *pats, **opts).items()
--- a/hgext/convert/monotone.py Sun Mar 04 17:14:30 2012 -0600 +++ b/hgext/convert/monotone.py Thu Mar 08 15:59:33 2012 -0600 @@ -113,7 +113,7 @@ stream = self.mtnreadfp.read(1) if stream not in 'mewptl': - raise util.Abort(_('bad mtn packet - bad stream type %s' % stream)) + raise util.Abort(_('bad mtn packet - bad stream type %s') % stream) read = self.mtnreadfp.read(1) if read != ':':
--- a/hgext/largefiles/lfcommands.py Sun Mar 04 17:14:30 2012 -0600 +++ b/hgext/largefiles/lfcommands.py Thu Mar 08 15:59:33 2012 -0600 @@ -309,7 +309,7 @@ newdata.append('%s %s\n' % (node.hex(revmap[newid]), name)) except KeyError: - ui.warn(_('no mapping for id %s\n' % id)) + ui.warn(_('no mapping for id %s\n') % id) continue return ''.join(newdata)
--- a/hgext/largefiles/overrides.py Sun Mar 04 17:14:30 2012 -0600 +++ b/hgext/largefiles/overrides.py Thu Mar 08 15:59:33 2012 -0600 @@ -157,7 +157,7 @@ # If this is being called by addremove, notify the user that we # are removing the file. if getattr(repo, "_isaddremove", False): - ui.status(_('removing %s\n' % f)) + ui.status(_('removing %s\n') % f) if os.path.exists(repo.wjoin(f)): util.unlinkpath(repo.wjoin(f)) lfdirstate.remove(f) @@ -682,7 +682,7 @@ for head in newheads: (cached, missing) = lfcommands.cachelfiles(ui, repo, head) numcached += len(cached) - ui.status(_("%d largefiles cached\n" % numcached)) + ui.status(_("%d largefiles cached\n") % numcached) return result def override_rebase(orig, ui, repo, **opts):
--- a/hgext/mq.py Sun Mar 04 17:14:30 2012 -0600 +++ b/hgext/mq.py Thu Mar 08 15:59:33 2012 -0600 @@ -1193,7 +1193,8 @@ root = self.series[start] target = patchheader(self.join(root), self.plainmode).parent if not target: - raise util.Abort(_("%s does not have a parent recorded" % root)) + raise util.Abort( + _("%s does not have a parent recorded") % root) if not repo[target] == repo['.']: hg.update(repo, target)
--- a/mercurial/commands.py Sun Mar 04 17:14:30 2012 -0600 +++ b/mercurial/commands.py Thu Mar 08 15:59:33 2012 -0600 @@ -2908,7 +2908,7 @@ headless = ', '.join(b for b in branches - haveheads) msg = _('no open branch heads found on branches %s') if opts.get('rev'): - msg += _(' (started at %s)' % opts['rev']) + msg += _(' (started at %s)') % opts['rev'] ui.warn((msg + '\n') % headless) if not heads: @@ -3001,7 +3001,7 @@ msg = _('use "hg help" for the full list of commands ' 'or "hg -v" for details') elif name and not full: - msg = _('use "hg help %s" to show the full help text' % name) + msg = _('use "hg help %s" to show the full help text') % name elif aliases: msg = _('use "hg -v help%s" to show builtin aliases and ' 'global options') % (name and " " + name or "") @@ -4284,7 +4284,7 @@ try: ret = hg.update(repo, checkout) except util.Abort, inst: - ui.warn(_("not updating: %s\n" % str(inst))) + ui.warn(_("not updating: %s\n") % str(inst)) return 0 if not ret and not checkout: if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
--- a/tests/test-check-code-hg.t Sun Mar 04 17:14:30 2012 -0600 +++ b/tests/test-check-code-hg.t Thu Mar 08 15:59:33 2012 -0600 @@ -209,9 +209,6 @@ > if os.path.exists(self.wjoin(lfutil.standin(lfile))): warning: line over 80 characters hgext/mq.py:0: - > raise util.Abort(_("%s does not have a parent recorded" % root)) - warning: line over 80 characters - hgext/mq.py:0: > raise util.Abort(_("cannot push --exact with applied patches")) warning: line over 80 characters hgext/mq.py:0: