This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3033

bookmarks: switch from repo.changectx('.') to repo['.']
ClosedPublic

Authored by martinvonz on Apr 3 2018, 12:14 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa494cccb673e: bookmarks: switch from repo.changectx('.') to repo['.']
Summary

The two forms are synonymous and the new form is by far the more
common form.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 3 2018, 12:14 PM
pulkit accepted this revision.Apr 3 2018, 1:38 PM
Closed by commit rHGa494cccb673e: bookmarks: switch from repo.changectx('.') to repo['.'] (authored by martinvonz). · Explain WhyApr 3 2018, 2:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bookmarks.py (4 lines)

Diff 7570

mercurial/bookmarks.py

If target is supplied, then check that we are moving the bookmark If target is supplied, then check that we are moving the bookmark
forward. forward.
If force is supplied, then forcibly move the bookmark to a new commit If force is supplied, then forcibly move the bookmark to a new commit
regardless if it is a move forward. regardless if it is a move forward.
If divergent bookmark are to be deleted, they will be returned as list. If divergent bookmark are to be deleted, they will be returned as list.
""" """
cur = self._repo.changectx('.').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._repo[self[mark]]
bookmark. bookmark.
If inactive is specified, then do not activate any bookmark. Otherwise, the If inactive is specified, then do not activate any bookmark. Otherwise, the
first bookmark is activated. first bookmark is activated.
Raises an abort error if old is not in the bookmark store. Raises an abort error if old is not in the bookmark store.
""" """
marks = repo._bookmarks marks = repo._bookmarks
cur = repo.changectx('.').node() cur = repo['.'].node()
newact = None newact = None
changes = [] changes = []
hiddenrev = None hiddenrev = None
# unhide revs if any # unhide revs if any
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')