# HG changeset patch # User Pierre-Yves David # Date 1488288428 -3600 # Node ID 53aae4b4e791e9a084d3de5602456794ff706a9e # Parent 6dd3bb40872536bcefd5d0cd87688a9e8d505e3a compat: drop compatibility layer for 'tryimportone' Return is now homogeneous for all the version we support. diff -r 6dd3bb408725 -r 53aae4b4e791 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Tue Feb 28 14:25:35 2017 +0100 +++ b/hgext3rd/evolve/__init__.py Tue Feb 28 14:27:08 2017 +0100 @@ -1030,11 +1030,7 @@ @eh.wrapfunction(mercurial.cmdutil, 'tryimportone') def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs): extracted = patch.extract(ui, hunk) - if util.safehasattr(extracted, 'get'): - # mercurial 3.6 return a dictionary there - expected = extracted.get('nodeid') - else: - expected = extracted[5] + expected = extracted.get('nodeid') if expected is not None: expected = node.bin(expected) oldextract = patch.extract