Mercurial > hg > trac > jungle > src > mercurial-plugin
changeset 13:62e59cafa3de 1.0
Merge #10851 fix from 0.12 and bump version to 1.0.0.2
| author | Christian Boos <cboos@edgewall.org> |
|---|---|
| date | Mon, 17 Sep 2012 12:09:52 +0200 |
| parents | c77621b0f6bb (current diff) 45f04cd0ada8 (diff) |
| children | 32fd17a943f7 |
| files | setup.py tracext/hg/backend.py |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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]
--- 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',
--- 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)