This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3673

grep: enables passing wdir as a revision in grep
ClosedPublic

Authored by sangeet259 on May 30 2018, 9:31 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG16f93a3b8b05: grep: enable passing wdir as a revision
Summary

When you pass wdir() to the -r flag, it catches the
WdirUnsupported error and fall back to and alternate path

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

sangeet259 created this revision.May 30 2018, 9:31 AM
yuja added a subscriber: yuja.May 31 2018, 8:44 AM
  • a/mercurial/commands.py

+++ b/mercurial/commands.py
@@ -2513,19 +2513,27 @@

@util.cachefunc
def binary():
    flog = getfile(fn)
  • return stringutil.binary(flog.read(ctx.filenode(fn)))

+ try:
+ content = flog.read(ctx.filenode(fn))
+ except error.WdirUnsupported:
+ content = ctx[fn].data()

ctx[fn].isbinary() is preferred.

  • fm.data(node=fm.hexfunc(ctx.node()))

+ fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
+ if ctx._rev is None :

ctx.rev()

+ showrev = False
+ else :
+ showrev = True

cols = [
    ('filename', fn, True),
  • ('rev', rev, True),

+ ('rev', rev, showrev),

It's probably better to not disable the revision output since we'll need
a revision number in machine-readable output such as JSON.

We can use scmutil.intrev(ctx) instead. The output is a bit ugly for
humans, but it's valid and we can fix it to be prettier later.

  • copied = flog.renamed(fnode)

+ try:
+ copied = flog.renamed(fnode)
+ except error.WdirUnsupported :
+ copied = False

ctx[fn].renamed() ?

sangeet259 updated this revision to Diff 8951.Jun 2 2018, 2:30 AM
yuja added a comment.Jun 2 2018, 11:04 PM

+ if ctx.rev() is None :
+ rev = scmutil.intrev(ctx)

Moved this to top and queued, thanks.

Closed by commit rHG16f93a3b8b05: grep: enable passing wdir as a revision (authored by sangeet259). · Explain WhyJun 2 2018, 11:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (26 lines)
Mtests/test-grep.t (18 lines)

Diff 8930

mercurial/commands.py

if ui.quiet: if ui.quiet:
datefmt = '%Y-%m-%d' datefmt = '%Y-%m-%d'
else: else:
datefmt = '%a %b %d %H:%M:%S %Y %1%2' datefmt = '%a %b %d %H:%M:%S %Y %1%2'
found = False found = False
@util.cachefunc @util.cachefunc
def binary(): def binary():
flog = getfile(fn) flog = getfile(fn)
return stringutil.binary(flog.read(ctx.filenode(fn))) try:
content = flog.read(ctx.filenode(fn))
except error.WdirUnsupported:
content = ctx[fn].data()
return stringutil.binary(content)
fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
if opts.get('all'): if opts.get('all'):
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(ctx.node())) fm.data(node=fm.hexfunc(scmutil.binnode(ctx)))
if ctx._rev is None :
showrev = False
else :
showrev = True
cols = [ cols = [
('filename', fn, True), ('filename', fn, True),
('rev', rev, True), ('rev', rev, showrev),
('linenumber', l.linenum, opts.get('line_number')), ('linenumber', l.linenum, opts.get('line_number')),
] ]
if opts.get('all'): if opts.get('all'):
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')),
]) ])
matches.setdefault(parent, {}) matches.setdefault(parent, {})
files = revfiles.setdefault(rev, []) files = revfiles.setdefault(rev, [])
for fn in fns: for fn in fns:
flog = getfile(fn) flog = getfile(fn)
try: try:
fnode = ctx.filenode(fn) fnode = ctx.filenode(fn)
except error.LookupError: except error.LookupError:
continue continue
try:
copied = flog.renamed(fnode) copied = flog.renamed(fnode)
except error.WdirUnsupported :
copied = False
copy = follow and copied and copied[0] copy = follow and copied and copied[0]
if copy: if copy:
copies.setdefault(rev, {})[fn] = copy copies.setdefault(rev, {})[fn] = copy
if fn in skip: if fn in skip:
if copy: if copy:
skip[copy] = True skip[copy] = True
continue continue
files.append(fn) files.append(fn)
if fn not in matches[rev]: if fn not in matches[rev]:
grepbody(fn, rev, flog.read(fnode)) try:
content = flog.read(fnode)
except error.WdirUnsupported:
content = ctx[fn].data()
grepbody(fn, rev, content)
pfn = copy or fn pfn = copy or fn
if pfn not in matches[parent]: if pfn not in matches[parent]:
try: try:
fnode = pctx.filenode(pfn) fnode = pctx.filenode(pfn)
grepbody(pfn, parent, flog.read(fnode)) grepbody(pfn, parent, flog.read(fnode))
except error.LookupError: except error.LookupError:
pass pass

tests/test-grep.t

Test wdir Test wdir
(at least, this shouldn't crash) (at least, this shouldn't crash)
$ hg up -q $ hg up -q
$ echo wport >> port2 $ echo wport >> port2
$ hg stat $ hg stat
M port2 M port2
$ hg grep -r 'wdir()' port $ hg grep -r 'wdir()' port
abort: working directory revision cannot be specified port2:export
[255] port2:vaportight
port2:import/export
port2:deport
port2:wport
$ cd .. $ cd ..
$ hg init t2 $ hg init t2
$ cd t2 $ cd t2
$ hg grep foobar foo $ hg grep foobar foo
[1] [1]
$ hg grep foobar $ hg grep foobar
[1] [1]
$ 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
$ cd .. $ cd ..
Fix_Wdir(): test that passing wdir() t -r flag does greps on the
files modified in the working directory
$ cd a
$ echo "abracadara" >> a
$ hg add a
$ hg grep -r "wdir()" "abra"
a:abracadara
$ cd ..