comparison mercurial/localrepo.py @ 12175:c0a8f9dea0f6

subrepos: handle modified but uncommitted .hgsub

12174:7bccd04292a2

            removed = mf1.keys()

        r = modified, added, removed, deleted, unknown, ignored, clean

        if listsubrepos:
            for subpath in ctx1.substate:
                sub = ctx1.sub(subpath)
                if working:
                    rev2 = None
                else:
                    rev2 = ctx2.substate[subpath][1]
                try:

12175:c0a8f9dea0f6

            removed = mf1.keys()

        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)
                if working:
                    rev2 = None
                else:
                    rev2 = ctx2.substate[subpath][1]
                try: