# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1391718605 21600
# Node ID 0f16e11b2c2bccb2f92d5f9a741d031eac344769
# Parent  5cb6c95e028344bc10bbb4f1bd7f68b897daaff5
layouts: fix crash when importing hgext_hgsubversion

This change was introduced in 4a92eb1484ba and fixed importing issues for
mercurial < 2.8. Unfortunately, this broke imports for newer versions of
mercurial that have hgsubversion installed in sys.path.

We now wrap the import in a try-block to catch this ImportError.

diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py
--- a/hgsubversion/layouts/standard.py
+++ b/hgsubversion/layouts/standard.py
@@ -57,7 +57,12 @@ class StandardLayout(base.BaseLayout):
 
     def taglocations(self, meta_data_dir):
         # import late to avoid trouble when running the test suite
-        from hgext_hgsubversion import util
+        try:
+            # newer versions of mercurial >= 2.8 will import this because the
+            # hgext_ logic is already being done in core
+            from hgsubversion import util
+        except ImportError:
+            from hgext_hgsubversion import util
 
         if self._tag_locations is None: