mercurial/commands.py
branchstable
changeset 12382 28ddf67198b2
parent 12129 07ac2a560fce
child 12383 f1e8d6f6e682
child 12385 9a93f4fb141b
equal deleted inserted replaced
12381:5965f369314b 12382:28ddf67198b2
  2531                 if rename:
  2531                 if rename:
  2532                     copies.append((fn, rename[0]))
  2532                     copies.append((fn, rename[0]))
  2533 
  2533 
  2534         revmatchfn = None
  2534         revmatchfn = None
  2535         if opts.get('patch') or opts.get('stat'):
  2535         if opts.get('patch') or opts.get('stat'):
  2536             revmatchfn = cmdutil.match(repo, fns, default='path')
  2536             if opts.get('follow') or opts.get('follow_first'):
       
  2537                 # note: this might be wrong when following through merges
       
  2538                 revmatchfn = cmdutil.match(repo, fns, default='path')
       
  2539             else:
       
  2540                 revmatchfn = matchfn
  2537 
  2541 
  2538         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
  2542         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
  2539 
  2543 
  2540     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
  2544     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
  2541         if count == limit:
  2545         if count == limit: