Mercurial > hg

changeset 22628:2805d23e1f88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: remove a broken i18n abuse
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Oct 2014 11:35:20 -0500
parents 808df84fba83
children b3f74b405c20
files mercurial/exchange.py
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/exchange.py	Fri Sep 26 11:31:15 2014 -0700
+++ b/mercurial/exchange.py	Thu Oct 02 11:35:20 2014 -0500
@@ -344,11 +344,9 @@
         if unfi.obsstore:
             # this message are here for 80 char limit reason
             mso = _("push includes obsolete changeset: %s!")
-            mst = "push includes %s changeset: %s!"
-            # plain versions for i18n tool to detect them
-            _("push includes unstable changeset: %s!")
-            _("push includes bumped changeset: %s!")
-            _("push includes divergent changeset: %s!")
+            mst = {"unstable": _("push includes unstable changeset: %s!"),
+                   "bumped": _("push includes bumped changeset: %s!"),
+                   "divergent": _("push includes divergent changeset: %s!")}
             # If we are to push if there is at least one
             # obsolete or unstable changeset in missing, at
             # least one of the missinghead will be obsolete or
@@ -358,9 +356,7 @@
                 if ctx.obsolete():
                     raise util.Abort(mso % ctx)
                 elif ctx.troubled():
-                    raise util.Abort(_(mst)
-                                     % (ctx.troubles()[0],
-                                        ctx))
+                    raise util.Abort(mst[ctx.troubles()[0]] % ctx)
         newbm = pushop.ui.configlist('bookmarks', 'pushing')
         discovery.checkheads(unfi, pushop.remote, outgoing,
                              pushop.remoteheads,