( )⚙ D11427 dirstate: make a conditionnal easier to read in `setparents`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11427

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

Authored by marmoute on Sep 16 2021, 10:42 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGdd267f16042f: dirstate: make a conditionnal easier to read in `setparents`
Summary

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

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Sep 16 2021, 10:42 AM
Alphare accepted this revision.Sep 20 2021, 6:03 AM
This revision is now accepted and ready to land.Sep 20 2021, 6:03 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (6 lines)

Diff 30265

mercurial/dirstate.py

) )
self._dirty = True self._dirty = True
oldp2 = self._pl[1] oldp2 = self._pl[1]
if self._origpl is None: if self._origpl is None:
self._origpl = self._pl self._origpl = self._pl
self._map.setparents(p1, p2) self._map.setparents(p1, p2)
copies = {} copies = {}
if ( nullid = self._nodeconstants.nullid
oldp2 != self._nodeconstants.nullid if oldp2 != nullid and p2 == nullid:
and p2 == self._nodeconstants.nullid
):
candidatefiles = self._map.non_normal_or_other_parent_paths() candidatefiles = self._map.non_normal_or_other_parent_paths()
for f in candidatefiles: for f in candidatefiles:
s = self._map.get(f) s = self._map.get(f)
if s is None: if s is None:
continue continue
# Discard "merged" markers when moving away from a merge state # Discard "merged" markers when moving away from a merge state