# HG changeset patch # User Yuya Nishihara # Date 2018-01-14 04:28:20 # Node ID 9eb5c400f488832b2fb0f9c5bb10e97b08362600 # Parent f90f6fd130c165f4cd2a40950e888a922cf27dee fileset: move import of match module to top Actually there was no circular import issue. diff --git a/mercurial/fileset.py b/mercurial/fileset.py --- a/mercurial/fileset.py +++ b/mercurial/fileset.py @@ -12,6 +12,7 @@ import re from .i18n import _ from . import ( error, + match as matchmod, merge, parser, pycompat, @@ -508,8 +509,6 @@ def subrepo(mctx, x): if x: # i18n: "subrepo" is a keyword pat = getstring(x, _("subrepo requires a pattern or no arguments")) - - from . import match as matchmod # avoid circular import issues fast = not matchmod.patkind(pat) if fast: def m(s):