diff rust/hg-cpython/src/dirstate/dispatch.rs @ 47535:6025353c9c55

dirstate: no longer pass `oldstate` to the `dropfile` The `oldstate` value come literally from `_map` so we don't need to pass tha information along. Differential Revision: https://phab.mercurial-scm.org/D10978
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 02:28:08 +0200
parents c6b91a9c242a
children ff97e793ed36
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 02:21:59 2021 +0200
+++ b/rust/hg-cpython/src/dirstate/dispatch.rs	Sun Jul 04 02:28:08 2021 +0200
@@ -9,7 +9,6 @@
 use hg::DirstateError;
 use hg::DirstateParents;
 use hg::DirstateStatus;
-use hg::EntryState;
 use hg::PatternFileWarning;
 use hg::StateMapIter;
 use hg::StatusError;
@@ -48,12 +47,8 @@
         self.get_mut().remove_file(filename, in_merge)
     }
 
-    fn drop_file(
-        &mut self,
-        filename: &HgPath,
-        old_state: EntryState,
-    ) -> Result<bool, DirstateError> {
-        self.get_mut().drop_file(filename, old_state)
+    fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError> {
+        self.get_mut().drop_file(filename)
     }
 
     fn clear_ambiguous_times(