( )⚙ D6884 bookmarks: remove changectx() method from bmstore (API)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6884

bookmarks: remove changectx() method from bmstore (API)
ClosedPublic

Authored by durin42 on Sep 25 2019, 6:14 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe3bb2a58af1e: bookmarks: remove changectx() method from bmstore (API)
Summary

All the callsites of this method have access to the repo, and I'd
rather not have to duplicate this across alternative bmstore
implementations. Besides, it feels like a bit of a layering violation.

.. api::

`mercurial.bookmarks.bmstore` no longer has a convenience method
for looking up changectx instances from a bookmark name. Use
`repo[repo.bookmarks[name]]` intead of
`repo.bookmarks.changectx(name)`.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 16624

hgext/infinitepush/bundleparts.py

# Copyright 2017 Facebook, Inc. # Copyright 2017 Facebook, Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
bundle2, bundle2,
changegroup, changegroup,
error, error,
extensions, extensions,
node as nodemod,
revsetlang, revsetlang,
util, util,
) )
from . import common from . import common
isremotebooksenabled = common.isremotebooksenabled isremotebooksenabled = common.isremotebooksenabled
params = {} params = {}
params['cgversion'] = cgversion params['cgversion'] = cgversion
if bookmark: if bookmark:
params['bookmark'] = bookmark params['bookmark'] = bookmark
# 'prevbooknode' is necessary for pushkey reply part # 'prevbooknode' is necessary for pushkey reply part
params['bookprevnode'] = '' params['bookprevnode'] = ''
bookmarks = repo._bookmarks bookmarks = repo._bookmarks
if bookmark in bookmarks: if bookmark in bookmarks:
params['bookprevnode'] = bookmarks.changectx(bookmark).hex() params['bookprevnode'] = nodemod.hex(bookmarks[bookmark])
# Do not send pushback bundle2 part with bookmarks if remotenames extension # Do not send pushback bundle2 part with bookmarks if remotenames extension
# is enabled. It will be handled manually in `_push()` # is enabled. It will be handled manually in `_push()`
if not isremotebooksenabled(ui): if not isremotebooksenabled(ui):
params['pushbackbookmarks'] = '1' params['pushbackbookmarks'] = '1'
parts = [] parts = []

mercurial/bookmarks.py

del self._nodemap[node] del self._nodemap[node]
else: else:
nrefs.remove(mark) nrefs.remove(mark)
def names(self, node): def names(self, node):
"""Return a sorted list of bookmarks pointing to the specified node""" """Return a sorted list of bookmarks pointing to the specified node"""
return self._nodemap.get(node, []) return self._nodemap.get(node, [])
def changectx(self, mark):
node = self._refmap[mark]
return self._repo[node]
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._refmap.get(name) old = self._refmap.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._refmap and not force: if mark in self._refmap and not force:
if target: if target:
if self._refmap[mark] == target and target == cur: if self._refmap[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.changectx(mark) bmctx = self._repo[self[mark]]
divs = [self._refmap[b] for b in self._refmap divs = [self._refmap[b] for b in self._refmap
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 = [marks.changectx(b) for b in marks divs = [repo[marks[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, marks.changectx(active), new): if validdest(repo, repo[marks[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)

mercurial/discovery.py

# internal config: bookmarks.pushing # internal config: bookmarks.pushing
newbookmarks = [localbookmarks.expandname(b) newbookmarks = [localbookmarks.expandname(b)
for b in pushop.ui.configlist('bookmarks', 'pushing')] for b in pushop.ui.configlist('bookmarks', 'pushing')]
for bm in localbookmarks: for bm in localbookmarks:
rnode = remotebookmarks.get(bm) rnode = remotebookmarks.get(bm)
if rnode and rnode in repo: if rnode and rnode in repo:
lctx, rctx = localbookmarks.changectx(bm), repo[rnode] lctx, rctx = repo[localbookmarks[bm]], repo[rnode]
if bookmarks.validdest(repo, rctx, lctx): if bookmarks.validdest(repo, rctx, lctx):
bookmarkedheads.add(lctx.node()) bookmarkedheads.add(lctx.node())
else: else:
if bm in newbookmarks and bm not in remotebookmarks: if bm in newbookmarks and bm not in remotebookmarks:
bookmarkedheads.add(localbookmarks[bm]) bookmarkedheads.add(localbookmarks[bm])
return bookmarkedheads return bookmarkedheads