# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1527370390 14400
# Node ID 4442a2f428436d32b83543ca2fdbaf0691381b5d
# Parent  c28c757ffe16dbb6c1e8b9263755612d6dc65228
hgsubversion: work around loss of demandimport alias

diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -32,14 +32,24 @@ from mercurial import help
 from mercurial import hg
 from mercurial import localrepo
 from mercurial import util as hgutil
-from mercurial import demandimport
-demandimport.ignore.extend([
-    'svn',
-    'svn.client',
-    'svn.core',
-    'svn.delta',
-    'svn.ra',
+try:
+    from mercurial import demandimport
+    demandimport.ignore.extend([
+        'svn',
+        'svn.client',
+        'svn.core',
+        'svn.delta',
+        'svn.ra',
     ])
+except (ImportError, AttributeError):
+    from hgdemandimport import demandimport
+    demandimport.ignores |= {
+        'svn',
+        'svn.client',
+        'svn.core',
+        'svn.delta',
+        'svn.ra',
+    }
 
 from mercurial import revset
 from mercurial import subrepo