comparison rust/hg-core/src/dirstate/dirstate_map.rs @ 48050:2ac0e6b23222

dirstate: Replace dropfile with drop_item_and_copy_source

Those removing a DirstateItem and a copy source are always done together

Differential Revision: https://phab.mercurial-scm.org/D11493

48049:29aa633815db

        Ok(())
    }

    /// Remove a file from the dirstate.
    /// Returns `true` if the file was previously recorded.
    pub fn drop_file(
        &mut self,
        filename: &HgPath,
    ) -> Result<(), DirstateError> {
        let old_state = self.get(filename).map(|e| e.state());
        let exists = self.state_map.remove(filename).is_some();

            }
        }
        self.get_non_normal_other_parent_entries()
            .0
            .remove(filename);

        Ok(())
    }

    pub fn clear_ambiguous_times(

48050:2ac0e6b23222

        Ok(())
    }

    /// Remove a file from the dirstate.
    /// Returns `true` if the file was previously recorded.
    pub fn drop_entry_and_copy_source(
        &mut self,
        filename: &HgPath,
    ) -> Result<(), DirstateError> {
        let old_state = self.get(filename).map(|e| e.state());
        let exists = self.state_map.remove(filename).is_some();

            }
        }
        self.get_non_normal_other_parent_entries()
            .0
            .remove(filename);

        self.copy_map.remove(filename);

        Ok(())
    }

    pub fn clear_ambiguous_times(