[Updated] D11412: rhg: Don’t compare ambiguous files one byte at a time
SimonSapin
phabricator at mercurial-scm.org
Tue Sep 14 08:21:23 UTC 2021
Closed by commit rHGf9e6f2bb721d: rhg: Don’t compare ambiguous files one byte at a time (authored by SimonSapin).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11412?vs=30231&id=30240
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11412/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11412
AFFECTED FILES
rust/rhg/src/commands/status.rs
CHANGE DETAILS
diff --git a/rust/rhg/src/commands/status.rs b/rust/rhg/src/commands/status.rs
--- a/rust/rhg/src/commands/status.rs
+++ b/rust/rhg/src/commands/status.rs
@@ -10,17 +10,13 @@
use clap::{Arg, SubCommand};
use hg;
use hg::dirstate_tree::dispatch::DirstateMapMethods;
-use hg::errors::{HgError, IoResultExt};
+use hg::errors::HgError;
use hg::manifest::Manifest;
use hg::matchers::AlwaysMatcher;
use hg::repo::Repo;
use hg::utils::hg_path::{hg_path_to_os_string, HgPath};
use hg::{HgPathCow, StatusOptions};
use log::{info, warn};
-use std::convert::TryInto;
-use std::fs;
-use std::io::BufReader;
-use std::io::Read;
pub const HELP_TEXT: &str = "
Show changed files in the working directory
@@ -279,26 +275,7 @@
})?;
let contents_in_p1 = filelog_entry.data()?;
- let fs_path = repo
- .working_directory_vfs()
- .join(hg_path_to_os_string(hg_path).expect("HgPath conversion"));
- let hg_data_len: u64 = match contents_in_p1.len().try_into() {
- Ok(v) => v,
- Err(_) => {
- // conversion of data length to u64 failed,
- // good luck for any file to have this content
- return Ok(true);
- }
- };
- let fobj = fs::File::open(&fs_path).when_reading_file(&fs_path)?;
- if fobj.metadata().when_reading_file(&fs_path)?.len() != hg_data_len {
- return Ok(true);
- }
- for (fs_byte, &hg_byte) in BufReader::new(fobj).bytes().zip(contents_in_p1)
- {
- if fs_byte.when_reading_file(&fs_path)? != hg_byte {
- return Ok(true);
- }
- }
- Ok(false)
+ let fs_path = hg_path_to_os_string(hg_path).expect("HgPath conversion");
+ let fs_contents = repo.working_directory_vfs().read(fs_path)?;
+ return Ok(contents_in_p1 == &*fs_contents);
}
To: SimonSapin, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210914/1f38df02/attachment-0002.html>
More information about the Mercurial-patches
mailing list