( )⚙ D10536 core: don't hard-code node length

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10536

core: don't hard-code node length
ClosedPublic

Authored by joerg.sonnenberger on Apr 29 2021, 9:19 PM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc5e1cc0b4c77: core: don't hard-code node length

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare accepted this revision.May 3 2021, 7:57 AM
This revision is now accepted and ready to land.May 3 2021, 7:57 AM
joerg.sonnenberger added a commit: rHGc5e1cc0b4c77: core: don't hard-code node length.May 3 2021, 9:33 AM
Closed by commit rHGc5e1cc0b4c77: core: don't hard-code node length (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax added a parent revision: D10535: core: don't hard-code hex node lengths.May 3 2021, 9:40 AM
baymax updated this revision to Diff 27415.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (2 lines)
Mmercurial/revlog.py (2 lines)

Diff 27222

mercurial/localrepo.py

if isinstance(changeid, int): if isinstance(changeid, int):
node = self.changelog.node(changeid) node = self.changelog.node(changeid)
rev = changeid rev = changeid
elif changeid == b'.': elif changeid == b'.':
# this is a hack to delay/avoid loading obsmarkers # this is a hack to delay/avoid loading obsmarkers
# when we know that '.' won't be hidden # when we know that '.' won't be hidden
node = self.dirstate.p1() node = self.dirstate.p1()
rev = self.unfiltered().changelog.rev(node) rev = self.unfiltered().changelog.rev(node)
elif len(changeid) == 20: elif len(changeid) == self.nodeconstants.nodelen:
try: try:
node = changeid node = changeid
rev = self.changelog.rev(changeid) rev = self.changelog.rev(changeid)
except error.FilteredLookupError: except error.FilteredLookupError:
changeid = hex(changeid) # for the error message changeid = hex(changeid) # for the error message
raise raise
except LookupError: except LookupError:
# check if it might have come from damaged dirstate # check if it might have come from damaged dirstate

mercurial/revlog.py

# choose a consistent winner when there's a tie # choose a consistent winner when there's a tie
return min(map(self.node, ancs)) return min(map(self.node, ancs))
return self.nullid return self.nullid
def _match(self, id): def _match(self, id):
if isinstance(id, int): if isinstance(id, int):
# rev # rev
return self.node(id) return self.node(id)
if len(id) == 20: if len(id) == self.nodeconstants.nodelen:
# possibly a binary node # possibly a binary node
# odds of a binary node being all hex in ASCII are 1 in 10**25 # odds of a binary node being all hex in ASCII are 1 in 10**25
try: try:
node = id node = id
self.rev(node) # quick search the index self.rev(node) # quick search the index
return node return node
except error.LookupError: except error.LookupError:
pass # may be partial hex id pass # may be partial hex id