Skip to content
Snippets Groups Projects
Commit cef9eaae authored by Kevin Bullock's avatar Kevin Bullock
Browse files

compat: drop compatibility check for ignore module

parent 60c2da67
No related branches found
No related tags found
No related merge requests found
...@@ -59,14 +59,6 @@ ...@@ -59,14 +59,6 @@
# We only *use* the exchange module in hg 3.2+, so this is safe # We only *use* the exchange module in hg 3.2+, so this is safe
pass pass
# COMPAT: hg 3.5 - ignore module was removed
try:
from mercurial import ignore
ignore.readpats
ignoremod = True
except (AttributeError, ImportError):
ignoremod = False
# COMPAT: hg 3.0 - revset.baseset was added # COMPAT: hg 3.0 - revset.baseset was added
baseset = set baseset = set
try: try:
...@@ -224,8 +216,7 @@ ...@@ -224,8 +216,7 @@
if not isinstance(repo, gitrepo.gitrepo): if not isinstance(repo, gitrepo.gitrepo):
if (getattr(dirstate, 'rootcache', False) and if (getattr(dirstate, 'rootcache', False) and
(not ignoremod or getattr(ignore, 'readpats', False)) and
hgutil.safehasattr(repo, 'vfs') and hgutil.safehasattr(repo, 'vfs') and
os.path.exists(compat.gitvfs(repo).join('git'))): os.path.exists(compat.gitvfs(repo).join('git'))):
# only install our dirstate wrapper if it has a hope of working # only install our dirstate wrapper if it has a hope of working
import gitdirstate import gitdirstate
...@@ -228,11 +219,7 @@ ...@@ -228,11 +219,7 @@
hgutil.safehasattr(repo, 'vfs') and hgutil.safehasattr(repo, 'vfs') and
os.path.exists(compat.gitvfs(repo).join('git'))): os.path.exists(compat.gitvfs(repo).join('git'))):
# only install our dirstate wrapper if it has a hope of working # only install our dirstate wrapper if it has a hope of working
import gitdirstate import gitdirstate
if ignoremod:
def ignorewrap(orig, *args, **kwargs):
return gitdirstate.gignore(*args, **kwargs)
extensions.wrapfunction(ignore, 'ignore', ignorewrap)
dirstate.dirstate = gitdirstate.gitdirstate dirstate.dirstate = gitdirstate.gitdirstate
klass = hgrepo.generate_repo_subclass(repo.__class__) klass = hgrepo.generate_repo_subclass(repo.__class__)
......
...@@ -13,14 +13,6 @@ ...@@ -13,14 +13,6 @@
import compat import compat
# COMPAT: hg 3.5 - ignore module was removed
try:
from mercurial import ignore
ignore.readpats
ignoremod = True
except (AttributeError, ImportError):
ignoremod = False
# COMPAT: hg 2.9 - pathauditor moved to pathutil # COMPAT: hg 2.9 - pathauditor moved to pathutil
try: try:
from mercurial import pathutil from mercurial import pathutil
...@@ -78,11 +70,7 @@ ...@@ -78,11 +70,7 @@
def gignore(root, files, warn, extrapatterns=None): def gignore(root, files, warn, extrapatterns=None):
allpats = [] allpats = []
pats = [] pats = [(f, ['include:%s' % f]) for f in files]
if ignoremod:
pats = ignore.readpats(root, files, warn)
else:
pats = [(f, ['include:%s' % f]) for f in files]
for f, patlist in pats: for f, patlist in pats:
allpats.extend(patlist) allpats.extend(patlist)
...@@ -97,11 +85,9 @@ ...@@ -97,11 +85,9 @@
try: try:
matchmod.match(root, '', [], patlist) matchmod.match(root, '', [], patlist)
except error.Abort, inst: except error.Abort, inst:
if not ignoremod: # in this case, patlist is ['include: FILE'], and
# in this case, patlist is ['include: FILE'], and # inst[0] should already include FILE
# inst[0] should already include FILE raise
raise
raise error.Abort('%s: %s' % (f, inst[0]))
if extrapatterns: if extrapatterns:
try: try:
matchmod.match(root, '', [], extrapatterns) matchmod.match(root, '', [], extrapatterns)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment