mercurial/commands.py
changeset 41492 02186c6871ac
parent 41491 e6ec0737b706
child 41511 72a9aacff645
equal deleted inserted replaced
41491:e6ec0737b706 41492:02186c6871ac
  5412         ctx1 = ctx2.p1()
  5412         ctx1 = ctx2.p1()
  5413     else:
  5413     else:
  5414         repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
  5414         repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
  5415         ctx1, ctx2 = scmutil.revpair(repo, revs)
  5415         ctx1, ctx2 = scmutil.revpair(repo, revs)
  5416 
  5416 
  5417     relative = pats or ui.configbool('commands', 'status.relative')
  5417     relative = None
       
  5418     if pats:
       
  5419         relative = True
       
  5420     elif ui.hasconfig('commands', 'status.relative'):
       
  5421         relative = ui.configbool('commands', 'status.relative')
  5418     uipathfn = scmutil.getuipathfn(repo, relative)
  5422     uipathfn = scmutil.getuipathfn(repo, relative)
  5419 
  5423 
  5420     if opts.get('print0'):
  5424     if opts.get('print0'):
  5421         end = '\0'
  5425         end = '\0'
  5422     else:
  5426     else: