merge: avoid unnecessary conversion from binary nodeid to binary nodeid
authorMartin von Zweigbergk <martinvonz@google.com>
Sun, 08 Apr 2018 08:41:58 -0700
changeset 37479 d665b4ea7d4c
parent 37478 d815b9733ebd
child 37480 c569e51ee449
merge: avoid unnecessary conversion from binary nodeid to binary nodeid "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. Differential Revision: https://phab.mercurial-scm.org/D3190
mercurial/commands.py
--- a/mercurial/commands.py	Sun Apr 08 22:56:16 2018 -0400
+++ b/mercurial/commands.py	Sun Apr 08 08:41:58 2018 -0700
@@ -3587,7 +3587,7 @@
     if opts.get('preview'):
         # find nodes that are ancestors of p2 but not of p1
         p1 = repo.lookup('.')
-        p2 = repo.lookup(node)
+        p2 = node
         nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
 
         displayer = logcmdutil.changesetdisplayer(ui, repo, opts)