Mercurial > hg

diff rust/hg-core/src/dirstate_tree/dirstate_map.rs @ 48048:76f1c76186a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: Remove return boolean from dirstatemap.dropfile None of the remaining callers use it. Differential Revision: https://phab.mercurial-scm.org/D11491
author Simon Sapin <simon.sapin@octobus.net>
date Thu, 23 Sep 2021 15:26:33 +0200
parents 9b2a51b2c36a
children 2ac0e6b23222
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs	Wed Sep 22 18:56:58 2021 +0200
+++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs	Thu Sep 23 15:26:33 2021 +0200
@@ -845,7 +845,7 @@
         Ok(self.add_or_remove_file(filename, old_state, entry)?)
     }
 
-    fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError> {
+    fn drop_file(&mut self, filename: &HgPath) -> Result<(), DirstateError> {
         let was_tracked = self
             .get(filename)?
             .map_or(false, |e| e.state().is_tracked());
@@ -946,11 +946,10 @@
             if dropped.had_copy_source {
                 self.nodes_with_copy_source_count -= 1
             }
-            Ok(dropped.had_entry)
         } else {
             debug_assert!(!was_tracked);
-            Ok(false)
         }
+        Ok(())
     }
 
     fn clear_ambiguous_times(