Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/dirstate_tree/status.rs @ 48022:f2a9db29cb2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust: Make the fields of DirstateEntry private This is a first step toward making its internal structure equivalent to Python?s DirstateItem. Differential Revision: https://phab.mercurial-scm.org/D11461
author Simon Sapin <simon.sapin@octobus.net>
date Fri, 17 Sep 2021 13:33:45 +0200
parents 94e38822d395
children 1b2ee68e85f9
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/status.rs	Mon Sep 20 13:16:36 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/status.rs	Fri Sep 17 13:33:45 2021 +0200
@@ -506,11 +506,9 @@
         let hg_path = &dirstate_node.full_path_borrowed(self.dmap.on_disk)?;
         let mode_changed =
             || self.options.check_exec && entry.mode_changed(fs_metadata);
-        let size_changed = entry.size != truncate_u64(fs_metadata.len());
-        if entry.size >= 0
-            && size_changed
-            && fs_metadata.file_type().is_symlink()
-        {
+        let size = entry.size();
+        let size_changed = size != truncate_u64(fs_metadata.len());
+        if size >= 0 && size_changed && fs_metadata.file_type().is_symlink() {
             // issue6456: Size returned may be longer due to encryption
             // on EXT-4 fscrypt. TODO maybe only do it on EXT4?
             self.outcome
@@ -520,7 +518,7 @@
                 .push(hg_path.detach_from_tree())
         } else if dirstate_node.has_copy_source()
             || entry.is_from_other_parent()
-            || (entry.size >= 0 && (size_changed || mode_changed()))
+            || (size >= 0 && (size_changed || mode_changed()))
         {
             self.outcome
                 .lock()
@@ -529,7 +527,7 @@
                 .push(hg_path.detach_from_tree())
         } else {
             let mtime = mtime_seconds(fs_metadata);
-            if truncate_i64(mtime) != entry.mtime
+            if truncate_i64(mtime) != entry.mtime()
                 || mtime == self.options.last_normal_time
             {
                 self.outcome