Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/filemerge.py @ 49622:59466b13a3ae stable 6.3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix crash when using filesets in [partial-merge-tools] Without this patch, you'd get `mercurial.error.ProgrammingError: fileset expression with no context`.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 03 Jan 2023 13:38:56 -0800
parents 7af798e497f5
children e0c0545e2e55
comparison
equal deleted inserted replaced
49621:3d7bf111f01e 49622: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)