Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 37479:d665b4ea7d4c
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 08 Apr 2018 08:41:58 -0700 |
| parents | 7b7ca9ba2de5 |
| children | aacfca6f9767 |
comparison
equal
deleted
inserted
replaced
| 37478:d815b9733ebd | 37479:d665b4ea7d4c |
|---|---|
| 3585 node = repo[destutil.destmerge(repo)].node() | 3585 node = repo[destutil.destmerge(repo)].node() |
| 3586 | 3586 |
| 3587 if opts.get('preview'): | 3587 if opts.get('preview'): |
| 3588 # find nodes that are ancestors of p2 but not of p1 | 3588 # find nodes that are ancestors of p2 but not of p1 |
| 3589 p1 = repo.lookup('.') | 3589 p1 = repo.lookup('.') |
| 3590 p2 = repo.lookup(node) | 3590 p2 = node |
| 3591 nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | 3591 nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
| 3592 | 3592 |
| 3593 displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | 3593 displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
| 3594 for node in nodes: | 3594 for node in nodes: |
| 3595 displayer.show(repo[node]) | 3595 displayer.show(repo[node]) |