Mercurial > hg

changeset 12176:ecab10820983

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepos: add function for iterating over ctx subrepos
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Sep 2010 16:34:07 +0200
parents c0a8f9dea0f6
children 80399b5b5f13
files mercurial/cmdutil.py mercurial/localrepo.py mercurial/subrepo.py
diffstat 3 files changed, 13 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Sep 07 16:23:55 2010 +0200
+++ b/mercurial/cmdutil.py	Tue Sep 07 16:34:07 2010 +0200
@@ -10,7 +10,7 @@
 import os, sys, errno, re, glob, tempfile
 import util, templater, patch, error, encoding, templatekw
 import match as matchmod
-import similar, revset
+import similar, revset, subrepo
 
 revrangesep = ':'
 
@@ -683,14 +683,7 @@
     if listsubrepos:
         ctx1 = repo[node1]
         ctx2 = repo[node2]
-        # Create a (subpath, ctx) mapping where we prefer subpaths
-        # from ctx1. The subpaths from ctx2 are important when the
-        # .hgsub file has been modified (in ctx2) but not yet
-        # committed (in ctx1).
-        subpaths = dict.fromkeys(ctx2.substate, ctx2)
-        subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
-        for subpath, ctx in subpaths.iteritems():
-            sub = ctx.sub(subpath)
+        for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
             if node2 is not None:
                 node2 = bin(ctx2.substate[subpath][1])
             submatch = matchmod.narrowmatcher(subpath, match)
--- a/mercurial/localrepo.py	Tue Sep 07 16:23:55 2010 +0200
+++ b/mercurial/localrepo.py	Tue Sep 07 16:34:07 2010 +0200
@@ -1161,14 +1161,7 @@
         r = modified, added, removed, deleted, unknown, ignored, clean
 
         if listsubrepos:
-            # Create a (subpath, ctx) mapping where we prefer subpaths
-            # from ctx1. The subpaths from ctx2 are important when the
-            # .hgsub file has been modified (in ctx2) but not yet
-            # committed (in ctx1).
-            subpaths = dict.fromkeys(ctx2.substate, ctx2)
-            subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
-            for subpath, ctx in subpaths.iteritems():
-                sub = ctx.sub(subpath)
+            for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
                 if working:
                     rev2 = None
                 else:
--- a/mercurial/subrepo.py	Tue Sep 07 16:23:55 2010 +0200
+++ b/mercurial/subrepo.py	Tue Sep 07 16:34:07 2010 +0200
@@ -184,6 +184,16 @@
         return repo.ui.config('paths', 'default-push', repo.root)
     return repo.ui.config('paths', 'default', repo.root)
 
+def itersubrepos(ctx1, ctx2):
+    """find subrepos in ctx1 or ctx2"""
+    # Create a (subpath, ctx) mapping where we prefer subpaths from
+    # ctx1. The subpaths from ctx2 are important when the .hgsub file
+    # has been modified (in ctx2) but not yet committed (in ctx1).
+    subpaths = dict.fromkeys(ctx2.substate, ctx2)
+    subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
+    for subpath, ctx in sorted(subpaths.iteritems()):
+        yield subpath, ctx.sub(subpath)
+
 def subrepo(ctx, path):
     """return instance of the right subrepo class for subrepo in path"""
     # subrepo inherently violates our import layering rules