Mercurial > hg

diff mercurial/bookmarks.py @ 23199:c35ffa4249ca stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: fix formatting of exchange message (issue4439) The message formatting was crashing when doing explicit pulling `hg pull -B X`. This changeset fix it and improved the test coverage.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 05 Nov 2014 17:25:00 +0000
parents e62c330a044f
children 197e17be5407
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Wed Nov 05 13:05:32 2014 +0100
+++ b/mercurial/bookmarks.py	Wed Nov 05 17:25:00 2014 +0000
@@ -390,7 +390,7 @@
         if b in explicit:
             explicit.discard(b)
             changed.append((b, bin(scid), status,
-                            _("importing bookmark %s\n") % (b, b)))
+                            _("importing bookmark %s\n") % (b)))
         else:
             db = _diverge(ui, b, path, localmarks)
             changed.append((db, bin(scid), warn,
@@ -400,7 +400,7 @@
         if b in explicit:
             explicit.discard(b)
             changed.append((b, bin(scid), status,
-                            _("importing bookmark %s\n") % (b, b)))
+                            _("importing bookmark %s\n") % (b)))
 
     if changed:
         tr = trfunc()