[PATCH 7 of 9] fileset: remove callexisting flag and mctx.existing() (API)
Yuya Nishihara
yuya at tcha.org
Tue Jul 10 11:07:45 EDT 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1528551111 -32400
# Sat Jun 09 22:31:51 2018 +0900
# Node ID 4f00b1591bc243d1b0cfebdd15fad04407f8c653
# Parent c1dfe5a824d0613dff059ef070dfe3fc4e35b8c1
fileset: remove callexisting flag and mctx.existing() (API)
They are no longer needed since any files are included as long as they are
passed in to the matcher.
diff --git a/mercurial/fileset.py b/mercurial/fileset.py
--- a/mercurial/fileset.py
+++ b/mercurial/fileset.py
@@ -181,12 +181,7 @@ def listmatch(mctx, x, y):
def func(mctx, a, b):
funcname = getsymbol(a)
if funcname in symbols:
- enabled = mctx._existingenabled
- mctx._existingenabled = funcname in _existingcallers
- try:
- return symbols[funcname](mctx, b)
- finally:
- mctx._existingenabled = enabled
+ return symbols[funcname](mctx, b)
keep = lambda fn: getattr(fn, '__doc__', None) is not None
@@ -203,9 +198,6 @@ symbols = {}
# filesets using matchctx.status()
_statuscallers = set()
-# filesets using matchctx.existing()
-_existingcallers = set()
-
predicate = registrar.filesetpredicate()
@predicate('modified()', callstatus=True)
@@ -285,7 +277,7 @@ def tracked(mctx, x):
getargs(x, 0, 0, _("tracked takes no arguments"))
return mctx.predicate(mctx.ctx.__contains__, predrepr='tracked')
- at predicate('binary()', callexisting=True)
+ at predicate('binary()')
def binary(mctx, x):
"""File that appears to be binary (contains NUL bytes).
"""
@@ -294,7 +286,7 @@ def binary(mctx, x):
return mctx.fpredicate(lambda fctx: fctx.isbinary(),
predrepr='binary', cache=True)
- at predicate('exec()', callexisting=True)
+ at predicate('exec()')
def exec_(mctx, x):
"""File that is marked as executable.
"""
@@ -303,7 +295,7 @@ def exec_(mctx, x):
ctx = mctx.ctx
return mctx.predicate(lambda f: ctx.flags(f) == 'x', predrepr='exec')
- at predicate('symlink()', callexisting=True)
+ at predicate('symlink()')
def symlink(mctx, x):
"""File that is marked as a symlink.
"""
@@ -354,7 +346,7 @@ def portable(mctx, x):
return mctx.predicate(lambda f: util.checkwinfilename(f) is None,
predrepr='portable')
- at predicate('grep(regex)', callexisting=True)
+ at predicate('grep(regex)')
def grep(mctx, x):
"""File contains the given regular expression.
"""
@@ -408,7 +400,7 @@ def sizematcher(expr):
b = _sizetomax(expr)
return lambda x: x >= a and x <= b
- at predicate('size(expression)', callexisting=True)
+ at predicate('size(expression)')
def size(mctx, x):
"""File size matches the given expression. Examples:
@@ -423,7 +415,7 @@ def size(mctx, x):
return mctx.fpredicate(lambda fctx: m(fctx.size()),
predrepr=('size(%r)', expr), cache=True)
- at predicate('encoding(name)', callexisting=True)
+ at predicate('encoding(name)')
def encoding(mctx, x):
"""File can be successfully decoded with the given character
encoding. May not be useful for encodings other than ASCII and
@@ -445,7 +437,7 @@ def encoding(mctx, x):
return mctx.fpredicate(encp, predrepr=('encoding(%r)', enc), cache=True)
- at predicate('eol(style)', callexisting=True)
+ at predicate('eol(style)')
def eol(mctx, x):
"""File contains newlines of the given style (dos, unix, mac). Binary
files are excluded, files with mixed line endings match multiple
@@ -566,7 +558,7 @@ class matchctx(object):
self.subset = subset
self._status = status
self._badfn = badfn
- self._existingenabled = False
+
def status(self):
return self._status
@@ -621,17 +613,6 @@ class matchctx(object):
def filter(self, files):
return [f for f in files if f in self.subset]
- def existing(self):
- if not self._existingenabled:
- raise error.ProgrammingError('unexpected existing() invocation')
- if self._status is not None:
- removed = set(self._status[3])
- unknown = set(self._status[4] + self._status[5])
- else:
- removed = set()
- unknown = set()
- return (f for f in self.subset
- if (f in self.ctx and f not in removed) or f in unknown)
def switch(self, ctx, status=None):
subset = self.filter(_buildsubset(ctx, status))
@@ -683,13 +664,7 @@ def match(ctx, expr, badfn=None):
def _buildstatus(ctx, tree, basectx=None):
# do we need status info?
- # temporaty boolean to simplify the next conditional
- purewdir = ctx.rev() is None and basectx is None
-
- if (_intree(_statuscallers, tree) or
- # Using matchctx.existing() on a workingctx requires us to check
- # for deleted files.
- (purewdir and _intree(_existingcallers, tree))):
+ if _intree(_statuscallers, tree):
unknown = _intree(['unknown'], tree)
ignored = _intree(['ignored'], tree)
@@ -711,10 +686,8 @@ def loadpredicate(ui, extname, registrar
symbols[name] = func
if func._callstatus:
_statuscallers.add(name)
- if func._callexisting:
- _existingcallers.add(name)
-# load built-in predicates explicitly to setup _statuscallers/_existingcallers
+# load built-in predicates explicitly to setup _statuscallers
loadpredicate(None, None, predicate)
# tell hggettext to extract docstrings from these functions:
diff --git a/mercurial/registrar.py b/mercurial/registrar.py
--- a/mercurial/registrar.py
+++ b/mercurial/registrar.py
@@ -247,10 +247,6 @@ class filesetpredicate(_funcregistrarbas
implies 'matchctx.status()' at runtime or not (False, by
default).
- Optional argument 'callexisting' indicates whether a predicate
- implies 'matchctx.existing()' at runtime or not (False, by
- default).
-
'filesetpredicate' instance in example above can be used to
decorate multiple functions.
@@ -263,9 +259,8 @@ class filesetpredicate(_funcregistrarbas
_getname = _funcregistrarbase._parsefuncdecl
_docformat = "``%s``\n %s"
- def _extrasetup(self, name, func, callstatus=False, callexisting=False):
+ def _extrasetup(self, name, func, callstatus=False):
func._callstatus = callstatus
- func._callexisting = callexisting
class _templateregistrarbase(_funcregistrarbase):
"""Base of decorator to register functions as template specific one
diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -448,27 +448,6 @@ Test safety of 'encoding' on removed fil
mixed
unknown
-Test detection of unintentional 'matchctx.existing()' invocation
-
- $ cat > $TESTTMP/existingcaller.py <<EOF
- > from mercurial import registrar
- >
- > filesetpredicate = registrar.filesetpredicate()
- > @filesetpredicate(b'existingcaller()', callexisting=False)
- > def existingcaller(mctx, x):
- > # this 'mctx.existing()' invocation is unintentional
- > existing = set(mctx.existing())
- > return mctx.predicate(existing.__contains__, cache=False)
- > EOF
-
- $ cat >> .hg/hgrc <<EOF
- > [extensions]
- > existingcaller = $TESTTMP/existingcaller.py
- > EOF
-
- $ fileset 'existingcaller()' 2>&1 | tail -1
- *ProgrammingError: *unexpected existing() invocation* (glob)
-
Test 'revs(...)'
================
More information about the Mercurial-devel
mailing list