Mercurial > hg
changeset 37450:81d35d5d35f9
bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it
Many places were doing repo[mark], which usually works, but it's
slightly incorrect: if the bookmark has a name that matches a full hex
nodeid of another node, then the context for the other node will be
returned instead. Also, I'm about to remove support for
repo[<namespace thing>] :)
Differential Revision: https://phab.mercurial-scm.org/D3162
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 06 Apr 2018 11:29:30 -0700 |
| parents | a0d71618074f |
| children | 444ed53f93df |
| files | mercurial/bookmarks.py |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Sun Mar 25 18:34:07 2018 +0900 +++ b/mercurial/bookmarks.py Fri Apr 06 11:29:30 2018 -0700 @@ -119,6 +119,9 @@ def update(self, *others): raise error.ProgrammingError("use 'bookmarks.applychanges' instead") + def changectx(self, mark): + return self._repo[self[mark]] + def applychanges(self, repo, tr, changes): """Apply a list of changes to bookmarks """ @@ -212,8 +215,8 @@ return [] rev = self._repo[target].rev() anc = self._repo.changelog.ancestors([rev]) - bmctx = self._repo[self[mark]] - divs = [self._repo[b].node() for b in self + bmctx = self.changectx(mark) + divs = [self[b] for b in self if b.split('@', 1)[0] == mark.split('@', 1)[0]] # allow resolving a single divergent bookmark even if moving @@ -370,11 +373,11 @@ bmchanges = [] if marks[active] in parents: new = repo[node] - divs = [repo[b] for b in marks + divs = [marks.changectx(b) for b in marks if b.split('@', 1)[0] == active.split('@', 1)[0]] anc = repo.changelog.ancestors([new.rev()]) deletefrom = [b.node() for b in divs if b.rev() in anc or b == new] - if validdest(repo, repo[marks[active]], new): + if validdest(repo, marks.changectx(active), new): bmchanges.append((active, new.node())) for bm in divergent2delete(repo, deletefrom, active):