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.
--- 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()
--- a/tests/test-bookmarks-pushpull.t Wed Nov 05 13:05:32 2014 +0100
+++ b/tests/test-bookmarks-pushpull.t Wed Nov 05 17:25:00 2014 +0000
@@ -54,6 +54,17 @@
X 4e3505fd95835d721066b76e75dbb8cc554d7f77
Y 4e3505fd95835d721066b76e75dbb8cc554d7f77
Z 4e3505fd95835d721066b76e75dbb8cc554d7f77
+
+delete the bookmark to repull it
+
+ $ hg book -d X
+ $ hg pull -B X ../a
+ pulling from ../a
+ no changes found
+ adding remote bookmark X
+
+finally no-op pull
+
$ hg pull -B X ../a
pulling from ../a
no changes found
@@ -166,6 +177,18 @@
Y 0:4e3505fd9583
Z 1:0d2164f0ce0d
+explicite pull should overwrite the local version (issue4439)
+
+ $ hg pull --config paths.foo=../a foo -B X
+ pulling from $TESTTMP/a (glob)
+ no changes found
+ divergent bookmark @ stored as @foo
+ importing bookmark X
+
+reinstall state for further testing:
+
+ $ hg book -fr 9b140be10808 X
+
revsets should not ignore divergent bookmarks
$ hg bookmark -fr 1 Z