equal
deleted
inserted
replaced
17 use hg::errors::{HgError, IoResultExt}; |
17 use hg::errors::{HgError, IoResultExt}; |
18 use hg::lock::LockError; |
18 use hg::lock::LockError; |
19 use hg::manifest::Manifest; |
19 use hg::manifest::Manifest; |
20 use hg::matchers::{AlwaysMatcher, IntersectionMatcher}; |
20 use hg::matchers::{AlwaysMatcher, IntersectionMatcher}; |
21 use hg::repo::Repo; |
21 use hg::repo::Repo; |
|
22 use hg::utils::debug::debug_wait_for_file; |
22 use hg::utils::files::get_bytes_from_os_string; |
23 use hg::utils::files::get_bytes_from_os_string; |
23 use hg::utils::files::get_bytes_from_path; |
24 use hg::utils::files::get_bytes_from_path; |
24 use hg::utils::files::get_path_from_bytes; |
25 use hg::utils::files::get_path_from_bytes; |
25 use hg::utils::hg_path::{hg_path_to_path_buf, HgPath}; |
26 use hg::utils::hg_path::{hg_path_to_path_buf, HgPath}; |
26 use hg::DirstateStatus; |
27 use hg::DirstateStatus; |
407 ignore_files(repo, config), |
408 ignore_files(repo, config), |
408 options, |
409 options, |
409 after_status, |
410 after_status, |
410 )?; |
411 )?; |
411 |
412 |
|
413 // Development config option to test write races |
|
414 if let Err(e) = |
|
415 debug_wait_for_file(&config, "status.pre-dirstate-write-file") |
|
416 { |
|
417 ui.write_stderr(e.as_bytes()).ok(); |
|
418 } |
|
419 |
412 if (fixup.is_empty() || filesystem_time_at_status_start.is_none()) |
420 if (fixup.is_empty() || filesystem_time_at_status_start.is_none()) |
413 && !dirstate_write_needed |
421 && !dirstate_write_needed |
414 { |
422 { |
415 // Nothing to update |
423 // Nothing to update |
416 return Ok(()); |
424 return Ok(()); |