Mercurial > public > mercurial-scm > hg

diff mercurial/cmdutil.py @ 24635:21e1ece30f8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: move dirs() and finddirs() from scmutil to util An upcoming commit requires that match.py be able to call scmutil.dirs(), but when match.py imports scmutil, a dependency cycle is created. This commit avoids the cycle by moving dirs() and its related finddirs() function from scmutil to util, which match.py already depends on.
author Drew Gottlieb <drgott@google.com>
date Mon, 06 Apr 2015 14:36:08 -0700
parents e74f819e9160
children ab6e3729747e
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Apr 06 13:59:36 2015 -0700
+++ b/mercurial/cmdutil.py	Mon Apr 06 14:36:08 2015 -0700
@@ -2328,7 +2328,7 @@
                                % join(subpath))
 
     # warn about failure to delete explicit files/dirs
-    deleteddirs = scmutil.dirs(deleted)
+    deleteddirs = util.dirs(deleted)
     for f in m.files():
         def insubrepo():
             for subpath in wctx.substate: