Mercurial > hg
changeset 38648:ffd08ec22955
grep: rename --allfiles to --all-files
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.
Differential Revision: https://phab.mercurial-scm.org/D3915
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 11 Jul 2018 21:15:52 +0900 |
| parents | 0f4c2c70e26e |
| children | 0d0f8bd692c4 |
| files | mercurial/cmdutil.py mercurial/commands.py tests/test-completion.t tests/test-grep.t |
| diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Wed Jul 11 13:48:44 2018 +0200 +++ b/mercurial/cmdutil.py Wed Jul 11 21:15:52 2018 +0900 @@ -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 = {}
--- a/mercurial/commands.py Wed Jul 11 13:48:44 2018 +0200 +++ b/mercurial/commands.py Wed Jul 11 21:15:52 2018 +0900 @@ -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)
--- a/tests/test-completion.t Wed Jul 11 13:48:44 2018 +0200 +++ b/tests/test-completion.t Wed Jul 11 21:15:52 2018 +0900 @@ -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