[Updated] [+ ] D11695: dirstate-v2: read the fallback value in Rust
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Wed Oct 20 09:13:50 UTC 2021
marmoute updated this revision to Diff 30935.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11695?vs=30922&id=30935
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11695/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11695
AFFECTED FILES
rust/hg-core/src/dirstate_tree/on_disk.rs
CHANGE DETAILS
diff --git a/rust/hg-core/src/dirstate_tree/on_disk.rs b/rust/hg-core/src/dirstate_tree/on_disk.rs
--- a/rust/hg-core/src/dirstate_tree/on_disk.rs
+++ b/rust/hg-core/src/dirstate_tree/on_disk.rs
@@ -379,14 +379,26 @@
} else {
None
};
+ let fallback_exec = if self.flags().contains(Flags::HAS_FALLBACK_EXEC)
+ {
+ Some(self.flags().contains(Flags::FALLBACK_EXEC))
+ } else {
+ None
+ };
+ let fallback_symlink =
+ if self.flags().contains(Flags::HAS_FALLBACK_SYMLINK) {
+ Some(self.flags().contains(Flags::FALLBACK_SYMLINK))
+ } else {
+ None
+ };
Ok(DirstateEntry::from_v2_data(
wdir_tracked,
p1_tracked,
p2_info,
mode_size,
mtime,
- None,
- None,
+ fallback_exec,
+ fallback_symlink,
))
}
To: marmoute, #hg-reviewers, spectral, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211020/c5296519/attachment-0002.html>
More information about the Mercurial-patches
mailing list