##// END OF EJS Templates
narrow: widen when files are excluded by sparse and not included by narrow...
narrow: widen when files are excluded by sparse and not included by narrow In a repo where some directories are included by narrow and the complement are excluded by sparse, it was previously impossible to widen either because trying to widen narrow would complain that the requested files are outside the sparse checkout and trying to widen sparse would complain that the requested files are outside the narrow checkout. This changes the `hg tracked --addinclude` command to only actually update any newly accessible files in the dirstate if they are also accessible via sparse. Differential Revision: https://phab.mercurial-scm.org/D10734

File last commit:

r48055:1766130f default
r48084:e4ccc341 default
Show More
dispatch.rs
300 lines | 7.7 KiB | application/rls-services+xml | RustLexer
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 use std::path::PathBuf;
Simon Sapin
rust: Add a Timestamp struct instead of abusing Duration...
r47871 use crate::dirstate::parsers::Timestamp;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 use crate::matchers::Matcher;
use crate::utils::hg_path::{HgPath, HgPathBuf};
use crate::CopyMapIter;
use crate::DirstateEntry;
use crate::DirstateError;
use crate::DirstateMap;
use crate::DirstateMapError;
use crate::DirstateParents;
use crate::DirstateStatus;
use crate::EntryState;
use crate::PatternFileWarning;
use crate::StateMapIter;
use crate::StatusError;
use crate::StatusOptions;
pub trait DirstateMapMethods {
fn clear(&mut self);
fn add_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
entry: DirstateEntry,
) -> Result<(), DirstateMapError>;
fn remove_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
size: i32,
) -> Result<(), DirstateMapError>;
fn drop_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
) -> Result<bool, DirstateMapError>;
fn clear_ambiguous_times(&mut self, filenames: Vec<HgPathBuf>, now: i32);
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn non_normal_entries_contains(&mut self, key: &HgPath) -> bool;
Simon Sapin
dirstate-tree: Add "non normal" and "from other parent" sets...
r47878 fn non_normal_entries_remove(&mut self, key: &HgPath);
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn non_normal_or_other_parent_paths(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + '_>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
fn set_non_normal_other_parent_entries(&mut self, force: bool);
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn iter_non_normal_paths(
&mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn iter_non_normal_paths_panic(
&self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_>;
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864
fn iter_other_parent_paths(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
fn has_tracked_dir(
&mut self,
directory: &HgPath,
) -> Result<bool, DirstateMapError>;
fn has_dir(
&mut self,
directory: &HgPath,
) -> Result<bool, DirstateMapError>;
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 fn pack_v1(
&mut self,
parents: DirstateParents,
now: Timestamp,
) -> Result<Vec<u8>, DirstateError>;
fn pack_v2(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
parents: DirstateParents,
Simon Sapin
rust: Add a Timestamp struct instead of abusing Duration...
r47871 now: Timestamp,
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 ) -> Result<Vec<u8>, DirstateError>;
fn set_all_dirs(&mut self) -> Result<(), DirstateMapError>;
fn set_dirs(&mut self) -> Result<(), DirstateMapError>;
fn status<'a>(
Simon Sapin
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`...
r47882 &'a mut self,
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 matcher: &'a (dyn Matcher + Sync),
root_dir: PathBuf,
ignore_files: Vec<PathBuf>,
options: StatusOptions,
Simon Sapin
rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct...
r47880 ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
fn copy_map_len(&self) -> usize;
fn copy_map_iter(&self) -> CopyMapIter<'_>;
fn copy_map_contains_key(&self, key: &HgPath) -> bool;
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 fn copy_map_get(&self, key: &HgPath) -> Option<&HgPath>;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863
fn copy_map_remove(&mut self, key: &HgPath) -> Option<HgPathBuf>;
fn copy_map_insert(
&mut self,
key: HgPathBuf,
value: HgPathBuf,
) -> Option<HgPathBuf>;
fn len(&self) -> usize;
fn contains_key(&self, key: &HgPath) -> bool;
fn get(&self, key: &HgPath) -> Option<&DirstateEntry>;
fn iter(&self) -> StateMapIter<'_>;
}
impl DirstateMapMethods for DirstateMap {
fn clear(&mut self) {
self.clear()
}
fn add_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
entry: DirstateEntry,
) -> Result<(), DirstateMapError> {
self.add_file(filename, old_state, entry)
}
fn remove_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
size: i32,
) -> Result<(), DirstateMapError> {
self.remove_file(filename, old_state, size)
}
fn drop_file(
&mut self,
filename: &HgPath,
old_state: EntryState,
) -> Result<bool, DirstateMapError> {
self.drop_file(filename, old_state)
}
fn clear_ambiguous_times(&mut self, filenames: Vec<HgPathBuf>, now: i32) {
self.clear_ambiguous_times(filenames, now)
}
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn non_normal_entries_contains(&mut self, key: &HgPath) -> bool {
let (non_normal, _other_parent) =
self.get_non_normal_other_parent_entries();
non_normal.contains(key)
}
Simon Sapin
dirstate-tree: Add "non normal" and "from other parent" sets...
r47878 fn non_normal_entries_remove(&mut self, key: &HgPath) {
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 self.non_normal_entries_remove(key)
}
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn non_normal_or_other_parent_paths(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + '_> {
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 let (non_normal, other_parent) =
self.get_non_normal_other_parent_entries();
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new(non_normal.union(other_parent).map(|p| &**p))
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
fn set_non_normal_other_parent_entries(&mut self, force: bool) {
self.set_non_normal_other_parent_entries(force)
}
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn iter_non_normal_paths(
&mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_> {
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 let (non_normal, _other_parent) =
self.get_non_normal_other_parent_entries();
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new(non_normal.iter().map(|p| &**p))
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 fn iter_non_normal_paths_panic(
&self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_> {
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 let (non_normal, _other_parent) =
self.get_non_normal_other_parent_entries_panic();
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new(non_normal.iter().map(|p| &**p))
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 }
fn iter_other_parent_paths(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 ) -> Box<dyn Iterator<Item = &HgPath> + Send + '_> {
Simon Sapin
dirstate-tree: Abstract "non-normal" and "other parent" sets...
r47864 let (_non_normal, other_parent) =
self.get_non_normal_other_parent_entries();
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new(other_parent.iter().map(|p| &**p))
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
fn has_tracked_dir(
&mut self,
directory: &HgPath,
) -> Result<bool, DirstateMapError> {
self.has_tracked_dir(directory)
}
fn has_dir(
&mut self,
directory: &HgPath,
) -> Result<bool, DirstateMapError> {
self.has_dir(directory)
}
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 fn pack_v1(
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 &mut self,
parents: DirstateParents,
Simon Sapin
rust: Add a Timestamp struct instead of abusing Duration...
r47871 now: Timestamp,
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 ) -> Result<Vec<u8>, DirstateError> {
self.pack(parents, now)
}
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 fn pack_v2(
&mut self,
_parents: DirstateParents,
_now: Timestamp,
) -> Result<Vec<u8>, DirstateError> {
panic!(
"should have used dirstate_tree::DirstateMap to use the v2 format"
)
}
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 fn set_all_dirs(&mut self) -> Result<(), DirstateMapError> {
self.set_all_dirs()
}
fn set_dirs(&mut self) -> Result<(), DirstateMapError> {
self.set_dirs()
}
fn status<'a>(
Simon Sapin
dirstate-tree: Give to `status()` mutable access to the `DirstateMap`...
r47882 &'a mut self,
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 matcher: &'a (dyn Matcher + Sync),
root_dir: PathBuf,
ignore_files: Vec<PathBuf>,
options: StatusOptions,
Simon Sapin
rust: Move "lookup" a.k.a. "unsure" paths into `DirstateStatus` struct...
r47880 ) -> Result<(DirstateStatus<'a>, Vec<PatternFileWarning>), StatusError>
{
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 crate::status(self, matcher, root_dir, ignore_files, options)
}
fn copy_map_len(&self) -> usize {
self.copy_map.len()
}
fn copy_map_iter(&self) -> CopyMapIter<'_> {
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new(self.copy_map.iter().map(|(key, value)| (&**key, &**value)))
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
fn copy_map_contains_key(&self, key: &HgPath) -> bool {
self.copy_map.contains_key(key)
}
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 fn copy_map_get(&self, key: &HgPath) -> Option<&HgPath> {
self.copy_map.get(key).map(|p| &**p)
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
fn copy_map_remove(&mut self, key: &HgPath) -> Option<HgPathBuf> {
self.copy_map.remove(key)
}
fn copy_map_insert(
&mut self,
key: HgPathBuf,
value: HgPathBuf,
) -> Option<HgPathBuf> {
self.copy_map.insert(key, value)
}
fn len(&self) -> usize {
(&**self).len()
}
fn contains_key(&self, key: &HgPath) -> bool {
(&**self).contains_key(key)
}
fn get(&self, key: &HgPath) -> Option<&DirstateEntry> {
(&**self).get(key)
}
fn iter(&self) -> StateMapIter<'_> {
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 Box::new((&**self).iter().map(|(key, value)| (&**key, value)))
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 }
}