Mercurial > hg
changeset 33516:f9e6e43c7987
bookmark: track bookmark changes at the transaction level
The transaction has now a 'bookmarks' dictionary in tr.changes. The structure
of the dictionary is {BOOKMARK_NAME: (OLD_NODE, NEW_NODE)}. If a bookmark is
deleted NEW_NODE will be None. If a bookmark is created OLD_NODE will be None.
If the bookmark is updated multiple time, the initial value is preserved.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Mon, 10 Jul 2017 20:26:53 +0200 |
| parents | 3325c7dcabaa |
| children | 08bf0ebc6c8e |
| files | mercurial/bookmarks.py mercurial/localrepo.py |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Mon Jul 10 20:10:03 2017 +0200 +++ b/mercurial/bookmarks.py Mon Jul 10 20:26:53 2017 +0200 @@ -112,11 +112,19 @@ def applychanges(self, repo, tr, changes): """Apply a list of changes to bookmarks """ + bmchanges = tr.changes.get('bookmarks') for name, node in changes: + old = self.get(name) if node is None: del self[name] else: self[name] = node + if bmchanges is not None: + # if a previous value exist preserve the "initial" value + previous = bmchanges.get(name) + if previous is not None: + old = previous[0] + bmchanges[name] = (old, node) self._recordchange(tr) def recordchange(self, tr):
--- a/mercurial/localrepo.py Mon Jul 10 20:10:03 2017 +0200 +++ b/mercurial/localrepo.py Mon Jul 10 20:26:53 2017 +0200 @@ -1216,6 +1216,7 @@ tr.changes['revs'] = set() tr.changes['obsmarkers'] = set() tr.changes['phases'] = {} + tr.changes['bookmarks'] = {} tr.hookargs['txnid'] = txnid # note: writing the fncache only during finalize mean that the file is