comparison mercurial/dirstate.py @ 47987:dd267f16042f

dirstate: make a conditionnal easier to read in `setparents`

By grabing `nullid` in the local space, we get the conditionnal to fit in one
line.

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

47986:72b80a0124f8

        oldp2 = self._pl[1]
        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(p1, p2)
        copies = {}
        if (
            oldp2 != self._nodeconstants.nullid
            and p2 == self._nodeconstants.nullid
        ):
            candidatefiles = self._map.non_normal_or_other_parent_paths()

            for f in candidatefiles:
                s = self._map.get(f)
                if s is None:

47987:dd267f16042f

        oldp2 = self._pl[1]
        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(p1, p2)
        copies = {}
        nullid = self._nodeconstants.nullid
        if oldp2 != nullid and p2 == nullid:
            candidatefiles = self._map.non_normal_or_other_parent_paths()

            for f in candidatefiles:
                s = self._map.get(f)
                if s is None: