Mercurial > hg
comparison mercurial/cmdutil.py @ 20392:d4f804caa0ed
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 |
comparison
equal
deleted
inserted
replaced
20391:466e4c574db0 | 20392:d4f804caa0ed |
---|---|
8 from node import hex, nullid, nullrev, short | 8 from node import hex, nullid, nullrev, short |
9 from i18n import _ | 9 from i18n import _ |
10 import os, sys, errno, re, tempfile | 10 import os, sys, errno, re, tempfile |
11 import util, scmutil, templater, patch, error, templatekw, revlog, copies | 11 import util, scmutil, templater, patch, error, templatekw, revlog, copies |
12 import match as matchmod | 12 import match as matchmod |
13 import subrepo, context, repair, graphmod, revset, phases, obsolete, pathutil | 13 import context, repair, graphmod, revset, phases, obsolete, pathutil |
14 import changelog | 14 import changelog |
15 import bookmarks | 15 import bookmarks |
16 import lock as lockmod | 16 import lock as lockmod |
17 | 17 |
18 def parsealiases(cmd): | 18 def parsealiases(cmd): |
627 write(chunk, label=label) | 627 write(chunk, label=label) |
628 | 628 |
629 if listsubrepos: | 629 if listsubrepos: |
630 ctx1 = repo[node1] | 630 ctx1 = repo[node1] |
631 ctx2 = repo[node2] | 631 ctx2 = repo[node2] |
632 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2): | 632 for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
633 tempnode2 = node2 | 633 tempnode2 = node2 |
634 try: | 634 try: |
635 if node2 is not None: | 635 if node2 is not None: |
636 tempnode2 = ctx2.substate[subpath][1] | 636 tempnode2 = ctx2.substate[subpath][1] |
637 except KeyError: | 637 except KeyError: |