Mercurial > hg
diff hgext/fix.py @ 40533:2ecf5c24d0cd
fix: rename :fileset subconfig to :pattern
This name was always inaccurate, since the config accepts any pattern.
Hopefully so few people use this right now that it won't matter, but there will
now be a warning if the old config name is used.
Differential Revision: https://phab.mercurial-scm.org/D5226
author | Danny Hooper <hooper@google.com> |
---|---|
date | Mon, 05 Nov 2018 16:05:45 -0800 |
parents | 93bab80993f4 |
children | b9557567cc3f |
line wrap: on
line diff
--- a/hgext/fix.py Wed Oct 31 13:11:51 2018 -0700 +++ b/hgext/fix.py Mon Nov 05 16:05:45 2018 -0800 @@ -15,7 +15,7 @@ [fix] clang-format:command=clang-format --assume-filename={rootpath} clang-format:linerange=--lines={first}:{last} - clang-format:fileset=set:**.cpp or **.hpp + clang-format:pattern=set:**.cpp or **.hpp The :command suboption forms the first part of the shell command that will be used to fix a file. The content of the file is passed on standard input, and the @@ -36,9 +36,9 @@ {first} The 1-based line number of the first line in the modified range {last} The 1-based line number of the last line in the modified range -The :fileset suboption determines which files will be passed through each -configured tool. See :hg:`help fileset` for possible values. If there are file -arguments to :hg:`fix`, the intersection of these filesets is used. +The :pattern suboption determines which files will be passed through each +configured tool. See :hg:`help patterns` for possible values. If there are file +arguments to :hg:`fix`, the intersection of these patterns is used. There is also a configurable limit for the maximum size of file that will be processed by :hg:`fix`:: @@ -100,7 +100,7 @@ configitem = registrar.configitem(configtable) # Register the suboptions allowed for each configured fixer. -FIXER_ATTRS = ('command', 'linerange', 'fileset') +FIXER_ATTRS = ('command', 'linerange', 'fileset', 'pattern') for key in FIXER_ATTRS: configitem('fix', '.*(:%s)?' % key, default=None, generic=True) @@ -606,6 +606,10 @@ for name in fixernames(ui): result[name] = Fixer() attrs = ui.configsuboptions('fix', name)[1] + if 'fileset' in attrs and 'pattern' not in attrs: + ui.warn(_('the fix.tool:fileset config name is deprecated; ' + 'please rename it to fix.tool:pattern\n')) + attrs['pattern'] = attrs['fileset'] for key in FIXER_ATTRS: setattr(result[name], pycompat.sysstr('_' + key), attrs.get(key, '')) @@ -624,7 +628,7 @@ def affects(self, opts, fixctx, path): """Should this fixer run on the file at the given path and context?""" - return scmutil.match(fixctx, [self._fileset], opts)(path) + return scmutil.match(fixctx, [self._pattern], opts)(path) def command(self, ui, path, rangesfn): """A shell command to use to invoke this fixer on the given file/lines