From patchwork Tue Feb 4 22:24:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4, of, 6, py3, progress, v2] match: use ctx.getfileset() instead of fileset.getfileset() From: Augie Fackler X-Patchwork-Id: 3474 Message-Id: <5100071fb8beed4a73cb.1391552678@augie-macbookair> To: mercurial-devel@selenic.com Date: Tue, 04 Feb 2014 17:24:38 -0500 # HG changeset patch # User Augie Fackler # Date 1391543682 18000 # Tue Feb 04 14:54:42 2014 -0500 # Node ID 5100071fb8beed4a73cb626778bda483e641ef12 # Parent d8f4c1f1953e7eaaf0d03a951be9bb8ca7f34122 match: use ctx.getfileset() instead of fileset.getfileset() Resolves an import cycle involving match and merge. diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -6,7 +6,7 @@ # GNU General Public License version 2 or any later version. import re -import util, fileset, pathutil +import util, pathutil from i18n import _ def _rematcher(pat): @@ -26,7 +26,7 @@ if kind == 'set': if not ctx: raise util.Abort("fileset expression with no context") - s = fileset.getfileset(ctx, expr) + s = ctx.getfileset(expr) fset.update(s) continue other.append((kind, expr)) diff --git a/tests/test-module-imports.t b/tests/test-module-imports.t --- a/tests/test-module-imports.t +++ b/tests/test-module-imports.t @@ -34,6 +34,3 @@ mercurial/ui.py mixed stdlib and relative imports: config, error, formatter, scmutil, util Import cycle: mercurial.repoview -> mercurial.revset -> mercurial.repoview - Import cycle: mercurial.fileset -> mercurial.merge -> mercurial.subrepo -> mercurial.match -> mercurial.fileset - Import cycle: mercurial.filemerge -> mercurial.match -> mercurial.fileset -> mercurial.merge -> mercurial.filemerge - Import cycle: mercurial.cmdutil -> mercurial.match -> mercurial.fileset -> mercurial.merge -> mercurial.subrepo -> mercurial.cmdutil -> mercurial.cmdutil