( )⚙ D11773 rhg: Rename cat_file_is_modified

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11773

rhg: Rename cat_file_is_modified
ClosedPublic

Authored by SimonSapin on Nov 23 2021, 2:11 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb6d8eea9872c: rhg: Rename cat_file_is_modified
Summary

It hasn’t been based on the "cat operation" for some time already.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

SimonSapin created this revision.Nov 23 2021, 2:11 PM
Alphare accepted this revision.Nov 24 2021, 6:32 AM
This revision is now accepted and ready to land.Nov 24 2021, 6:32 AM
SimonSapin added a commit: rHGb6d8eea9872c: rhg: Rename cat_file_is_modified.Nov 26 2021, 10:04 AM
Closed by commit rHGb6d8eea9872c: rhg: Rename cat_file_is_modified (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 31164.Nov 26 2021, 10:33 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/status.rs (4 lines)

Diff 31095

rust/rhg/src/commands/status.rs

if !ds_status.unsure.is_empty() if !ds_status.unsure.is_empty()
&& (display_states.modified || display_states.clean) && (display_states.modified || display_states.clean)
{ {
let p1 = repo.dirstate_parents()?.p1; let p1 = repo.dirstate_parents()?.p1;
let manifest = repo.manifest_for_node(p1).map_err(|e| { let manifest = repo.manifest_for_node(p1).map_err(|e| {
CommandError::from((e, &*format!("{:x}", p1.short()))) CommandError::from((e, &*format!("{:x}", p1.short())))
})?; })?;
for to_check in ds_status.unsure { for to_check in ds_status.unsure {
if cat_file_is_modified(repo, &manifest, &to_check)? { if unsure_is_modified(repo, &manifest, &to_check)? {
if display_states.modified { if display_states.modified {
ds_status.modified.push(to_check); ds_status.modified.push(to_check);
} }
} else { } else {
if display_states.clean { if display_states.clean {
ds_status.clean.push(to_check); ds_status.clean.push(to_check);
} }
} }
} }
/// Check if a file is modified by comparing actual repo store and file system. /// Check if a file is modified by comparing actual repo store and file system.
/// ///
/// This meant to be used for those that the dirstate cannot resolve, due /// This meant to be used for those that the dirstate cannot resolve, due
/// to time resolution limits. /// to time resolution limits.
/// ///
/// TODO: detect permission bits and similar metadata modifications /// TODO: detect permission bits and similar metadata modifications
fn cat_file_is_modified( fn unsure_is_modified(
repo: &Repo, repo: &Repo,
manifest: &Manifest, manifest: &Manifest,
hg_path: &HgPath, hg_path: &HgPath,
) -> Result<bool, HgError> { ) -> Result<bool, HgError> {
let entry = manifest let entry = manifest
.find_file(hg_path)? .find_file(hg_path)?
.expect("ambgious file not in p1"); .expect("ambgious file not in p1");
let filelog = repo.filelog(hg_path)?; let filelog = repo.filelog(hg_path)?;