##// END OF EJS Templates
extdiff: use context-returning revpair()...
Martin von Zweigbergk -
r37270:6089ef93 default
parent child Browse files
Show More
@@ -168,14 +168,18 b' def dodiff(ui, repo, cmdline, pats, opts'
168 168 msg = _('cannot specify --rev and --change at the same time')
169 169 raise error.Abort(msg)
170 170 elif change:
171 node2 = scmutil.revsingle(repo, change, None).node()
172 node1a, node1b = repo.changelog.parents(node2)
171 ctx2 = scmutil.revsingle(repo, change, None)
172 ctx1a, ctx1b = ctx2.p1(), ctx2.p2()
173 173 else:
174 node1a, node2 = scmutil.revpairnodes(repo, revs)
174 ctx1a, ctx2 = scmutil.revpair(repo, revs)
175 175 if not revs:
176 node1b = repo.dirstate.p2()
176 ctx1b = repo[None].p2()
177 177 else:
178 node1b = nullid
178 ctx1b = repo[nullid]
179
180 node1a = ctx1a.node()
181 node1b = ctx1b.node()
182 node2 = ctx2.node()
179 183
180 184 # Disable 3-way merge if there is only one parent
181 185 if do3way:
General Comments 0
You need to be logged in to leave comments. Login now