# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1444638239 25200
# Node ID c40108ae8fb08ba76de75518b7e51bbcb4f3b793
# Parent  b86eea66ed0297bc84e7f1e78cdbe12d2e81d17e# Parent  91b6a30424a366e87771fc2544c95633f4abfe81
merge with stable

diff -r b86eea66ed02 -r c40108ae8fb0 README
--- a/README	Tue Sep 29 15:40:28 2015 -0400
+++ b/README	Mon Oct 12 01:23:59 2015 -0700
@@ -58,6 +58,7 @@
 
 5.2.1 --
 
+- add compatibility with Mercurial 3.6
 - prune: fixed possible issue with lock and bookmark
 - next/prev: fixed possible issue with lock and bookmark
 
diff -r b86eea66ed02 -r c40108ae8fb0 hgext/evolve.py
--- 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