comparison rust/hg-core/src/dirstate/dirstate_map.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

47523:b76d54b90dc9

    /// Add a tracked file to the dirstate
    pub fn add_file(
        &mut self,
        filename: &HgPath,
        old_state: EntryState,
        entry: DirstateEntry,
        // XXX once the dust settle this should probably become an enum
        from_p2: bool,
        possibly_dirty: bool,
    ) -> Result<(), DirstateError> {

            entry.mtime = MTIME_UNSET;
        } else {
            entry.size = entry.size & V1_RANGEMASK;
            entry.mtime = entry.mtime & V1_RANGEMASK;
        }

        if old_state == EntryState::Unknown || old_state == EntryState::Removed
        {
            if let Some(ref mut dirs) = self.dirs {
                dirs.add_path(filename)?;
            }

        assert_eq!(0, map.len());

        map.add_file(
            HgPath::new(b"meh"),
            EntryState::Normal,
            DirstateEntry {
                state: EntryState::Normal,
                mode: 1337,
                mtime: 1337,
                size: 1337,

47524:69a463a4f193

    /// Add a tracked file to the dirstate
    pub fn add_file(
        &mut self,
        filename: &HgPath,
        entry: DirstateEntry,
        // XXX once the dust settle this should probably become an enum
        from_p2: bool,
        possibly_dirty: bool,
    ) -> Result<(), DirstateError> {

            entry.mtime = MTIME_UNSET;
        } else {
            entry.size = entry.size & V1_RANGEMASK;
            entry.mtime = entry.mtime & V1_RANGEMASK;
        }
        let old_state = match self.get(filename) {
            Some(e) => e.state,
            None => EntryState::Unknown,
        };
        if old_state == EntryState::Unknown || old_state == EntryState::Removed
        {
            if let Some(ref mut dirs) = self.dirs {
                dirs.add_path(filename)?;
            }

        assert_eq!(0, map.len());

        map.add_file(
            HgPath::new(b"meh"),
            DirstateEntry {
                state: EntryState::Normal,
                mode: 1337,
                mtime: 1337,
                size: 1337,