Mercurial > public > mercurial-scm > hg-stable

comparison hgext/extdiff.py @ 13878:a8d13ee0ce68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: replace .parents()[0] with p1()
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 16:21:59 -0500
parents 5c0e1222e7c0
children d13913355390
comparison
equal deleted inserted replaced
13877:653121e6941f 13878:a8d13ee0ce68
124 node2 = cmdutil.revsingle(repo, change, None).node() 124 node2 = cmdutil.revsingle(repo, change, None).node()
125 node1a, node1b = repo.changelog.parents(node2) 125 node1a, node1b = repo.changelog.parents(node2)
126 else: 126 else:
127 node1a, node2 = cmdutil.revpair(repo, revs) 127 node1a, node2 = cmdutil.revpair(repo, revs)
128 if not revs: 128 if not revs:
129 node1b = repo.dirstate.parents()[1] 129 node1b = repo.dirstate.p2()
130 else: 130 else:
131 node1b = nullid 131 node1b = nullid
132 132
133 # Disable 3-way merge if there is only one parent 133 # Disable 3-way merge if there is only one parent
134 if do3way: 134 if do3way: