Patchwork D3915: grep: rename --allfiles to --all-files

login
register
mail settings
Submitter phabricator
Date July 11, 2018, 2:16 p.m.
Message ID <differential-rev-PHID-DREV-o5rci2s2t3pxpyxfzahe-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32777/
State Superseded
Headers show

Comments

phabricator - July 11, 2018, 2:16 p.m.
yuja created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This matches the config name to be added.
  
  Note that we don't have to keep the old flag since it isn't released yet.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3915

AFFECTED FILES
  mercurial/cmdutil.py
  mercurial/commands.py
  tests/test-completion.t
  tests/test-grep.t

CHANGE DETAILS




To: yuja, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-grep.t b/tests/test-grep.t
--- a/tests/test-grep.t
+++ b/tests/test-grep.t
@@ -409,7 +409,7 @@ 
   adding new
   $ hg grep -r "." "unmod"
   [1]
-  $ hg grep -r "." "unmod" --allfiles
+  $ hg grep -r "." "unmod" --all-files
   um:1:unmod
 
   $ cd ..
diff --git a/tests/test-completion.t b/tests/test-completion.t
--- a/tests/test-completion.t
+++ b/tests/test-completion.t
@@ -313,7 +313,7 @@ 
   debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
   files: rev, print0, include, exclude, template, subrepos
   graft: rev, continue, stop, abort, edit, log, no-commit, force, currentdate, currentuser, date, user, tool, dry-run
-  grep: print0, all, diff, 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, all-files, user, date, template, include, exclude
   heads: rev, topo, active, closed, style, template
   help: extension, command, keyword, system
   identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure, template
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2501,7 +2501,7 @@ 
     ('n', 'line-number', None, _('print matching line numbers')),
     ('r', 'rev', [],
      _('only search files changed within revision range'), _('REV')),
-    ('', 'allfiles', False,
+    ('', 'all-files', False,
      _('include all files in the changeset while grepping (EXPERIMENTAL)')),
     ('u', 'user', None, _('list the author (long with -v)')),
     ('d', 'date', None, _('list the date (short with -q)')),
@@ -2547,7 +2547,7 @@ 
 
     if not opts.get('rev') and not diff:
         opts['rev'] = ["wdir()"]
-        opts['allfiles'] = True
+        opts['all_files'] = True
 
     getfile = util.lrucachefunc(repo.file)
 
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1879,13 +1879,14 @@ 
     yielding each context, the iterator will first call the prepare
     function on each context in the window in forward order.'''
 
-    allfiles = opts.get('allfiles')
+    allfiles = opts.get('all_files')
     follow = opts.get('follow') or opts.get('follow_first')
     revs = _walkrevs(repo, opts)
     if not revs:
         return []
     if allfiles and len(revs) > 1:
-        raise error.Abort(_("multiple revisions not supported with --allfiles"))
+        raise error.Abort(_("multiple revisions not supported with "
+                            "--all-files"))
     wanted = set()
     slowpath = match.anypats() or (not match.always() and opts.get('removed'))
     fncache = {}