comparison rust/hg-cpython/src/dirstate/dispatch.rs @ 47527:c6b91a9c242a

dirstate: use a `merged` parameter to _addpath

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

47526:8bcae9bf9e8d

    fn add_file(
        &mut self,
        filename: &HgPath,
        entry: DirstateEntry,
        added: bool,
        from_p2: bool,
        possibly_dirty: bool,
    ) -> Result<(), DirstateError> {
        self.get_mut().add_file(
            filename,
            entry,
            added,
            from_p2,
            possibly_dirty,
        )
    }

47527:c6b91a9c242a

    fn add_file(
        &mut self,
        filename: &HgPath,
        entry: DirstateEntry,
        added: bool,
        merged: bool,
        from_p2: bool,
        possibly_dirty: bool,
    ) -> Result<(), DirstateError> {
        self.get_mut().add_file(
            filename,
            entry,
            added,
            merged,
            from_p2,
            possibly_dirty,
        )
    }