( )⚙ D11743 rhg: Fix `rhg status` file content comparison

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11743

rhg: Fix `rhg status` file content comparison
ClosedPublic

Authored by SimonSapin on Nov 9 2021, 9:44 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG594cf89047c8: rhg: Fix `rhg status` file content comparison
Summary

This is only used when a file’s metadata make its status ambiguous,
which depends on timing of previous command executions.

Diff Detail

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

Event Timeline

SimonSapin created this revision.Nov 9 2021, 9:44 AM
Alphare accepted this revision.Nov 9 2021, 9:45 AM
Alphare added a subscriber: Alphare.

yikes

This revision is now accepted and ready to land.Nov 9 2021, 9:45 AM
SimonSapin added a commit: rHG594cf89047c8: rhg: Fix `rhg status` file content comparison.Nov 9 2021, 10:02 AM
Closed by commit rHG594cf89047c8: rhg: Fix `rhg status` file content comparison (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 31039

rust/rhg/src/commands/status.rs

let filelog = repo.filelog(hg_path)?; let filelog = repo.filelog(hg_path)?;
let filelog_entry = filelog.data_for_node(file_node).map_err(|_| { let filelog_entry = filelog.data_for_node(file_node).map_err(|_| {
HgError::corrupted("filelog missing node from manifest") HgError::corrupted("filelog missing node from manifest")
})?; })?;
let contents_in_p1 = filelog_entry.data()?; let contents_in_p1 = filelog_entry.data()?;
let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion"); let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion");
let fs_contents = repo.working_directory_vfs().read(fs_path)?; let fs_contents = repo.working_directory_vfs().read(fs_path)?;
return Ok(contents_in_p1 == &*fs_contents); return Ok(contents_in_p1 != &*fs_contents);
} }