This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3309

scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix()
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5f8f013e7d52: scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix()
Summary

I'm going to wrap revlog.shortest() in scmutil. I plan on calling it
shortesthexnodeidprefix(). resolvehexnodeidprefix() matches that
better. Also, "prefix" carries more information than "partial".

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 13 2018, 1:59 PM
martinvonz edited the summary of this revision. (Show Details)Apr 14 2018, 2:16 AM
martinvonz updated this revision to Diff 8247.
martinvonz updated this revision to Diff 8252.Apr 14 2018, 3:20 AM
Closed by commit rHG5f8f013e7d52: scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix() (authored by martinvonz). · Explain WhyApr 14 2018, 4:12 AM
This revision was automatically updated to reflect the committed changes.
martinvonz updated this revision to Diff 8283.Apr 14 2018, 12:16 PM

Revision Contents
Changeset List

PathPackages
Mhgext/eol.py (2 lines)
Mhgext/histedit.py (2 lines)
Mmercurial/context.py (4 lines)
Mmercurial/scmutil.py (4 lines)

Diff 8260

hgext/eol.py

def checkheadshook(ui, repo, node, hooktype, **kwargs): def checkheadshook(ui, repo, node, hooktype, **kwargs):
"""verify that files have expected EOLs""" """verify that files have expected EOLs"""
_checkhook(ui, repo, node, True) _checkhook(ui, repo, node, True)
# "checkheadshook" used to be called "hook" # "checkheadshook" used to be called "hook"
hook = checkheadshook hook = checkheadshook
def preupdate(ui, repo, hooktype, parent1, parent2): def preupdate(ui, repo, hooktype, parent1, parent2):
p1node = scmutil.resolvepartialhexnodeid(repo, parent1) p1node = scmutil.resolvehexnodeidprefix(repo, parent1)
repo.loadeol([p1node]) repo.loadeol([p1node])
return False return False
def uisetup(ui): def uisetup(ui):
ui.setconfig('hooks', 'preupdate.eol', preupdate, 'eol') ui.setconfig('hooks', 'preupdate.eol', preupdate, 'eol')
def extsetup(ui): def extsetup(ui):
try: try:

hgext/histedit.py

except error.RepoLookupError: except error.RepoLookupError:
raise error.ParseError(_("invalid changeset %s") % ruleid) raise error.ParseError(_("invalid changeset %s") % ruleid)
return cls(state, rev) return cls(state, rev)
def verify(self, prev, expected, seen): def verify(self, prev, expected, seen):
""" Verifies semantic correctness of the rule""" """ Verifies semantic correctness of the rule"""
repo = self.repo repo = self.repo
ha = node.hex(self.node) ha = node.hex(self.node)
self.node = scmutil.resolvepartialhexnodeid(repo, ha) self.node = scmutil.resolvehexnodeidprefix(repo, ha)
if self.node is None: if self.node is None:
raise error.ParseError(_('unknown changeset %s listed') % ha[:12]) raise error.ParseError(_('unknown changeset %s listed') % ha[:12])
self._verifynodeconstraints(prev, expected, seen) self._verifynodeconstraints(prev, expected, seen)
def _verifynodeconstraints(self, prev, expected, seen): def _verifynodeconstraints(self, prev, expected, seen):
# by default command need a node in the edited list # by default command need a node in the edited list
if self.node not in expected: if self.node not in expected:
raise error.ParseError(_('%s "%s" changeset was not a candidate') raise error.ParseError(_('%s "%s" changeset was not a candidate')

mercurial/context.py

# Depending on your use case, replace repo[x] by one of these: # Depending on your use case, replace repo[x] by one of these:
# * If you want to support general revsets, use scmutil.revsingle(x) # * If you want to support general revsets, use scmutil.revsingle(x)
# * If you know that "x" is a stringified int, use repo[int(x)] # * If you know that "x" is a stringified int, use repo[int(x)]
# * If you know that "x" is a bookmark, use repo._bookmarks.changectx(x) # * If you know that "x" is a bookmark, use repo._bookmarks.changectx(x)
# * If you know that "x" is a tag, use repo[repo.tags()[x]] # * If you know that "x" is a tag, use repo[repo.tags()[x]]
# * If you know that "x" is a branch or in some other namespace, # * If you know that "x" is a branch or in some other namespace,
# use the appropriate mechanism for that namespace # use the appropriate mechanism for that namespace
# * If you know that "x" is a hex nodeid prefix, use # * If you know that "x" is a hex nodeid prefix, use
# repo[scmutil.resolvepartialhexnodeid(repo, x)] # repo[scmutil.resolvehexnodeidprefix(repo, x)]
# * If "x" is a string that can be any of the above, but you don't want # * If "x" is a string that can be any of the above, but you don't want
# to allow general revsets (perhaps because "x" may come from a remote # to allow general revsets (perhaps because "x" may come from a remote
# user and the revset may be too costly), use scmutil.revsymbol(repo, x) # user and the revset may be too costly), use scmutil.revsymbol(repo, x)
# * If "x" can be a mix of the above, you'll have to figure it out # * If "x" can be a mix of the above, you'll have to figure it out
# yourself # yourself
repo.ui.deprecwarn("changectx.__init__ is getting more limited, see source " repo.ui.deprecwarn("changectx.__init__ is getting more limited, see source "
"for details", "4.6", stacklevel=4) "for details", "4.6", stacklevel=4)
try: try:
self._node = repo.names.singlenode(repo, changeid) self._node = repo.names.singlenode(repo, changeid)
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
changectxdeprecwarn(repo) changectxdeprecwarn(repo)
return return
except KeyError: except KeyError:
pass pass
self._node = scmutil.resolvepartialhexnodeid(repo, changeid) self._node = scmutil.resolvehexnodeidprefix(repo, changeid)
if self._node is not None: if self._node is not None:
self._rev = repo.changelog.rev(self._node) self._rev = repo.changelog.rev(self._node)
changectxdeprecwarn(repo) changectxdeprecwarn(repo)
return return
# lookup failed # lookup failed
# check if it might have come from damaged dirstate # check if it might have come from damaged dirstate
# #

mercurial/scmutil.py

def formatrevnode(ui, rev, node): def formatrevnode(ui, rev, node):
"""Format given revision and node depending on the current verbosity""" """Format given revision and node depending on the current verbosity"""
if ui.debugflag: if ui.debugflag:
hexfunc = hex hexfunc = hex
else: else:
hexfunc = short hexfunc = short
return '%d:%s' % (rev, hexfunc(node)) return '%d:%s' % (rev, hexfunc(node))
def resolvepartialhexnodeid(repo, prefix): def resolvehexnodeidprefix(repo, prefix):
# Uses unfiltered repo because it's faster when then prefix is ambiguous/ # Uses unfiltered repo because it's faster when prefix is ambiguous/
# This matches the "shortest" template function. # This matches the "shortest" template function.
node = repo.unfiltered().changelog._partialmatch(prefix) node = repo.unfiltered().changelog._partialmatch(prefix)
if node is None: if node is None:
return return
repo.changelog.rev(node) # make sure node isn't filtered repo.changelog.rev(node) # make sure node isn't filtered
return node return node
def isrevsymbol(repo, symbol): def isrevsymbol(repo, symbol):