mercurial/dirstate.py

49916:8f200511cdc7

        o.unlink(backupname)

        if data_backup is not None:
            o.unlink(data_backup[0])

    def verify(self, m1, m2):
        """check the dirstate content again the parent manifest and yield errors"""
        missing_from_p1 = b"%s in state %s, but not in manifest1\n"
        unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"
        missing_from_ps = b"%s in state %s, but not in either manifest\n"
        missing_from_ds = b"%s in manifest1, but listed as state %s\n"

                elif f not in m1:
                    yield (missing_from_p1, f, state)
            if entry.added and f in m1:
                yield (unexpected_in_p1, f, state)
        for f in m1:
            entry = self.get_entry(f)
            if not entry.p1_tracked:
                yield (missing_from_ds, f, entry.state)

49917:1d8721be2428

        o.unlink(backupname)

        if data_backup is not None:
            o.unlink(data_backup[0])

    def verify(self, m1, m2, narrow_matcher=None):
        """check the dirstate content again the parent manifest and yield errors"""
        missing_from_p1 = b"%s in state %s, but not in manifest1\n"
        unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"
        missing_from_ps = b"%s in state %s, but not in either manifest\n"
        missing_from_ds = b"%s in manifest1, but listed as state %s\n"

                elif f not in m1:
                    yield (missing_from_p1, f, state)
            if entry.added and f in m1:
                yield (unexpected_in_p1, f, state)
        for f in m1:
            if narrow_matcher is not None and not narrow_matcher(f):
                continue
            entry = self.get_entry(f)
            if not entry.p1_tracked:
                yield (missing_from_ds, f, entry.state)