# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1385147399 28800
# Node ID 91cf81a362369f8ffdcd2e8ff3beb862fa497aba
# Parent  c6f7a8cfeca9fd362b71c36936a35f36b13a34d0
svnexternals: import pathutil.canonpath if available

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

diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py
--- a/hgsubversion/svnexternals.py
+++ b/hgsubversion/svnexternals.py
@@ -16,9 +16,13 @@ passpegrev = True # see svnsubrepo below
 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