Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 49622:59466b13a3ae stable 6.3.2
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 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Dec 06 17:12:59 2022 -0500 +++ b/mercurial/filemerge.py Tue Jan 03 13:38:56 2023 -0800 @@ -1132,7 +1132,9 @@ patterns = ui.configlist(section, b'%s.patterns' % name, []) is_match = True if patterns: - m = match.match(repo.root, b'', patterns) + m = match.match( + repo.root, b'', patterns, ctx=local.fctx.changectx() + ) is_match = m(local.fctx.path()) if is_match: if ui.configbool(section, b'%s.disable' % name):