From patchwork Mon Aug  8 17:06:22 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [evolve-ext] dirstate: use arg count for version check
From: Ryan McElroy <rm@fb.com>
X-Patchwork-Id: 16207
Message-Id: <adfe8879faff27f4114b.1470675982@devbig314.prn1.facebook.com>
To: <mercurial-devel@mercurial-scm.org>
Date: Mon, 8 Aug 2016 10:06:22 -0700

# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1470675947 25200
#      Mon Aug 08 10:05:47 2016 -0700
# Node ID adfe8879faff27f4114bcb02950e08b58e4718d8
# Parent  6ff0454f1f230aaa62263515cb49b4e4c86dc50b
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.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1024,7 +1024,7 @@ def bmactive(repo):
 ### 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()