| pulkit |
| hg-reviewers |
I believe nobody would want to see the "2147483647:" prefix while grepping
working directory files.
The wdir revision is still visible if "-r wdir()" is specified since a revset
may point to more than one revisions, and it seems confusing to change the
visibility dynamically by the number of the matched revisions.
| 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 (5 lines) | |||
| M | tests/test-grep.t (30 lines) |
| 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 | # 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: | if opts.get('all_files') is None and not opts.get('rev') and not diff: | ||||
| # experimental config: commands.grep.all-files | # experimental config: commands.grep.all-files | ||||
| opts['all_files'] = ui.configbool('commands', 'grep.all-files') | opts['all_files'] = ui.configbool('commands', 'grep.all-files') | ||||
| if opts.get('all_files') and not opts.get('rev'): | plaingrep = opts.get('all_files') and not opts.get('rev') | ||||
| if plaingrep: | |||||
| 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: | ||||
| iter = [('', l) for l in states] | iter = [('', l) for l in states] | ||||
| for change, l in iter: | for change, l in iter: | ||||
| fm.startitem() | fm.startitem() | ||||
| fm.context(ctx=ctx) | fm.context(ctx=ctx) | ||||
| fm.data(node=fm.hexfunc(scmutil.binnode(ctx))) | fm.data(node=fm.hexfunc(scmutil.binnode(ctx))) | ||||
| cols = [ | cols = [ | ||||
| ('filename', fn, True), | ('filename', fn, True), | ||||
| ('rev', rev, True), | ('rev', rev, not plaingrep), | ||||
| ('linenumber', l.linenum, opts.get('line_number')), | ('linenumber', l.linenum, opts.get('line_number')), | ||||
| ] | ] | ||||
| if diff: | if diff: | ||||
| cols.append(('change', change, True)) | cols.append(('change', change, True)) | ||||
| cols.extend([ | cols.extend([ | ||||
| ('user', formatuser(ctx.user()), opts.get('user')), | ('user', formatuser(ctx.user()), opts.get('user')), | ||||
| ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | ||||
| ]) | ]) | ||||
| [1] | [1] | ||||
| $ hg grep -r "." "unmod" --all-files | $ hg grep -r "." "unmod" --all-files | ||||
| um:1:unmod | um:1:unmod | ||||
| With --all-files, the working directory is searched by default | With --all-files, the working directory is searched by default | ||||
| $ echo modified >> new | $ echo modified >> new | ||||
| $ hg grep --all-files mod | $ hg grep --all-files mod | ||||
| new:2147483647:modified | new:modified | ||||
| um:2147483647:unmod | um: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 | commands.all-files can be negated by --no-all-files | ||||
| $ hg grep --config commands.grep.all-files=True mod | $ hg grep --config commands.grep.all-files=True mod | ||||
| new:2147483647:modified | new:modified | ||||
| um:2147483647:unmod | um:unmod | ||||
| $ hg grep --config commands.grep.all-files=True --no-all-files mod | $ hg grep --config commands.grep.all-files=True --no-all-files mod | ||||
| um:0:unmod | 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] | ||||
| $ cat <<'EOF' >> .hg/hgrc | $ cat <<'EOF' >> .hg/hgrc | ||||
| > [ui] | > [ui] | ||||
| > tweakdefaults = True | > tweakdefaults = True | ||||
| > EOF | > EOF | ||||
| $ echo "some text">>file1 | $ echo "some text">>file1 | ||||
| $ hg add file1 | $ hg add file1 | ||||
| $ hg commit -m "adds file1" | $ hg commit -m "adds file1" | ||||
| $ hg mv file1 file2 | $ hg mv file1 file2 | ||||
| wdir revision is hidden by default: | |||||
| $ hg grep "some" | $ hg grep "some" | ||||
| file2:2147483647:some text | file2:some text | ||||
| but it should be available in template dict: | |||||
| $ hg grep "some" -Tjson | |||||
| [ | |||||
| { | |||||
| "date": [0, 0], | |||||
| "file": "file2", | |||||
| "line_number": 1, | |||||
| "node": "ffffffffffffffffffffffffffffffffffffffff", | |||||
| "rev": 2147483647, | |||||
| "texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}], | |||||
| "user": "test" | |||||
| } | |||||
| ] | |||||
| $ cd .. | |||||