--- a/hgext/evolve.py Fri Oct 09 16:21:30 2015 -0700
+++ b/hgext/evolve.py Fri Oct 30 16:04:19 2015 +0000
@@ -961,7 +961,7 @@
except util.Abort, exc:
repo.dirstate.beginparentchange()
repo.setparents(repo['.'].node(), nullid)
- repo.dirstate.write()
+ writedirstate(repo.dirstate, tr)
# fix up dirstate for copies and renames
copies.duplicatecopies(repo, dest.rev(), orig.p1().rev())
repo.dirstate.endparentchange()
@@ -1022,6 +1022,15 @@
except AttributeError:
return repo._bookmarkcurrent
+### dirstate compatibility layer < hg 3.6
+
+def writedirstate(dirstate, tr):
+ if dirstate.write.func_defaults is not None: # mercurial 3.6 and above
+ return dirstate.write(tr)
+ return dirstate.write()
+
+
+
### new command
#############################
metadataopts = [