mercurial/filemerge.py
branchstable
changeset 49837 59466b13a3ae
parent 49167 7af798e497f5
child 49845 e0c0545e2e55
equal deleted inserted replaced
49836:3d7bf111f01e 49837:59466b13a3ae
  1130         if name in seen:
  1130         if name in seen:
  1131             continue
  1131             continue
  1132         patterns = ui.configlist(section, b'%s.patterns' % name, [])
  1132         patterns = ui.configlist(section, b'%s.patterns' % name, [])
  1133         is_match = True
  1133         is_match = True
  1134         if patterns:
  1134         if patterns:
  1135             m = match.match(repo.root, b'', patterns)
  1135             m = match.match(
       
  1136                 repo.root, b'', patterns, ctx=local.fctx.changectx()
       
  1137             )
  1136             is_match = m(local.fctx.path())
  1138             is_match = m(local.fctx.path())
  1137         if is_match:
  1139         if is_match:
  1138             if ui.configbool(section, b'%s.disable' % name):
  1140             if ui.configbool(section, b'%s.disable' % name):
  1139                 continue
  1141                 continue
  1140             order = ui.configint(section, b'%s.order' % name, 0)
  1142             order = ui.configint(section, b'%s.order' % name, 0)