Mercurial > public > mercurial-scm > hg-stable
comparison rust/hg-core/src/dirstate_tree/dispatch.rs @ 47524:69a463a4f193
dirstate: no longer pass the `oldstate` value to the dirstatemap
The dirstatemap already have this information.
Differential Revision: https://phab.mercurial-scm.org/D10966
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 03 Jul 2021 20:59:26 +0200 |
| parents | abed645b8e96 |
| children | fe4641cf9b72 |
comparison
equal
deleted
inserted
replaced
| 47523:b76d54b90dc9 | 47524:69a463a4f193 |
|---|---|
| 45 /// | 45 /// |
| 46 /// `entry.state` should never be `EntryState::Unknown`. | 46 /// `entry.state` should never be `EntryState::Unknown`. |
| 47 fn add_file( | 47 fn add_file( |
| 48 &mut self, | 48 &mut self, |
| 49 filename: &HgPath, | 49 filename: &HgPath, |
| 50 old_state: EntryState, | |
| 51 entry: DirstateEntry, | 50 entry: DirstateEntry, |
| 52 from_p2: bool, | 51 from_p2: bool, |
| 53 possibly_dirty: bool, | 52 possibly_dirty: bool, |
| 54 ) -> Result<(), DirstateError>; | 53 ) -> Result<(), DirstateError>; |
| 55 | 54 |
| 285 } | 284 } |
| 286 | 285 |
| 287 fn add_file( | 286 fn add_file( |
| 288 &mut self, | 287 &mut self, |
| 289 filename: &HgPath, | 288 filename: &HgPath, |
| 290 old_state: EntryState, | |
| 291 entry: DirstateEntry, | 289 entry: DirstateEntry, |
| 292 from_p2: bool, | 290 from_p2: bool, |
| 293 possibly_dirty: bool, | 291 possibly_dirty: bool, |
| 294 ) -> Result<(), DirstateError> { | 292 ) -> Result<(), DirstateError> { |
| 295 self.add_file(filename, old_state, entry, from_p2, possibly_dirty) | 293 self.add_file(filename, entry, from_p2, possibly_dirty) |
| 296 } | 294 } |
| 297 | 295 |
| 298 fn remove_file( | 296 fn remove_file( |
| 299 &mut self, | 297 &mut self, |
| 300 filename: &HgPath, | 298 filename: &HgPath, |