# HG changeset patch
# User Christian Boos <cboos@edgewall.org>
# Date 1347876592 -7200
# Node ID 62e59cafa3de63fc779f0f7f11294654008a1062
# Parent  c77621b0f6bb495d7eb18f9ce53e22c883782846# Parent  45f04cd0ada87984120e378b1964ee9f261d8126
Merge #10851 fix from 0.12 and bump version to 1.0.0.2

diff -r c77621b0f6bb -r 62e59cafa3de setup.cfg
--- a/setup.cfg	Mon Sep 17 12:08:19 2012 +0200
+++ b/setup.cfg	Mon Sep 17 12:09:52 2012 +0200
@@ -1,5 +1,5 @@
 [egg_info]
-tag_build = dev
+tag_build = 
 tag_svn_revision = true
 
 [extract_messages]
diff -r c77621b0f6bb -r 62e59cafa3de setup.py
--- a/setup.py	Mon Sep 17 12:08:19 2012 +0200
+++ b/setup.py	Mon Sep 17 12:09:52 2012 +0200
@@ -39,7 +39,7 @@
       install_requires='Trac >=1.0dev',
       description='Mercurial plugin for Trac (1.0 branch)',
       keywords='trac scm plugin mercurial hg',
-      version='1.0.0.1',
+      version='1.0.0.2',
       url=TracMercurial,
       license='GPL',
       author='Christian Boos',
diff -r c77621b0f6bb -r 62e59cafa3de tracext/hg/backend.py
--- a/tracext/hg/backend.py	Mon Sep 17 12:08:19 2012 +0200
+++ b/tracext/hg/backend.py	Mon Sep 17 12:09:52 2012 +0200
@@ -86,9 +86,12 @@
         hg_import_error = "Couldn't import symbols: "+','.join(hg_import_error)
 
     # Mercurial versions >= 1.2 won't have mercurial.repo.RepoError anymore
-    from mercurial.repo import RepoError
+    try:
+        from mercurial.repo import RepoError
+    except ImportError: # Mercurial 2.3.1 doesn't even have mercurial.repo!
+        RepoError = None
     from mercurial.revlog import LookupError as HgLookupError
-    if repr(RepoError) == "<unloaded module 'RepoError'>":
+    if RepoError is None or repr(RepoError) == "<unloaded module 'RepoError'>":
         from mercurial.error import RepoError, LookupError as HgLookupError
 
     # Force local encoding to be non-lossy (#7217)