# HG changeset patch
# User Boris Feld <boris.f...@octobus.net>
# Date 1499700137 -7200
# Mon Jul 10 17:22:17 2017 +0200
# Node ID 76dde98a2c0bc24ab110ba3ecc06698c735adf57
# Parent 34170eeaa6fbfb43b1ceac331ae50678afe10610
# EXP-Topic tr.changes.bookmarks
bookmark: use 'applychanges' when updating from a remote
diff -r 34170eeaa6fb -r 76dde98a2c0b mercurial/bookmarks.py
--- a/mercurial/bookmarks.py Mon Jul 10 17:10:56 2017 +0200
+++ b/mercurial/bookmarks.py Mon Jul 10 17:22:17 2017 +0200
@@ -579,10 +579,11 @@
if changed:
tr = trfunc()
+ changes = []
for b, node, writer, msg in sorted(changed):
- localmarks[b] = node
+ changes.append((b, node))
writer(msg)
- localmarks.recordchange(tr)
+ localmarks.applychanges(repo, tr, changes)
def incoming(ui, repo, other):
'''Show bookmarks incoming from other to repo
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
