Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 16232:877aea86fb73
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Mar 2012 15:59:33 -0600 |
parents | 7855c522a9cb ce292f1379ba |
children | 0d175ac527c1 |
line wrap: on
line diff
--- 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()):