comparison mercurial/dirstatemap.py @ 47901:3429f48d486d

dirstatemap: use the default code to handle "clean-p2" case

This simplify the conditionnal a bit since most of it is handled by the common
code.

Differential Revision: https://phab.mercurial-scm.org/D11326

47900:40cf4b278f8f

                # p1_tracked argument is False.
                #
                # In addition, this seems to be a case where the file is marked
                # as merged without actually being the result of a merge
                # action. So thing are not ideal here.
                self.addfile(filename, merged=True)
                return
            else:
                self.addfile(filename, from_p2=True)
                return
        elif not p1_tracked and p2_tracked and wc_tracked:
            clean_p2 = True
        elif possibly_dirty:
            pass
        elif wc_tracked:

47901:3429f48d486d

                # p1_tracked argument is False.
                #
                # In addition, this seems to be a case where the file is marked
                # as merged without actually being the result of a merge
                # action. So thing are not ideal here.
                merged = True
                clean_p2 = False
        elif not p1_tracked and p2_tracked and wc_tracked:
            clean_p2 = True
        elif possibly_dirty:
            pass
        elif wc_tracked: