Mercurial > hg
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
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 04 Jul 2021 01:48:11 +0200 |
parents | fe4641cf9b72 |
children | 6025353c9c55 |
comparison
equal
deleted
inserted
replaced
47526:8bcae9bf9e8d | 47527:c6b91a9c242a |
---|---|
24 fn add_file( | 24 fn add_file( |
25 &mut self, | 25 &mut self, |
26 filename: &HgPath, | 26 filename: &HgPath, |
27 entry: DirstateEntry, | 27 entry: DirstateEntry, |
28 added: bool, | 28 added: bool, |
29 merged: bool, | |
29 from_p2: bool, | 30 from_p2: bool, |
30 possibly_dirty: bool, | 31 possibly_dirty: bool, |
31 ) -> Result<(), DirstateError> { | 32 ) -> Result<(), DirstateError> { |
32 self.get_mut().add_file( | 33 self.get_mut().add_file( |
33 filename, | 34 filename, |
34 entry, | 35 entry, |
35 added, | 36 added, |
37 merged, | |
36 from_p2, | 38 from_p2, |
37 possibly_dirty, | 39 possibly_dirty, |
38 ) | 40 ) |
39 } | 41 } |
40 | 42 |