( )⚙ D3191 clone: avoid using repo.lookup() with binary nodeid

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3191

clone: avoid using repo.lookup() with binary nodeid
ClosedPublic

Authored by martinvonz on Apr 8 2018, 12:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc569e51ee449: clone: avoid using repo.lookup() with binary nodeid
Summary

The code in hg.clone() is a bit of a mess, but it seems like the
"checkout" variable is always a binary nodeid (tests pass when run
with "assert len(checkout) == 20" before the
repo.lookup()). repo.lookup() will soon work only with string inputs,
so we need remove this use.

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 8 2018, 12:46 PM
Closed by commit rHGc569e51ee449: clone: avoid using repo.lookup() with binary nodeid (authored by martinvonz). · Explain WhyApr 9 2018, 10:17 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (6 lines)

Diff 7891

mercurial/hg.py

logexchange.pullremotenames(destrepo, srcpeer) logexchange.pullremotenames(destrepo, srcpeer)
if update: if update:
if update is not True: if update is not True:
checkout = srcpeer.lookup(update) checkout = srcpeer.lookup(update)
uprev = None uprev = None
status = None status = None
if checkout is not None: if checkout is not None:
try: if checkout in destrepo:
uprev = destrepo.lookup(checkout) uprev = checkout
except error.RepoLookupError: else:
if update is not True: if update is not True:
try: try:
uprev = destrepo.lookup(update) uprev = destrepo.lookup(update)
except error.RepoLookupError: except error.RepoLookupError:
pass pass
if uprev is None: if uprev is None:
try: try:
uprev = destrepo._bookmarks['@'] uprev = destrepo._bookmarks['@']