This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3162

bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it
ClosedPublic

Authored by martinvonz on Apr 6 2018, 1:59 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG81d35d5d35f9: bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it
Summary

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>] :)

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 6 2018, 1:59 PM
martinvonz updated this revision to Diff 7795.Apr 6 2018, 2:43 PM
indygreg added a subscriber: indygreg.Apr 6 2018, 2:52 PM

How do you feel about changectx instead of ctx? This would seemingly jive with other naming throughout the code base.

martinvonz added a comment.Apr 6 2018, 7:41 PM
In D3162#50746, @indygreg wrote:

How do you feel about changectx instead of ctx? This would seemingly jive with other naming throughout the code base.

I agree, that's better to make it clear that it's not some kind of bookmark context. Will change.

martinvonz retitled this revision from bookmarks: introduce a repo._bookmarks.ctx(mark) method and use it to bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it.Apr 6 2018, 7:42 PM
martinvonz updated this revision to Diff 7818.
indygreg accepted this revision.Apr 7 2018, 1:35 AM
This revision is now accepted and ready to land.Apr 7 2018, 1:35 AM
Closed by commit rHG81d35d5d35f9: bookmarks: introduce a repo._bookmarks.changectx(mark) method and use it (authored by martinvonz). · Explain WhyApr 7 2018, 1:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (11 lines)

Diff 7818

mercurial/bookmarks.py

def _del(self, key): def _del(self, key):
self._clean = False self._clean = False
return dict.__delitem__(self, key) return dict.__delitem__(self, key)
def update(self, *others): def update(self, *others):
raise error.ProgrammingError("use 'bookmarks.applychanges' instead") raise error.ProgrammingError("use 'bookmarks.applychanges' instead")
def changectx(self, mark):
return self._repo[self[mark]]
def applychanges(self, repo, tr, changes): def applychanges(self, repo, tr, changes):
"""Apply a list of changes to bookmarks """Apply a list of changes to bookmarks
""" """
bmchanges = tr.changes.get('bookmarks') bmchanges = tr.changes.get('bookmarks')
for name, node in changes: for name, node in changes:
old = self.get(name) old = self.get(name)
if node is None: if node is None:
self._del(name) self._del(name)
cur = self._repo['.'].node() cur = self._repo['.'].node()
if mark in self and not force: if mark in self and not force:
if target: if target:
if self[mark] == target and target == cur: if self[mark] == target and target == cur:
# re-activating a bookmark # re-activating a bookmark
return [] return []
rev = self._repo[target].rev() rev = self._repo[target].rev()
anc = self._repo.changelog.ancestors([rev]) anc = self._repo.changelog.ancestors([rev])
bmctx = self._repo[self[mark]] bmctx = self.changectx(mark)
divs = [self._repo[b].node() for b in self divs = [self[b] for b in self
if b.split('@', 1)[0] == mark.split('@', 1)[0]] if b.split('@', 1)[0] == mark.split('@', 1)[0]]
# allow resolving a single divergent bookmark even if moving # allow resolving a single divergent bookmark even if moving
# the bookmark across branches when a revision is specified # the bookmark across branches when a revision is specified
# that contains a divergent bookmark # that contains a divergent bookmark
if bmctx.rev() not in anc and target in divs: if bmctx.rev() not in anc and target in divs:
return divergent2delete(self._repo, [target], mark) return divergent2delete(self._repo, [target], mark)
marks = repo._bookmarks marks = repo._bookmarks
active = marks.active active = marks.active
if not active: if not active:
return False return False
bmchanges = [] bmchanges = []
if marks[active] in parents: if marks[active] in parents:
new = repo[node] 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]] if b.split('@', 1)[0] == active.split('@', 1)[0]]
anc = repo.changelog.ancestors([new.rev()]) anc = repo.changelog.ancestors([new.rev()])
deletefrom = [b.node() for b in divs if b.rev() in anc or b == new] 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())) bmchanges.append((active, new.node()))
for bm in divergent2delete(repo, deletefrom, active): for bm in divergent2delete(repo, deletefrom, active):
bmchanges.append((bm, None)) bmchanges.append((bm, None))
if bmchanges: if bmchanges:
with repo.lock(), repo.transaction('bookmark') as tr: with repo.lock(), repo.transaction('bookmark') as tr:
marks.applychanges(repo, tr, bmchanges) marks.applychanges(repo, tr, bmchanges)