( )⚙ D10280 refactor: prefer lookup by revision, even for null

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10280

refactor: prefer lookup by revision, even for null
ClosedPublic

Authored by joerg.sonnenberger on Mar 28 2021, 5:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGad878e3f282b: refactor: prefer lookup by revision, even for null
Summary

While the nullid lookup is a special case, it is still more complicated.
The common pattern is to lookup via nullrev so be consistent here.

Diff Detail

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

Event Timeline

joerg.sonnenberger retitled this revision from cmdutil: simplify to cmdutil: prefer lookup by revision, even for null.Mar 29 2021, 8:25 PM
joerg.sonnenberger edited the summary of this revision. (Show Details)
joerg.sonnenberger retitled this revision from cmdutil: prefer lookup by revision, even for null to refactor: prefer lookup by revision, even for null.Mar 29 2021, 8:33 PM
joerg.sonnenberger updated this revision to Diff 26627.
joerg.sonnenberger added a commit: rHGad878e3f282b: refactor: prefer lookup by revision, even for null.Mar 30 2021, 4:23 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGad878e3f282b: refactor: prefer lookup by revision, even for null (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (9 lines)

Diff 26612

mercurial/cmdutil.py

import errno import errno
import os import os
import re import re
from .i18n import _ from .i18n import _
from .node import ( from .node import (
hex, hex,
nullid, nullid,
nullrev,
short, short,
) )
from .pycompat import ( from .pycompat import (
getattr, getattr,
open, open,
setattr, setattr,
) )
from .thirdparty import attr from .thirdparty import attr
# pickup the patch msg # pickup the patch msg
message = message.strip() message = message.strip()
else: else:
# launch the editor # launch the editor
message = None message = None
ui.debug(b'message:\n%s\n' % (message or b'')) ui.debug(b'message:\n%s\n' % (message or b''))
if len(parents) == 1: if len(parents) == 1:
parents.append(repo[nullid]) parents.append(repo[nullrev])
if opts.get(b'exact'): if opts.get(b'exact'):
if not nodeid or not p1: if not nodeid or not p1:
raise error.InputError(_(b'not a Mercurial patch')) raise error.InputError(_(b'not a Mercurial patch'))
p1 = repo[p1] p1 = repo[p1]
p2 = repo[p2 or nullid] p2 = repo[p2 or nullrev]
elif p2: elif p2:
try: try:
p1 = repo[p1] p1 = repo[p1]
p2 = repo[p2] p2 = repo[p2]
# Without any options, consider p2 only if the # Without any options, consider p2 only if the
# patch is being applied on top of the recorded # patch is being applied on top of the recorded
# first parent. # first parent.
if p1 != parents[0]: if p1 != parents[0]:
p1 = parents[0] p1 = parents[0]
p2 = repo[nullid] p2 = repo[nullrev]
except error.RepoError: except error.RepoError:
p1, p2 = parents p1, p2 = parents
if p2.node() == nullid: if p2.rev() == nullrev:
ui.warn( ui.warn(
_( _(
b"warning: import the patch as a normal revision\n" b"warning: import the patch as a normal revision\n"
b"(use --exact to import the patch as a merge)\n" b"(use --exact to import the patch as a merge)\n"
) )
) )
else: else:
p1, p2 = parents p1, p2 = parents