# HG changeset patch # User Augie Fackler # Date 1527529035 14400 # Node ID bb09e8a230d6192722059eba749fa4f889102364 # Parent 51e105c7f0c6fe1aece28bc06c177b68c0e789f1 wrappers: fix old versions of hg without breaking 4.6 Whoops. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -184,7 +184,9 @@ def diff(orig, ui, repo, *args, **opts): parent = repo[o_r[-1]].parents()[0] opts['rev'] = ['%s:.' % node.hex(parent.node()), ] node1, node2 = scmutil.revpair(repo, opts['rev']) - node1, node2 = node1.node(), node2.node() + if not isinstance(node1, bytes): + # hg 4.6 and later return contexts, so convert to bytestr + node1, node2 = node1.node(), node2.node() baserev, _junk = hashes.get(node1, (-1, 'junk')) newrev, _junk = hashes.get(node2, (-1, 'junk')) it = patch.diff(repo, node1, node2,