This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3917

grep: search working directory files by default if --all-files is specified
ClosedPublic

Authored by yuja on Jul 11 2018, 10:15 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGeba69ddd4e52: grep: search working directory files by default if --all-files is specified
Summary

The default was -rtip:0 before, but "--all-files -rtip:0" would be the most
useless combination, and it isn't supported yet. Let's change the default to
something useful.

This isn't flagged as BC since --all-files isn't released.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mtests/test-grep.t (12 lines)

Diff 9534

mercurial/commands.py

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'))
if opts.get('all_files') and not opts.get('rev'):
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))

tests/test-grep.t

$ echo "something else" >> new $ echo "something else" >> new
$ hg ci -A -m "second commit" $ hg ci -A -m "second commit"
adding new adding new
$ hg grep -r "." "unmod" $ hg grep -r "." "unmod"
[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
$ echo modified >> new
$ hg grep --all-files mod
new:2147483647:modified
um:2147483647:unmod
which can be overridden by -rREV
$ hg grep --all-files -r. mod
um:1: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]
$ cd .. $ cd ..