This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3190

merge: avoid unnecessary conversion from binary nodeid to binary nodeid
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd665b4ea7d4c: merge: avoid unnecessary conversion from binary nodeid to binary nodeid
Summary

"node" is already a binary nodeid here, so there's no need to convert
it. repo.lookup() will soon lose support for binary nodeids as input.

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:03 PM
Closed by commit rHGd665b4ea7d4c: merge: avoid unnecessary conversion from binary nodeid to 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/commands.py (2 lines)

Diff 7890

mercurial/commands.py

node = scmutil.revsingle(repo, node).node() node = scmutil.revsingle(repo, node).node()
if not node and not abort: if not node and not abort:
node = repo[destutil.destmerge(repo)].node() node = repo[destutil.destmerge(repo)].node()
if opts.get('preview'): if opts.get('preview'):
# find nodes that are ancestors of p2 but not of p1 # find nodes that are ancestors of p2 but not of p1
p1 = repo.lookup('.') p1 = repo.lookup('.')
p2 = repo.lookup(node) p2 = node
nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
for node in nodes: for node in nodes:
displayer.show(repo[node]) displayer.show(repo[node])
displayer.close() displayer.close()
return 0 return 0