Mercurial > hgsubversion

comparison hgsubversion/wrappers.py @ 1573:bb09e8a230d6 1.9.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wrappers: fix old versions of hg without breaking 4.6 Whoops.
author Augie Fackler <raf@durin42.com>
date Mon, 28 May 2018 13:37:15 -0400
parents 70eb9b6b0320
children e15dc9e9cd56
comparison
equal deleted inserted replaced
1572:51e105c7f0c6 1573:bb09e8a230d6
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 if not isinstance(node1, bytes):
188 # hg 4.6 and later return contexts, so convert to bytestr
189 node1, node2 = node1.node(), node2.node()
188 baserev, _junk = hashes.get(node1, (-1, 'junk')) 190 baserev, _junk = hashes.get(node1, (-1, 'junk'))
189 newrev, _junk = hashes.get(node2, (-1, 'junk')) 191 newrev, _junk = hashes.get(node2, (-1, 'junk'))
190 it = patch.diff(repo, node1, node2, 192 it = patch.diff(repo, node1, node2,
191 opts=patch.diffopts(ui, opts={'git': True, 193 opts=patch.diffopts(ui, opts={'git': True,
192 'show_function': False, 194 'show_function': False,