comparison rust/hg-core/src/dirstate_tree/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

47534:e53a42dce923

use crate::DirstateEntry;
use crate::DirstateError;
use crate::DirstateMap;
use crate::DirstateParents;
use crate::DirstateStatus;
use crate::EntryState;
use crate::PatternFileWarning;
use crate::StateMapIter;
use crate::StatusError;
use crate::StatusOptions;

    ///
    /// `get` will now return `None` for this filename.
    ///
    /// `old_state` is the state in the entry that `get` would have returned
    /// before this call, or `EntryState::Unknown` if there was no such entry.
    fn drop_file(
        &mut self,
        filename: &HgPath,
        old_state: EntryState,
    ) -> Result<bool, DirstateError>;

    /// Among given files, mark the stored `mtime` as ambiguous if there is one
    /// (if `state == EntryState::Normal`) equal to the given current Unix
    /// timestamp.
    fn clear_ambiguous_times(

        in_merge: bool,
    ) -> Result<(), DirstateError> {
        self.remove_file(filename, in_merge)
    }

    fn drop_file(
        &mut self,
        filename: &HgPath,
        old_state: EntryState,
    ) -> Result<bool, DirstateError> {
        self.drop_file(filename, old_state)
    }

    fn clear_ambiguous_times(
        &mut self,
        filenames: Vec<HgPathBuf>,

47535:6025353c9c55

use crate::DirstateEntry;
use crate::DirstateError;
use crate::DirstateMap;
use crate::DirstateParents;
use crate::DirstateStatus;
use crate::PatternFileWarning;
use crate::StateMapIter;
use crate::StatusError;
use crate::StatusOptions;

    ///
    /// `get` will now return `None` for this filename.
    ///
    /// `old_state` is the state in the entry that `get` would have returned
    /// before this call, or `EntryState::Unknown` if there was no such entry.
    fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError>;

    /// Among given files, mark the stored `mtime` as ambiguous if there is one
    /// (if `state == EntryState::Normal`) equal to the given current Unix
    /// timestamp.
    fn clear_ambiguous_times(

        in_merge: bool,
    ) -> Result<(), DirstateError> {
        self.remove_file(filename, in_merge)
    }

    fn drop_file(&mut self, filename: &HgPath) -> Result<bool, DirstateError> {
        self.drop_file(filename)
    }

    fn clear_ambiguous_times(
        &mut self,
        filenames: Vec<HgPathBuf>,