( )⚙ D11591 status: process `from_p2` file the same as `merged` one

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11591

status: process `from_p2` file the same as `merged` one
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:40 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG142e9f0a70b5: status: process `from_p2` file the same as `merged` one
Summary

What matters here is that the file constains information coming from the second
parent and should be considered modified on plain `hg status.

So we can process from_p2 file sooner. It also highlight that we probably
don't need the merged/from_p2 distinction at higher level.

Diff Detail

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

Event Timeline

marmoute created this revision.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30596.Oct 3 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Oct 3 2021, 5:13 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:13 PM
marmoute added a commit: rHG142e9f0a70b5: status: process `from_p2` file the same as `merged` one.Oct 3 2021, 5:35 PM
Closed by commit rHG142e9f0a70b5: status: process `from_p2` file the same as `merged` one (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (3 lines)

Diff 30596

mercurial/dirstate.py

# tuple members one by one. # tuple members one by one.
t = dget(fn) t = dget(fn)
mode = t.mode mode = t.mode
size = t.size size = t.size
time = t.mtime time = t.mtime
if not st and t.tracked: if not st and t.tracked:
dadd(fn) dadd(fn)
elif t.merged: elif t.merged or t.from_p2:
madd(fn) madd(fn)
elif t.added: elif t.added:
aadd(fn) aadd(fn)
elif t.removed: elif t.removed:
radd(fn) radd(fn)
elif t.tracked: elif t.tracked:
if ( if (
size >= 0 size >= 0
and ( and (
(size != st.st_size and size != st.st_size & _rangemask) (size != st.st_size and size != st.st_size & _rangemask)
or ((mode ^ st.st_mode) & 0o100 and checkexec) or ((mode ^ st.st_mode) & 0o100 and checkexec)
) )
or t.from_p2
or fn in copymap or fn in copymap
): ):
if stat.S_ISLNK(st.st_mode) and size != st.st_size: if stat.S_ISLNK(st.st_mode) and size != st.st_size:
# issue6456: Size returned may be longer due to # issue6456: Size returned may be longer due to
# encryption on EXT-4 fscrypt, undecided. # encryption on EXT-4 fscrypt, undecided.
ladd(fn) ladd(fn)
else: else:
madd(fn) madd(fn)