facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

hg: automatically pull the biggrep corpus rev if we don't have it locally

Browse Source 
Summary:
Not sure if this is the best way to do this, but: if we fail to resolve
the corpus rev, perform an `hg pull` and retry, rather than showing
folks the instructions to pull.

Reviewed By: quark-zju

Differential Revision: D12877458

fbshipit-source-id: 9c178068ce71535033ca29cf8f4049726464c893
This commit is contained in:
Wez Furlong 2019-10-25 14:01:11 -07:00 committed by Facebook Github Bot
parent 834edf5811
commit 15757c2788
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
edenscm/mercurial/commands/__init__.py
View File

@ -2760,7 +2760,6 @@ def grep(ui, repo, pattern, *pats, **opts):
# Add '--' to make sure grep recognizes all remaining arguments
# (passed in by xargs) as filenames.
cmd.append("--")
ui.pager("grep")
if biggrep:
p = subprocess.Popen(
@ -2835,24 +2834,41 @@ def grep(ui, repo, pattern, *pats, **opts):
corpusbin = bin(corpusrev)
changes = repo.status(corpusbin, None, m)
except error.RepoLookupError:
# TODO: can we trigger a commit cloud fetch for this case?
# We don't have the rev locally, so go get it.
if not ui.quiet:
ui.write_err(_("pulling biggrep corpus commit %s\n") % (hex(corpusbin)))
# print the results we've gathered so far. We're not sure
# how things differ, so we'll follow up with a warning.
for lines in resultsbyfile.values():
for line in lines:
ui.write(line)
# Redirect the pull output to stderr so that we don't break folks
# that are parsing the `hg grep` output
fout = ui.fout
try:
ui.fout = ui.ferr
pull = cmdutil.findcmd("pull", table)[1][0]
pull(ui, repo)
finally:
ui.fout = fout
ui.warn(
_(
"The results above are based on revision %s\n"
"which is not available locally and thus may be inaccurate.\n"
"To get accurate results, run `hg pull` and re-run "
"your grep.\n"
# Try to resolve that rev again now
try:
changes = repo.status(corpusbin, None, m)
except error.RepoLookupError:
# print the results we've gathered so far. We're not sure
# how things differ, so we'll follow up with a warning.
ui.pager("grep")
for lines in resultsbyfile.values():
for line in lines:
ui.write(line)
ui.warn(
_(
"The results above are based on revision %s\n"
"which is not available locally and thus may be inaccurate.\n"
"To get accurate results, run `hg pull` and re-run "
"your grep.\n"
)
% corpusrev
)
% corpusrev
)
return
return
# which files we're going to search locally
filestogrep = set()
@ -2873,6 +2889,7 @@ def grep(ui, repo, pattern, *pats, **opts):
# Having filtered out the changed files from the big grep results,
# we can now print those that remain.
ui.pager("grep")
for lines in resultsbyfile.values():
for line in lines:
ui.write(line)
@ -2891,6 +2908,7 @@ def grep(ui, repo, pattern, *pats, **opts):
files = sorted(status.clean + status.modified + status.added)
files = [file for file in files if not islink(file)]
ui.pager("grep")
return _rungrep(cmd, files, m)