changeset 1513:07c38eee3954

obsolete: support obsolete.isenabled obsolete._enabled is the old deprecated way of checking if obsolete markers is on. Instead we should be using obsolete.isenabled() to check if individual features are on.
author Durham Goode <durham@fb.com>
date Wed, 28 Jun 2017 13:31:17 -0700
parents 6d0fe7ce9898
children bdffbddfa704
files hgsubversion/wrappers.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -207,7 +207,8 @@ def push(repo, dest, force, revs):
     old_encoding = util.swap_out_encoding()
 
     try:
-        hasobsolete = obsolete._enabled
+        hasobsolete = (obsolete._enabled or
+                       obsolete.isenabled(repo, obsolete.createmarkersopt))
     except:
         hasobsolete = False