Patchwork D12462: rhg: use the new `set_clean` API

login
register
mail settings
Submitter phabricator
Date April 6, 2022, 2:12 p.m.
Message ID <differential-rev-PHID-DREV-ipdmtpagz27ur7rzoa4d-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50808/
State New
Headers show

Comments

phabricator - April 6, 2022, 2:12 p.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12462

AFFECTED FILES
  rust/rhg/src/commands/status.rs

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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
@@ -15,7 +15,6 @@ 
 use hg::dirstate::has_exec_bit;
 use hg::dirstate::status::StatusPath;
 use hg::dirstate::TruncatedTimestamp;
-use hg::dirstate::RANGE_MASK_31BIT;
 use hg::errors::{HgError, IoResultExt};
 use hg::lock::LockError;
 use hg::manifest::Manifest;
@@ -390,12 +389,8 @@ 
                         .when_reading_file(&fs_path)?
                     {
                         let mode = fs_metadata.mode();
-                        let size = fs_metadata.len() as u32 & RANGE_MASK_31BIT;
-                        let mut entry = dmap
-                            .get(&hg_path)?
-                            .expect("ambiguous file not in dirstate");
-                        entry.set_clean(mode, size, mtime);
-                        dmap.add_file(&hg_path, entry)?;
+                        let size = fs_metadata.len();
+                        dmap.set_clean(&hg_path, mode, size as u32, mtime)?;
                         dirstate_write_needed = true
                     }
                 }