Commits

Siddharth Agarwal  committed 91cf81a

svnexternals: import pathutil.canonpath if available

hgsubversion broke with upstream Mercurial due to f962870712da. This fixes
that.

  • Participants
  • Parent commits c6f7a8c

Comments (0)

Files changed (1)

File hgsubversion/svnexternals.py

 try:
     canonpath = hgutil.canonpath
 except (ImportError, AttributeError):
-    from mercurial import scmutil
-    canonpath = scmutil.canonpath
     passpegrev = False
+    try:
+        from mercurial import scmutil
+        canonpath = scmutil.canonpath
+    except (ImportError, AttributeError):
+        from mercurial import pathutil
+        canonpath = pathutil.canonpath
 
 import util