Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 37254:ddf50e82e21a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: use context-returning revpair() Differential Revision: https://phab.mercurial-scm.org/D3008
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 31 Mar 2018 23:25:02 -0700
parents 7c0f40f4f7bf
children 4e573e7e512d
comparison
equal deleted inserted replaced
37253:6089ef933ab5 37254:ddf50e82e21a
1876 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') 1876 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
1877 node2 = scmutil.revsingle(repo, change, None).node() 1877 node2 = scmutil.revsingle(repo, change, None).node()
1878 node1 = repo[node2].p1().node() 1878 node1 = repo[node2].p1().node()
1879 else: 1879 else:
1880 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') 1880 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
1881 node1, node2 = scmutil.revpairnodes(repo, revs) 1881 ctx1, ctx2 = scmutil.revpair(repo, revs)
1882 node1, node2 = ctx1.node(), ctx2.node()
1882 1883
1883 if reverse: 1884 if reverse:
1884 node1, node2 = node2, node1 1885 node1, node2 = node2, node1
1885 1886
1886 diffopts = patch.diffallopts(ui, opts) 1887 diffopts = patch.diffallopts(ui, opts)