This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11593

dirstate-item: directly use `p2_info` in `v1_size`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6ac2b417d5d7: dirstate-item: directly use `p2_info` in `v1_size`
Summary

This is simpler.

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.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30598.Oct 3 2021, 6:51 AM

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

Alphare accepted this revision.Oct 3 2021, 5:14 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:14 PM
marmoute added a commit: rHG6ac2b417d5d7: dirstate-item: directly use `p2_info` in `v1_size`.Oct 3 2021, 5:35 PM
Closed by commit rHG6ac2b417d5d7: dirstate-item: directly use `p2_info` in `v1_size` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30651

mercurial/pure/parsers.py

def v1_size(self): def v1_size(self):
"""return a "size" suitable for v1 serialization""" """return a "size" suitable for v1 serialization"""
if not self.any_tracked: if not self.any_tracked:
# the object has no state to record, this is -currently- # the object has no state to record, this is -currently-
# unsupported # unsupported
raise RuntimeError('untracked item') raise RuntimeError('untracked item')
elif self.removed and self._p1_tracked and self._p2_info: elif self.removed and self._p1_tracked and self._p2_info:
return NONNORMAL return NONNORMAL
elif self.removed and self._p2_info: elif self._p2_info:
return FROM_P2 return FROM_P2
elif self.removed: elif self.removed:
return 0 return 0
elif self.merged:
return FROM_P2
elif self.added: elif self.added:
return NONNORMAL return NONNORMAL
elif self.from_p2:
return FROM_P2
elif self._size is None: elif self._size is None:
return NONNORMAL return NONNORMAL
else: else:
return self._size return self._size
def v1_mtime(self): def v1_mtime(self):
"""return a "mtime" suitable for v1 serialization""" """return a "mtime" suitable for v1 serialization"""
if not self.any_tracked: if not self.any_tracked:

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

if !self.any_tracked() { if !self.any_tracked() {
// TODO: return an Option instead? // TODO: return an Option instead?
panic!("Accessing v1_size of an untracked DirstateEntry") panic!("Accessing v1_size of an untracked DirstateEntry")
} }
if self.removed() if self.removed()
&& self.flags.contains(Flags::P1_TRACKED | Flags::P2_INFO) && self.flags.contains(Flags::P1_TRACKED | Flags::P2_INFO)
{ {
SIZE_NON_NORMAL SIZE_NON_NORMAL
} else if self.removed() && self.flags.contains(Flags::P2_INFO) { } else if self.flags.contains(Flags::P2_INFO) {
SIZE_FROM_OTHER_PARENT SIZE_FROM_OTHER_PARENT
} else if self.removed() { } else if self.removed() {
0 0
} else if self.merged() {
SIZE_FROM_OTHER_PARENT
} else if self.added() { } else if self.added() {
SIZE_NON_NORMAL SIZE_NON_NORMAL
} else if self.from_p2() {
SIZE_FROM_OTHER_PARENT
} else if let Some((_mode, size)) = self.mode_size { } else if let Some((_mode, size)) = self.mode_size {
size size
} else { } else {
SIZE_NON_NORMAL SIZE_NON_NORMAL
} }
} }
fn v1_mtime(&self) -> i32 { fn v1_mtime(&self) -> i32 {