mercurial/commands.py
changeset 12383 f1e8d6f6e682
parent 12369 6f0d9d79111f
parent 12382 28ddf67198b2
child 12386 8eedf53547b8
equal deleted inserted replaced
12380:1e2625fe371b 12383:f1e8d6f6e682
  2500                 if rename:
  2500                 if rename:
  2501                     copies.append((fn, rename[0]))
  2501                     copies.append((fn, rename[0]))
  2502 
  2502 
  2503         revmatchfn = None
  2503         revmatchfn = None
  2504         if opts.get('patch') or opts.get('stat'):
  2504         if opts.get('patch') or opts.get('stat'):
  2505             revmatchfn = cmdutil.match(repo, fns, default='path')
  2505             if opts.get('follow') or opts.get('follow_first'):
       
  2506                 # note: this might be wrong when following through merges
       
  2507                 revmatchfn = cmdutil.match(repo, fns, default='path')
       
  2508             else:
       
  2509                 revmatchfn = matchfn
  2506 
  2510 
  2507         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
  2511         displayer.show(ctx, copies=copies, matchfn=revmatchfn)
  2508 
  2512 
  2509     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
  2513     for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
  2510         if count == limit:
  2514         if count == limit: