diff hgext/evolve.py @ 1512:c40108ae8fb0

merge with stable

--- a/hgext/evolve.py	Tue Sep 29 15:40:28 2015 -0400
+++ b/hgext/evolve.py	Mon Oct 12 01:23:59 2015 -0700
@@ -1040,7 +1040,11 @@
 @eh.wrapfunction(mercurial.cmdutil, 'tryimportone')
 def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs):
     extracted = patch.extract(ui, hunk)
-    expected = extracted[5]
+    if util.safehasattr(extracted, 'get'):
+        # mercurial 3.6 return a dictionary there
+        expected = extracted.get('nodeid')
+    else:
+        expected = extracted[5]
     if expected is not None:
         expected = node.bin(expected)
     oldextract = patch.extract