| pulkit |
| hg-reviewers |
This combination doesn't make any sense since --diff is the flag to search
change history, whereas --all-files is to include unmodified contents.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (3 lines) | |||
| M | tests/test-grep.t (6 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Yuya Nishihara | Jul 11 2018, 8:23 AM |
| 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') | diff = opts.get('all') or opts.get('diff') | ||||
| if diff and opts.get('all_files'): | |||||
| raise error.Abort(_('--diff and --all-files are mutually exclusive')) | |||||
| 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 | ||||
| $ echo "something else" >> new | $ echo "something else" >> new | ||||
| $ hg ci -A -m "second commit" | $ hg ci -A -m "second commit" | ||||
| adding new | adding new | ||||
| $ hg grep -r "." "unmod" | $ hg grep -r "." "unmod" | ||||
| [1] | [1] | ||||
| $ hg grep -r "." "unmod" --all-files | $ hg grep -r "." "unmod" --all-files | ||||
| um:1:unmod | um:1:unmod | ||||
| --diff --all-files makes no sense since --diff is the option to grep history | |||||
| $ hg grep --diff --all-files um | |||||
| abort: --diff and --all-files are mutually exclusive | |||||
| [255] | |||||
| $ cd .. | $ cd .. | ||||
| Fix_Wdir(): test that passing wdir() t -r flag does greps on the | Fix_Wdir(): test that passing wdir() t -r flag does greps on the | ||||
| files modified in the working directory | files modified in the working directory | ||||
| $ cd a | $ cd a | ||||
| $ echo "abracadara" >> a | $ echo "abracadara" >> a | ||||
| $ hg add a | $ hg add a | ||||