This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3310

scmutil: use resolvehexnodeidprefix() from revsymbol()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGab828755e1ea: scmutil: use resolvehexnodeidprefix() from revsymbol()
Summary

I should have copied this from changectx.init into in 35b34202dd3b
(context: handle partial nodeids in revsymbol(), 2018-04-08).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 13 2018, 1:59 PM
martinvonz added a child revision: D3311: revset: use resolvehexnodeidprefix() in id() predicate (BC).Apr 13 2018, 1:59 PM
martinvonz retitled this revision from scmutil: use resolvepartialhexnodeid() from revsymbol() to scmutil: use resolvehexnodeidprefix() from revsymbol().
martinvonz updated this revision to Diff 8253.Apr 14 2018, 3:20 AM
Closed by commit rHGab828755e1ea: scmutil: use resolvehexnodeidprefix() from revsymbol() (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 8284.Apr 14 2018, 12:16 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (2 lines)

Diff 8284

mercurial/scmutil.py

# look up bookmarks through the name interface # look up bookmarks through the name interface
try: try:
node = repo.names.singlenode(repo, symbol) node = repo.names.singlenode(repo, symbol)
rev = repo.changelog.rev(node) rev = repo.changelog.rev(node)
return repo[rev] return repo[rev]
except KeyError: except KeyError:
pass pass
node = repo.unfiltered().changelog._partialmatch(symbol) node = resolvehexnodeidprefix(repo, symbol)
if node is not None: if node is not None:
rev = repo.changelog.rev(node) rev = repo.changelog.rev(node)
return repo[rev] return repo[rev]
raise error.RepoLookupError(_("unknown revision '%s'") % symbol) raise error.RepoLookupError(_("unknown revision '%s'") % symbol)
except error.WdirUnsupported: except error.WdirUnsupported:
return repo[None] return repo[None]