This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10970

dirstate: infer the 'n' state from `possibly_dirty`
ClosedPublic

Authored by marmoute on Jul 4 2021, 5:51 PM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHG80617f3c0f9a: dirstate: infer the 'n' state from `possibly_dirty`
Summary

This flag is only used with 'n' so lets set the state based on that parameter in
this case.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 4 2021, 5:51 PM
SimonSapin accepted this revision.Jul 5 2021, 1:02 AM
pulkit accepted this revision.Jul 6 2021, 12:45 PM
This revision is now accepted and ready to land.Jul 6 2021, 12:45 PM
baymax updated this revision to Diff 28872.Jul 6 2021, 2:09 PM

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

marmoute added a commit: rHG80617f3c0f9a: dirstate: infer the 'n' state from `possibly_dirty`.Jul 6 2021, 3:11 PM
Closed by commit rHG80617f3c0f9a: dirstate: infer the 'n' state from `possibly_dirty` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28909

mercurial/dirstate.py

self.merge(f) self.merge(f)
elif entry.from_p2_removed: elif entry.from_p2_removed:
self.otherparent(f) self.otherparent(f)
if source is not None: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
elif entry.merged or entry.from_p2: elif entry.merged or entry.from_p2:
return return
self._addpath(f, b'n', 0, possibly_dirty=True) self._addpath(f, possibly_dirty=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def otherparent(self, f): def otherparent(self, f):
'''Mark as coming from the other parent, always dirty.''' '''Mark as coming from the other parent, always dirty.'''
if not self.in_merge: if not self.in_merge:
msg = _(b"setting %r to other parent only allowed in merges") % f msg = _(b"setting %r to other parent only allowed in merges") % f
raise error.Abort(msg) raise error.Abort(msg)
if f in self and self[f] == b'n': if f in self and self[f] == b'n':

mercurial/dirstatemap.py

state = b'm' state = b'm'
size = FROM_P2 size = FROM_P2
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
elif from_p2: elif from_p2:
assert not possibly_dirty assert not possibly_dirty
size = FROM_P2 size = FROM_P2
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
elif possibly_dirty: elif possibly_dirty:
state = b'n'
size = NONNORMAL size = NONNORMAL
mtime = AMBIGUOUS_TIME mtime = AMBIGUOUS_TIME
else: else:
assert state != b'a' assert state != b'a'
assert size != FROM_P2 assert size != FROM_P2
assert size != NONNORMAL assert size != NONNORMAL
size = size & rangemask size = size & rangemask
mtime = mtime & rangemask mtime = mtime & rangemask

rust/hg-core/src/dirstate/dirstate_map.rs

entry.state = EntryState::Merged; entry.state = EntryState::Merged;
entry.size = SIZE_FROM_OTHER_PARENT; entry.size = SIZE_FROM_OTHER_PARENT;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else if from_p2 { } else if from_p2 {
assert!(!possibly_dirty); assert!(!possibly_dirty);
entry.size = SIZE_FROM_OTHER_PARENT; entry.size = SIZE_FROM_OTHER_PARENT;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else if possibly_dirty { } else if possibly_dirty {
entry.state = EntryState::Normal;
entry.size = SIZE_NON_NORMAL; entry.size = SIZE_NON_NORMAL;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else { } else {
entry.size = entry.size & V1_RANGEMASK; entry.size = entry.size & V1_RANGEMASK;
entry.mtime = entry.mtime & V1_RANGEMASK; entry.mtime = entry.mtime & V1_RANGEMASK;
} }
let old_state = match self.get(filename) { let old_state = match self.get(filename) {
Some(e) => e.state, Some(e) => e.state,

rust/hg-core/src/dirstate_tree/dirstate_map.rs

entry.state = EntryState::Merged; entry.state = EntryState::Merged;
entry.size = SIZE_FROM_OTHER_PARENT; entry.size = SIZE_FROM_OTHER_PARENT;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else if from_p2 { } else if from_p2 {
assert!(!possibly_dirty); assert!(!possibly_dirty);
entry.size = SIZE_FROM_OTHER_PARENT; entry.size = SIZE_FROM_OTHER_PARENT;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else if possibly_dirty { } else if possibly_dirty {
entry.state = EntryState::Normal;
entry.size = SIZE_NON_NORMAL; entry.size = SIZE_NON_NORMAL;
entry.mtime = MTIME_UNSET; entry.mtime = MTIME_UNSET;
} else { } else {
entry.size = entry.size & V1_RANGEMASK; entry.size = entry.size & V1_RANGEMASK;
entry.mtime = entry.mtime & V1_RANGEMASK; entry.mtime = entry.mtime & V1_RANGEMASK;
} }
let old_state = match self.get(filename)? { let old_state = match self.get(filename)? {