Mercurial > hg
comparison rust/hg-core/src/dirstate_tree/dispatch.rs @ 48048:76f1c76186a1
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 | 29aa633815db |
comparison
equal
deleted
inserted
replaced
48047:9b2a51b2c36a | 48048:76f1c76186a1 |
---|---|
79 /// | 79 /// |
80 /// `get` will now return `None` for this filename. | 80 /// `get` will now return `None` for this filename. |
81 /// | 81 /// |
82 /// `old_state` is the state in the entry that `get` would have returned | 82 /// `old_state` is the state in the entry that `get` would have returned |
83 /// before this call, or `EntryState::Unknown` if there was no such entry. | 83 /// before this call, or `EntryState::Unknown` if there was no such entry. |
84 fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError>; | 84 fn drop_file(&mut self, filename: &HgPath) -> Result<(), DirstateError>; |
85 | 85 |
86 /// Among given files, mark the stored `mtime` as ambiguous if there is one | 86 /// Among given files, mark the stored `mtime` as ambiguous if there is one |
87 /// (if `state == EntryState::Normal`) equal to the given current Unix | 87 /// (if `state == EntryState::Normal`) equal to the given current Unix |
88 /// timestamp. | 88 /// timestamp. |
89 fn clear_ambiguous_times( | 89 fn clear_ambiguous_times( |
352 in_merge: bool, | 352 in_merge: bool, |
353 ) -> Result<(), DirstateError> { | 353 ) -> Result<(), DirstateError> { |
354 self.remove_file(filename, in_merge) | 354 self.remove_file(filename, in_merge) |
355 } | 355 } |
356 | 356 |
357 fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError> { | 357 fn drop_file(&mut self, filename: &HgPath) -> Result<(), DirstateError> { |
358 self.drop_file(filename) | 358 self.drop_file(filename) |
359 } | 359 } |
360 | 360 |
361 fn clear_ambiguous_times( | 361 fn clear_ambiguous_times( |
362 &mut self, | 362 &mut self, |