Mercurial > hg
comparison mercurial/bookmarks.py @ 23199:c35ffa4249ca stable
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 |
comparison
equal
deleted
inserted
replaced
23192:73cfaa348650 | 23199:c35ffa4249ca |
---|---|
388 | 388 |
389 for b, scid, dcid in diverge: | 389 for b, scid, dcid in diverge: |
390 if b in explicit: | 390 if b in explicit: |
391 explicit.discard(b) | 391 explicit.discard(b) |
392 changed.append((b, bin(scid), status, | 392 changed.append((b, bin(scid), status, |
393 _("importing bookmark %s\n") % (b, b))) | 393 _("importing bookmark %s\n") % (b))) |
394 else: | 394 else: |
395 db = _diverge(ui, b, path, localmarks) | 395 db = _diverge(ui, b, path, localmarks) |
396 changed.append((db, bin(scid), warn, | 396 changed.append((db, bin(scid), warn, |
397 _("divergent bookmark %s stored as %s\n") | 397 _("divergent bookmark %s stored as %s\n") |
398 % (b, db))) | 398 % (b, db))) |
399 for b, scid, dcid in adddst + advdst: | 399 for b, scid, dcid in adddst + advdst: |
400 if b in explicit: | 400 if b in explicit: |
401 explicit.discard(b) | 401 explicit.discard(b) |
402 changed.append((b, bin(scid), status, | 402 changed.append((b, bin(scid), status, |
403 _("importing bookmark %s\n") % (b, b))) | 403 _("importing bookmark %s\n") % (b))) |
404 | 404 |
405 if changed: | 405 if changed: |
406 tr = trfunc() | 406 tr = trfunc() |
407 for b, node, writer, msg in sorted(changed): | 407 for b, node, writer, msg in sorted(changed): |
408 localmarks[b] = node | 408 localmarks[b] = node |