Skip to content
Snippets Groups Projects
Commit 3861e3f6 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

dirstate-v2: read the fallback value in Rust

This was overlooked in a previous commit.

Differential Revision: https://phab.mercurial-scm.org/D11695
parent bb240915
No related branches found
No related tags found
No related merge requests found
......@@ -379,9 +379,21 @@
} 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,
......@@ -382,11 +394,11 @@
Ok(DirstateEntry::from_v2_data(
wdir_tracked,
p1_tracked,
p2_info,
mode_size,
mtime,
None,
None,
fallback_exec,
fallback_symlink,
))
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment