Mercurial > hg-stable
changeset 8567:fea40a677d43
match: add some default args
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 24 May 2009 02:56:14 -0500 |
| parents | 744d6322b05b |
| children | 4fa1618bf495 |
| files | hgext/acl.py hgext/keyword.py mercurial/filemerge.py mercurial/ignore.py mercurial/localrepo.py mercurial/match.py |
| diffstat | 6 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/acl.py Sun May 24 02:56:14 2009 -0500 +++ b/hgext/acl.py Sun May 24 02:56:14 2009 -0500 @@ -60,7 +60,7 @@ ui.debug(_('acl: %s enabled, %d entries for user %s\n') % (key, len(pats), user)) if pats: - return match.match(repo.root, '', pats, [], [], 'glob') + return match.match(repo.root, '', pats) return match.never(repo.root, '')
--- a/hgext/keyword.py Sun May 24 02:56:14 2009 -0500 +++ b/hgext/keyword.py Sun May 24 02:56:14 2009 -0500 @@ -126,7 +126,7 @@ self.ui = ui self.repo = repo self.matcher = match.match(repo.root, '', [], - kwtools['inc'], kwtools['exc'], 'glob') + kwtools['inc'], kwtools['exc']) self.restrict = kwtools['hgcmd'] in restricted.split() kwmaps = self.ui.configitems('keywordmaps')
--- a/mercurial/filemerge.py Sun May 24 02:56:14 2009 -0500 +++ b/mercurial/filemerge.py Sun May 24 02:56:14 2009 -0500 @@ -55,7 +55,7 @@ # then patterns for pat, tool in ui.configitems("merge-patterns"): - mf = match.match(repo.root, '', [pat], [], [], 'glob') + mf = match.match(repo.root, '', [pat]) if mf(path) and check(tool, pat, symlink, False): toolpath = _findtool(ui, tool) return (tool, '"' + toolpath + '"')
--- a/mercurial/ignore.py Sun May 24 02:56:14 2009 -0500 +++ b/mercurial/ignore.py Sun May 24 02:56:14 2009 -0500 @@ -80,12 +80,12 @@ return util.never try: - ignorefunc = match.match(root, '', [], allpats, [], 'glob') + ignorefunc = match.match(root, '', [], allpats) except util.Abort: # Re-raise an exception where the src is the right file for f, patlist in pats.iteritems(): try: - match.match(root, '', [], patlist, [], 'glob') + match.match(root, '', [], patlist) except util.Abort, inst: raise util.Abort('%s: %s' % (f, inst[0]))
--- a/mercurial/localrepo.py Sun May 24 02:56:14 2009 -0500 +++ b/mercurial/localrepo.py Sun May 24 02:56:14 2009 -0500 @@ -528,7 +528,7 @@ for pat, cmd in self.ui.configitems(filter): if cmd == '!': continue - mf = match_.match(self.root, '', [pat], [], [], 'glob') + mf = match_.match(self.root, '', [pat]) fn = None params = cmd for name, filterfn in self._datafilters.iteritems():
--- a/mercurial/match.py Sun May 24 02:56:14 2009 -0500 +++ b/mercurial/match.py Sun May 24 02:56:14 2009 -0500 @@ -48,7 +48,8 @@ _match.__init__(self, root, cwd, files, self.exact, False) class match(_match): - def __init__(self, root, cwd, patterns, include, exclude, default): + def __init__(self, root, cwd, patterns, include=[], exclude=[], + default='glob'): f, mf, ap = util.matcher(root, cwd, patterns, include, exclude, default) _match.__init__(self, root, cwd, f, mf, ap)