Patchwork D3190: merge: avoid unnecessary conversion from binary nodeid to binary nodeid

login
register
mail settings
Submitter phabricator
Date April 9, 2018, 2:17 p.m.
Message ID <1dda0427b511cb2ebd2a0f8b013158fc@localhost.localdomain>
Download mbox | patch
Permalink /patch/30591/
State Not Applicable
Headers show

Comments

phabricator - April 9, 2018, 2:17 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd665b4ea7d4c: merge: avoid unnecessary conversion from binary nodeid to binary nodeid (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3190?vs=7880&id=7890

REVISION DETAIL
  https://phab.mercurial-scm.org/D3190

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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)