Mercurial > public > mercurial-scm > hg

diff rust/hg-core/src/dirstate_tree/dispatch.rs @ 47108:e3cebe96c0fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-tree: Add "non normal" and "from other parent" sets Unlike the other DirstateMap implementation, these sets are not materialized separately in memory. Instead we traverse the main tree. Differential Revision: https://phab.mercurial-scm.org/D10492
author Simon Sapin <simon.sapin@octobus.net>
date Fri, 09 Apr 2021 13:13:19 +0200
parents 5d62243c7732
children 33e5511b571a
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/dispatch.rs	Fri Apr 09 12:55:35 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dispatch.rs	Fri Apr 09 13:13:19 2021 +0200
@@ -45,7 +45,7 @@
 
     fn non_normal_entries_contains(&mut self, key: &HgPath) -> bool;
 
-    fn non_normal_entries_remove(&mut self, key: &HgPath) -> bool;
+    fn non_normal_entries_remove(&mut self, key: &HgPath);
 
     fn non_normal_or_other_parent_paths(
         &mut self,
@@ -179,7 +179,7 @@
         non_normal.contains(key)
     }
 
-    fn non_normal_entries_remove(&mut self, key: &HgPath) -> bool {
+    fn non_normal_entries_remove(&mut self, key: &HgPath) {
         self.non_normal_entries_remove(key)
     }