Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 20392:d4f804caa0ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
itersubrepos: move to scmutil to break a direct import cycle
author Augie Fackler <raf@durin42.com>
date Mon, 03 Feb 2014 18:36:00 -0500
parents a6cf48b2880d
children 78f4c2b7052f
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Fri Feb 07 02:59:46 2014 +0100
+++ b/mercurial/cmdutil.py	Mon Feb 03 18:36:00 2014 -0500
@@ -10,7 +10,7 @@
 import os, sys, errno, re, tempfile
 import util, scmutil, templater, patch, error, templatekw, revlog, copies
 import match as matchmod
-import subrepo, context, repair, graphmod, revset, phases, obsolete, pathutil
+import context, repair, graphmod, revset, phases, obsolete, pathutil
 import changelog
 import bookmarks
 import lock as lockmod
@@ -629,7 +629,7 @@
     if listsubrepos:
         ctx1 = repo[node1]
         ctx2 = repo[node2]
-        for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
+        for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
             tempnode2 = node2
             try:
                 if node2 is not None: