mercurial/commands.py
changeset 45741 4f7309fdfb60
parent 45740 d1cabce5ef05
child 45742 b5e0746e272b
equal deleted inserted replaced
45740:d1cabce5ef05 45741:4f7309fdfb60
  3363       See :hg:`help templates.operators` for the list expansion syntax.
  3363       See :hg:`help templates.operators` for the list expansion syntax.
  3364 
  3364 
  3365     Returns 0 if a match is found, 1 otherwise.
  3365     Returns 0 if a match is found, 1 otherwise.
  3366 
  3366 
  3367     """
  3367     """
       
  3368     cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
  3368     opts = pycompat.byteskwargs(opts)
  3369     opts = pycompat.byteskwargs(opts)
  3369     diff = opts.get(b'all') or opts.get(b'diff')
  3370     diff = opts.get(b'all') or opts.get(b'diff')
  3370     follow = opts.get(b'follow')
  3371     follow = opts.get(b'follow')
  3371     if diff and opts.get(b'all_files'):
       
  3372         raise error.Abort(_(b'--diff and --all-files are mutually exclusive'))
       
  3373     if opts.get(b'all_files') is None and not diff:
  3372     if opts.get(b'all_files') is None and not diff:
  3374         opts[b'all_files'] = True
  3373         opts[b'all_files'] = True
  3375     plaingrep = (
  3374     plaingrep = (
  3376         opts.get(b'all_files')
  3375         opts.get(b'all_files')
  3377         and not opts.get(b'rev')
  3376         and not opts.get(b'rev')