Show More
@@ -1889,9 +1889,6 b' def walkchangerevs(repo, match, opts, pr' | |||||
1889 | revs = _walkrevs(repo, opts) |
|
1889 | revs = _walkrevs(repo, opts) | |
1890 | if not revs: |
|
1890 | if not revs: | |
1891 | return [] |
|
1891 | return [] | |
1892 | if allfiles and len(revs) > 1: |
|
|||
1893 | raise error.Abort(_("multiple revisions not supported with " |
|
|||
1894 | "--all-files")) |
|
|||
1895 | wanted = set() |
|
1892 | wanted = set() | |
1896 | slowpath = match.anypats() or (not match.always() and opts.get('removed')) |
|
1893 | slowpath = match.anypats() or (not match.always() and opts.get('removed')) | |
1897 | fncache = {} |
|
1894 | fncache = {} |
@@ -2533,6 +2533,7 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2533 | """ |
|
2533 | """ | |
2534 | opts = pycompat.byteskwargs(opts) |
|
2534 | opts = pycompat.byteskwargs(opts) | |
2535 | diff = opts.get('all') or opts.get('diff') |
|
2535 | diff = opts.get('all') or opts.get('diff') | |
|
2536 | all_files = opts.get('all_files') | |||
2536 | if diff and opts.get('all_files'): |
|
2537 | if diff and opts.get('all_files'): | |
2537 | raise error.Abort(_('--diff and --all-files are mutually exclusive')) |
|
2538 | raise error.Abort(_('--diff and --all-files are mutually exclusive')) | |
2538 | # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working |
|
2539 | # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working | |
@@ -2757,7 +2758,7 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
2757 | if pstates or states: |
|
2758 | if pstates or states: | |
2758 | r = display(fm, fn, ctx, pstates, states) |
|
2759 | r = display(fm, fn, ctx, pstates, states) | |
2759 | found = found or r |
|
2760 | found = found or r | |
2760 | if r and not diff: |
|
2761 | if r and not diff and not all_files: | |
2761 | skip[fn] = True |
|
2762 | skip[fn] = True | |
2762 | if copy: |
|
2763 | if copy: | |
2763 | skip[copy] = True |
|
2764 | skip[copy] = True |
General Comments 0
You need to be logged in to leave comments.
Login now