comparison mercurial/localrepo.py @ 21465:2edb8648c500

localrepo: always set the variable r in status method

This is a small patch to help streamline keeping tracking of the list of files
for status in a variable already called 'r' ('s' is for subrepos in this
method). We now move the setting of it out of an 'if' block so that we can
later refactor more code into the context objects.

21464:d19164a018a1

                # so 'f not in ctx1' is not enough
                if f not in ctx1 and f not in ctx1.dirs():
                    self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
            match.bad = bad

        if working: # we need to scan the working dir
            r = ctx2._dirstatestatus(match=match, ignored=listignored,
                                     clean=listclean, unknown=listunknown)
            modified, added, removed, deleted, unknown, ignored, clean = r

        if not parentworking:
            mf1 = mfmatches(ctx1)
            if working:
                # we are comparing working dir against non-parent

21465:2edb8648c500

                # so 'f not in ctx1' is not enough
                if f not in ctx1 and f not in ctx1.dirs():
                    self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
            match.bad = bad

        r = [[], [], [], [], [], [], []]
        if working: # we need to scan the working dir
            r = ctx2._dirstatestatus(match=match, ignored=listignored,
                                     clean=listclean, unknown=listunknown)

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

        if not parentworking:
            mf1 = mfmatches(ctx1)
            if working:
                # we are comparing working dir against non-parent