Mercurial > hg
comparison mercurial/bookmarks.py @ 33484:2a8ce4e79a47
bookmark: use 'applychanges' when updating from a remote
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 10 Jul 2017 17:22:17 +0200 |
parents | 146c0371eadf |
children | 505021482541 |
comparison
equal
deleted
inserted
replaced
33483:146c0371eadf | 33484:2a8ce4e79a47 |
---|---|
577 ui.warn(_("remote bookmark %s points to locally missing %s\n") | 577 ui.warn(_("remote bookmark %s points to locally missing %s\n") |
578 % (b, hex(scid)[:12])) | 578 % (b, hex(scid)[:12])) |
579 | 579 |
580 if changed: | 580 if changed: |
581 tr = trfunc() | 581 tr = trfunc() |
582 changes = [] | |
582 for b, node, writer, msg in sorted(changed): | 583 for b, node, writer, msg in sorted(changed): |
583 localmarks[b] = node | 584 changes.append((b, node)) |
584 writer(msg) | 585 writer(msg) |
585 localmarks.recordchange(tr) | 586 localmarks.applychanges(repo, tr, changes) |
586 | 587 |
587 def incoming(ui, repo, other): | 588 def incoming(ui, repo, other): |
588 '''Show bookmarks incoming from other to repo | 589 '''Show bookmarks incoming from other to repo |
589 ''' | 590 ''' |
590 ui.status(_("searching for changed bookmarks\n")) | 591 ui.status(_("searching for changed bookmarks\n")) |