Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/dirstate_tree/dispatch.rs @ 48051:98c0408324e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: Pass the final DirstateItem to _rustmap.addfile() Now that the Python DirstateItem class wraps a Rust DirstateEntry value, use that value directly instead of converting through v1 data + 5 booleans. Also remove propogating the return value. None of the callers look at it, and it is always None. Differential Revision: https://phab.mercurial-scm.org/D11494
author Simon Sapin <simon.sapin@octobus.net>
date Thu, 23 Sep 2021 18:29:40 +0200
parents 2ac0e6b23222
children cd13d3c2ad2e
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Thu Sep 23 15:36:43 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Thu Sep 23 18:29:40 2021 +0200
@@ -50,10 +50,6 @@
         &mut self,
         filename: &HgPath,
         entry: DirstateEntry,
-        added: bool,
-        merged: bool,
-        from_p2: bool,
-        possibly_dirty: bool,
     ) -> Result<(), DirstateError>;
 
     /// Mark a file as "removed" (as in `hg rm`).
@@ -326,12 +322,8 @@
         &mut self,
         filename: &HgPath,
         entry: DirstateEntry,
-        added: bool,
-        merged: bool,
-        from_p2: bool,
-        possibly_dirty: bool,
     ) -> Result<(), DirstateError> {
-        self.add_file(filename, entry, added, merged, from_p2, possibly_dirty)
+        self.add_file(filename, entry)
     }
 
     fn remove_file(