Mercurial > hgsubversion
comparison hgsubversion/wrappers.py @ 1564:70eb9b6b0320
wrappers: revpair returns contexts now
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 20 Apr 2018 15:46:29 -0400 |
parents | ae572c9be4e6 |
children | bb09e8a230d6 |
comparison
equal
deleted
inserted
replaced
1563:f44543ffab9b | 1564:70eb9b6b0320 |
---|---|
182 o_r = util.outgoing_revisions(repo, hashes, parent.node()) | 182 o_r = util.outgoing_revisions(repo, hashes, parent.node()) |
183 if o_r: | 183 if o_r: |
184 parent = repo[o_r[-1]].parents()[0] | 184 parent = repo[o_r[-1]].parents()[0] |
185 opts['rev'] = ['%s:.' % node.hex(parent.node()), ] | 185 opts['rev'] = ['%s:.' % node.hex(parent.node()), ] |
186 node1, node2 = scmutil.revpair(repo, opts['rev']) | 186 node1, node2 = scmutil.revpair(repo, opts['rev']) |
187 node1, node2 = node1.node(), node2.node() | |
187 baserev, _junk = hashes.get(node1, (-1, 'junk')) | 188 baserev, _junk = hashes.get(node1, (-1, 'junk')) |
188 newrev, _junk = hashes.get(node2, (-1, 'junk')) | 189 newrev, _junk = hashes.get(node2, (-1, 'junk')) |
189 it = patch.diff(repo, node1, node2, | 190 it = patch.diff(repo, node1, node2, |
190 opts=patch.diffopts(ui, opts={'git': True, | 191 opts=patch.diffopts(ui, opts={'git': True, |
191 'show_function': False, | 192 'show_function': False, |