changeset 1720:fe64e69da57b

dirstate: use arg count for version check In 52ff07e1de91 in the main hg repo, dirstate was changed to require a second argument, making the default args check no longer work. Instead, we switch to check the number of arguments, which should be backwards and forwards compatible.
author Ryan McElroy <rmcelroy@fb.com>
date Mon, 08 Aug 2016 10:05:47 -0700
parents 6ff0454f1f23
children d3429d25e0cb
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Mon Aug 01 22:55:11 2016 +0200
+++ b/hgext/evolve.py	Mon Aug 08 10:05:47 2016 -0700
@@ -1024,7 +1024,7 @@
 ### dirstate compatibility layer < hg 3.6
 
 def writedirstate(dirstate, tr):
-    if dirstate.write.func_defaults is not None: # mercurial 3.6 and above
+    if dirstate.write.func_code.co_argcount != 1: # mercurial 3.6 and above
         return dirstate.write(tr)
     return dirstate.write()