equal
deleted
inserted
replaced
4 use crate::dirstate_tree::dirstate_map::DirstateMap; |
4 use crate::dirstate_tree::dirstate_map::DirstateMap; |
5 use crate::dirstate_tree::owning::OwningDirstateMap; |
5 use crate::dirstate_tree::owning::OwningDirstateMap; |
6 use crate::errors::HgError; |
6 use crate::errors::HgError; |
7 use crate::errors::HgResultExt; |
7 use crate::errors::HgResultExt; |
8 use crate::exit_codes; |
8 use crate::exit_codes; |
|
9 use crate::lock::{try_with_lock_no_wait, LockError}; |
9 use crate::manifest::{Manifest, Manifestlog}; |
10 use crate::manifest::{Manifest, Manifestlog}; |
10 use crate::revlog::filelog::Filelog; |
11 use crate::revlog::filelog::Filelog; |
11 use crate::revlog::revlog::RevlogError; |
12 use crate::revlog::revlog::RevlogError; |
12 use crate::utils::files::get_path_from_bytes; |
13 use crate::utils::files::get_path_from_bytes; |
13 use crate::utils::hg_path::HgPath; |
14 use crate::utils::hg_path::HgPath; |
239 /// For accessing the working copy |
240 /// For accessing the working copy |
240 pub fn working_directory_vfs(&self) -> Vfs<'_> { |
241 pub fn working_directory_vfs(&self) -> Vfs<'_> { |
241 Vfs { |
242 Vfs { |
242 base: &self.working_directory, |
243 base: &self.working_directory, |
243 } |
244 } |
|
245 } |
|
246 |
|
247 pub fn try_with_wlock_no_wait<R>( |
|
248 &self, |
|
249 f: impl FnOnce() -> R, |
|
250 ) -> Result<R, LockError> { |
|
251 try_with_lock_no_wait(self.hg_vfs(), "wlock", f) |
244 } |
252 } |
245 |
253 |
246 pub fn has_dirstate_v2(&self) -> bool { |
254 pub fn has_dirstate_v2(&self) -> bool { |
247 self.requirements |
255 self.requirements |
248 .contains(requirements::DIRSTATE_V2_REQUIREMENT) |
256 .contains(requirements::DIRSTATE_V2_REQUIREMENT) |