| pulkit |
| hg-reviewers |
This allows us to conditionally enable the new behavior to unbreak
python-hglib. See the next patch.
The config option is undocumented since the --all-files is still experimental
and isn't fully implemented. It can be moved to [experimental] if that's
preferred.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (10 lines) | |||
| M | mercurial/configitems.py (3 lines) | |||
| M | tests/test-grep.t (13 lines) |
| _('follow changeset history,' | _('follow changeset history,' | ||||
| ' or file history across copies and renames')), | ' or file history across copies and renames')), | ||||
| ('i', 'ignore-case', None, _('ignore case when matching')), | ('i', 'ignore-case', None, _('ignore case when matching')), | ||||
| ('l', 'files-with-matches', None, | ('l', 'files-with-matches', None, | ||||
| _('print only filenames and revisions that match')), | _('print only filenames and revisions that match')), | ||||
| ('n', 'line-number', None, _('print matching line numbers')), | ('n', 'line-number', None, _('print matching line numbers')), | ||||
| ('r', 'rev', [], | ('r', 'rev', [], | ||||
| _('only search files changed within revision range'), _('REV')), | _('only search files changed within revision range'), _('REV')), | ||||
| ('', 'all-files', False, | ('', 'all-files', None, | ||||
| _('include all files in the changeset while grepping (EXPERIMENTAL)')), | _('include all files in the changeset while grepping (EXPERIMENTAL)')), | ||||
| ('u', 'user', None, _('list the author (long with -v)')), | ('u', 'user', None, _('list the author (long with -v)')), | ||||
| ('d', 'date', None, _('list the date (short with -q)')), | ('d', 'date', None, _('list the date (short with -q)')), | ||||
| ] + formatteropts + walkopts, | ] + formatteropts + walkopts, | ||||
| _('[OPTION]... PATTERN [FILE]...'), | _('[OPTION]... PATTERN [FILE]...'), | ||||
| inferrepo=True, | inferrepo=True, | ||||
| intents={INTENT_READONLY}) | intents={INTENT_READONLY}) | ||||
| def grep(ui, repo, pattern, *pats, **opts): | def grep(ui, repo, pattern, *pats, **opts): | ||||
| current branch or have been deleted in a prior changeset. | current branch or have been deleted in a prior changeset. | ||||
| Returns 0 if a match is found, 1 otherwise. | Returns 0 if a match is found, 1 otherwise. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| diff = opts.get('all') or opts.get('diff') | diff = opts.get('all') or opts.get('diff') | ||||
| if diff and opts.get('all_files'): | if diff and opts.get('all_files'): | ||||
| raise error.Abort(_('--diff and --all-files are mutually exclusive')) | raise error.Abort(_('--diff and --all-files are mutually exclusive')) | ||||
| # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working | |||||
| if opts.get('all_files') is None and not opts.get('rev') and not diff: | |||||
| # experimental config: commands.grep.all-files | |||||
| opts['all_files'] = ui.configbool('commands', 'grep.all-files') | |||||
| if opts.get('all_files') and not opts.get('rev'): | if opts.get('all_files') and not opts.get('rev'): | ||||
| opts['rev'] = ['wdir()'] | opts['rev'] = ['wdir()'] | ||||
| reflags = re.M | reflags = re.M | ||||
| if opts.get('ignore_case'): | if opts.get('ignore_case'): | ||||
| reflags |= re.I | reflags |= re.I | ||||
| try: | try: | ||||
| regexp = util.re.compile(pattern, reflags) | regexp = util.re.compile(pattern, reflags) | ||||
| except re.error as inst: | except re.error as inst: | ||||
| ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) | ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) | ||||
| return 1 | return 1 | ||||
| sep, eol = ':', '\n' | sep, eol = ':', '\n' | ||||
| if opts.get('print0'): | if opts.get('print0'): | ||||
| sep = eol = '\0' | sep = eol = '\0' | ||||
| if not opts.get('rev') and not diff: | |||||
| opts['rev'] = ["wdir()"] | |||||
| opts['all_files'] = True | |||||
| getfile = util.lrucachefunc(repo.file) | getfile = util.lrucachefunc(repo.file) | ||||
| def matchlines(body): | def matchlines(body): | ||||
| begin = 0 | begin = 0 | ||||
| linenum = 0 | linenum = 0 | ||||
| while begin < len(body): | while begin < len(body): | ||||
| match = regexp.search(body, begin) | match = regexp.search(body, begin) | ||||
| if not match: | if not match: | ||||
| generic=True, | generic=True, | ||||
| ) | ) | ||||
| coreconfigitem('color', 'mode', | coreconfigitem('color', 'mode', | ||||
| default='auto', | default='auto', | ||||
| ) | ) | ||||
| coreconfigitem('color', 'pagermode', | coreconfigitem('color', 'pagermode', | ||||
| default=dynamicdefault, | default=dynamicdefault, | ||||
| ) | ) | ||||
| coreconfigitem('commands', 'grep.all-files', | |||||
| default=True, | |||||
| ) | |||||
| coreconfigitem('commands', 'show.aliasprefix', | coreconfigitem('commands', 'show.aliasprefix', | ||||
| default=list, | default=list, | ||||
| ) | ) | ||||
| coreconfigitem('commands', 'status.relative', | coreconfigitem('commands', 'status.relative', | ||||
| default=False, | default=False, | ||||
| ) | ) | ||||
| coreconfigitem('commands', 'status.skipstates', | coreconfigitem('commands', 'status.skipstates', | ||||
| default=[], | default=[], | ||||
| new:2147483647:modified | new:2147483647:modified | ||||
| um:2147483647:unmod | um:2147483647:unmod | ||||
| which can be overridden by -rREV | which can be overridden by -rREV | ||||
| $ hg grep --all-files -r. mod | $ hg grep --all-files -r. mod | ||||
| um:1:unmod | um:1:unmod | ||||
| commands.all-files can be negated by --no-all-files | |||||
| $ hg grep --config commands.grep.all-files=True mod | |||||
| new:2147483647:modified | |||||
| um:2147483647:unmod | |||||
| $ hg grep --config commands.grep.all-files=True --no-all-files mod | |||||
| um:0:unmod | |||||
| --diff --all-files makes no sense since --diff is the option to grep history | --diff --all-files makes no sense since --diff is the option to grep history | ||||
| $ hg grep --diff --all-files um | $ hg grep --diff --all-files um | ||||
| abort: --diff and --all-files are mutually exclusive | abort: --diff and --all-files are mutually exclusive | ||||
| [255] | [255] | ||||
| but --diff should precede the commands.grep.all-files option | |||||
| $ hg grep --config commands.grep.all-files=True --diff mod | |||||
| um:0:+:unmod | |||||
| $ cd .. | $ cd .. | ||||
| Fix_Wdir(): test that passing wdir() t -r flag does greps on the | Fix_Wdir(): test that passing wdir() t -r flag does greps on the | ||||
| files modified in the working directory | files modified in the working directory | ||||
| $ cd a | $ cd a | ||||
| $ echo "abracadara" >> a | $ echo "abracadara" >> a | ||||
| $ hg add a | $ hg add a | ||||