This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3763

grep: add `--diff` flag
ClosedPublic

Authored by sangeet259 on Jun 17 2018, 6:31 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7fbb5d76c555: grep: add --diff flag
Summary

adds a diff flag, which works exactly same as all, infact since
-all searches diffs, there diff is a better name for it.
The all flag is still here for backward compatibility reasons.
Some major tests for all has been picked and added for diff.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sangeet259 created this revision.Jun 17 2018, 6:31 AM
pulkit added a subscriber: pulkit.Jun 18 2018, 4:14 PM
pulkit added inline comments.
mercurial/commands.py
2394

We definitely need better help text here to mention that it looks at the diff not all the content.

2424

To deprecate a flag, we need to add (DEPRECATED) after the help text of the flag. Look for DEPRECATED, EXPERIMENTAL, ADVANCED in commands.py, you will find examples.

Also, I suggest you to make a separate patch for deprecating the flag.

2533

nit: it will be better if we can initialize a variable and store opts.get('all') and opts.get('diff') in it and reuse that.

sangeet259 updated this revision to Diff 9217.Jun 19 2018, 4:42 AM
yuja added a subscriber: yuja.Jun 21 2018, 8:43 AM

Queued, thanks.

Can you send a follow-up to deprecate the --all option?
It doesn't make sense to provide both --all and --diff in user help.

[('0', 'print0', None, _('end fields with NUL')),
('', 'all', None, _('print all revisions that match')),

+ ('', 'diff', None, _('print all revisions when the term was introduced or removed')),

Next time, please make sure test-check-* pass.

Closed by commit rHG7fbb5d76c555: grep: add --diff flag (authored by sangeet259). · Explain WhyJun 21 2018, 8:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (11 lines)
Mtests/test-completion.t (2 lines)
Mtests/test-grep.t (20 lines)

Diff 9245

mercurial/commands.py

graftstate.delete() graftstate.delete()
ui.status(_("stopped the interrupted graft\n")) ui.status(_("stopped the interrupted graft\n"))
ui.status(_("working directory is now at %s\n") % pctx.hex()[:12]) ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
return 0 return 0
@command('grep', @command('grep',
[('0', 'print0', None, _('end fields with NUL')), [('0', 'print0', None, _('end fields with NUL')),
('', 'all', None, _('print all revisions that match')), ('', 'all', None, _('print all revisions that match')),
('', 'diff', None, _('print all revisions when the term was introduced '
pulkitUnsubmitted
Not Done

We definitely need better help text here to mention that it looks at the diff not all the content.

pulkit: We definitely need better help text here to mention that it looks at the diff not all the…
'or removed')),
('a', 'text', None, _('treat all files as text')), ('a', 'text', None, _('treat all files as text')),
('f', 'follow', None, ('f', 'follow', None,
_('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')),
Search revision history for a regular expression in the specified Search revision history for a regular expression in the specified
files or the entire project. files or the entire project.
By default, grep prints the most recent revision number for each By default, grep prints the most recent revision number for each
file in which it finds a match. To get it to print every revision file in which it finds a match. To get it to print every revision
that contains a change in match status ("-" for a match that becomes that contains a change in match status ("-" for a match that becomes
a non-match, or "+" for a non-match that becomes a match), use the a non-match, or "+" for a non-match that becomes a match), use the
--all flag. --diff/--all flag.
pulkitUnsubmitted
Not Done

To deprecate a flag, we need to add (DEPRECATED) after the help text of the flag. Look for DEPRECATED, EXPERIMENTAL, ADVANCED in commands.py, you will find examples.

Also, I suggest you to make a separate patch for deprecating the flag.

pulkit: To deprecate a flag, we need to add (DEPRECATED) after the help text of the flag. Look for…
PATTERN can be any Python (roughly Perl-compatible) regular PATTERN can be any Python (roughly Perl-compatible) regular
expression. expression.
If no FILEs are specified (and -f/--follow isn't set), all files in If no FILEs are specified (and -f/--follow isn't set), all files in
the repository are searched, including those that don't exist in the the repository are searched, including those that don't exist in the
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')
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
def binary(): def binary():
flog = getfile(fn) flog = getfile(fn)
try: try:
return stringutil.binary(flog.read(ctx.filenode(fn))) return stringutil.binary(flog.read(ctx.filenode(fn)))
except error.WdirUnsupported: except error.WdirUnsupported:
return ctx[fn].isbinary() return ctx[fn].isbinary()
fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
if opts.get('all'): if diff:
pulkitUnsubmitted
Not Done

nit: it will be better if we can initialize a variable and store opts.get('all') and opts.get('diff') in it and reuse that.

pulkit: nit: it will be better if we can initialize a variable and store `opts.get('all') and opts.get…
iter = difflinestates(pstates, states) iter = difflinestates(pstates, states)
else: else:
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.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, True),
('linenumber', l.linenum, opts.get('line_number')), ('linenumber', l.linenum, opts.get('line_number')),
] ]
if opts.get('all'): 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')),
]) ])
lastcol = next(name for name, data, cond in reversed(cols) if cond) lastcol = next(name for name, data, cond in reversed(cols) if cond)
for name, data, cond in cols: for name, data, cond in cols:
field = fieldnamemap.get(name, name) field = fieldnamemap.get(name, name)
if fn in skip: if fn in skip:
if copy: if copy:
skip[copy] = True skip[copy] = True
continue continue
pstates = matches.get(parent, {}).get(copy or fn, []) pstates = matches.get(parent, {}).get(copy or fn, [])
if pstates or states: if pstates or states:
r = display(fm, fn, ctx, pstates, states) r = display(fm, fn, ctx, pstates, states)
found = found or r found = found or r
if r and not opts.get('all'): if r and not diff:
skip[fn] = True skip[fn] = True
if copy: if copy:
skip[copy] = True skip[copy] = True
del revfiles[rev] del revfiles[rev]
# We will keep the matches dict for the duration of the window # We will keep the matches dict for the duration of the window
# clear the matches dict once the window is over # clear the matches dict once the window is over
if not revfiles: if not revfiles:
matches.clear() matches.clear()

tests/test-completion.t

debugupdatecaches: debugupdatecaches:
debugupgraderepo: optimize, run debugupgraderepo: optimize, run
debugwalk: include, exclude debugwalk: include, exclude
debugwhyunstable: debugwhyunstable:
debugwireargs: three, four, five, ssh, remotecmd, insecure debugwireargs: three, four, five, ssh, remotecmd, insecure
debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
files: rev, print0, include, exclude, template, subrepos files: rev, print0, include, exclude, template, subrepos
graft: rev, continue, stop, edit, log, force, currentdate, currentuser, date, user, tool, dry-run graft: rev, continue, stop, edit, log, force, currentdate, currentuser, date, user, tool, dry-run
grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, allfiles, user, date, template, include, exclude grep: print0, all, diff, text, follow, ignore-case, files-with-matches, line-number, rev, allfiles, user, date, template, include, exclude
heads: rev, topo, active, closed, style, template heads: rev, topo, active, closed, style, template
help: extension, command, keyword, system help: extension, command, keyword, system
identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity import: strip, base, edit, force, no-commit, bypass, partial, exact, prefix, import-branch, message, logfile, date, user, similarity
incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos
locate: rev, print0, fullpath, include, exclude locate: rev, print0, fullpath, include, exclude
manifest: rev, all, template manifest: rev, all, template
outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos

tests/test-grep.t

$ hg ci -m 3 $ hg ci -m 3
$ hg grep orange $ hg grep orange
color:3:orange color:3:orange
$ hg grep --all orange $ hg grep --all orange
color:3:+:orange color:3:+:orange
color:2:-:orange color:2:-:orange
color:1:+:orange color:1:+:orange
$ hg grep --diff orange
color:3:+:orange
color:2:-:orange
color:1:+:orange
test substring match: '^' should only match at the beginning test substring match: '^' should only match at the beginning
$ hg grep '^.' --config extensions.color= --color debug $ hg grep '^.' --config extensions.color= --color debug
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue [grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
match in last "line" without newline match in last "line" without newline
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo blue > color $ echo blue > color
$ hg commit -A -m "3 blue" $ hg commit -A -m "3 blue"
$ hg grep --all red $ hg grep --all red
color:3:-:red color:3:-:red
color:1:+:red color:1:+:red
$ hg grep --diff red
color:3:-:red
color:1:+:red
Issue3885: test that changing revision order does not alter the Issue3885: test that changing revision order does not alter the
revisions printed, just their order. revisions printed, just their order.
$ hg grep --all red -r "all()" $ hg grep --all red -r "all()"
color:1:+:red color:1:+:red
color:3:-:red color:3:-:red
$ hg grep --all red -r "reverse(all())" $ hg grep --all red -r "reverse(all())"
color:3:-:red color:3:-:red
color:1:+:red color:1:+:red
$ hg grep --diff red -r "all()"
color:1:+:red
color:3:-:red
$ hg grep --diff red -r "reverse(all())"
color:3:-:red
color:1:+:red
$ cd .. $ cd ..
$ hg init a $ hg init a
$ cd a $ cd a
$ cp "$TESTDIR/binfile.bin" . $ cp "$TESTDIR/binfile.bin" .
$ hg add binfile.bin $ hg add binfile.bin
$ hg ci -m 'add binfile.bin' $ hg ci -m 'add binfile.bin'
$ hg grep "MaCam" --all $ hg grep "MaCam" --all
binfile.bin:0:+: Binary file matches binfile.bin:0:+: Binary file matches
$ hg grep "MaCam" --diff
binfile.bin:0:+: Binary file matches
$ cd .. $ cd ..
Test for showing working of allfiles flag Test for showing working of allfiles flag
$ hg init sng $ hg init sng
$ cd sng $ cd sng
$ echo "unmod" >> um $ echo "unmod" >> um
$ hg ci -A -m "adds unmod to um" $ hg ci -A -m "adds unmod to um"