Mercurial > hgsubversion
diff hgsubversion/__init__.py @ 1567:4442a2f42843
hgsubversion: work around loss of demandimport alias
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Sat, 26 May 2018 17:33:10 -0400 |
parents | 0099cf9a9a8b |
children | 7da8a38ff969 |
line wrap: on
line diff
--- a/hgsubversion/__init__.py +++ b/hgsubversion/__init__.py @@ -32,14 +32,24 @@ from mercurial import help from mercurial import hg from mercurial import localrepo from mercurial import util as hgutil -from mercurial import demandimport -demandimport.ignore.extend([ - 'svn', - 'svn.client', - 'svn.core', - 'svn.delta', - 'svn.ra', +try: + from mercurial import demandimport + demandimport.ignore.extend([ + 'svn', + 'svn.client', + 'svn.core', + 'svn.delta', + 'svn.ra', ]) +except (ImportError, AttributeError): + from hgdemandimport import demandimport + demandimport.ignores |= { + 'svn', + 'svn.client', + 'svn.core', + 'svn.delta', + 'svn.ra', + } from mercurial import revset from mercurial import subrepo