Mercurial > hg
comparison rust/hg-core/src/dirstate_tree/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 |
|---|---|
| 47 fn add_file( | 47 fn add_file( |
| 48 &mut self, | 48 &mut self, |
| 49 filename: &HgPath, | 49 filename: &HgPath, |
| 50 entry: DirstateEntry, | 50 entry: DirstateEntry, |
| 51 added: bool, | 51 added: bool, |
| 52 merged: bool, | |
| 52 from_p2: bool, | 53 from_p2: bool, |
| 53 possibly_dirty: bool, | 54 possibly_dirty: bool, |
| 54 ) -> Result<(), DirstateError>; | 55 ) -> Result<(), DirstateError>; |
| 55 | 56 |
| 56 /// Mark a file as "removed" (as in `hg rm`). | 57 /// Mark a file as "removed" (as in `hg rm`). |
| 287 fn add_file( | 288 fn add_file( |
| 288 &mut self, | 289 &mut self, |
| 289 filename: &HgPath, | 290 filename: &HgPath, |
| 290 entry: DirstateEntry, | 291 entry: DirstateEntry, |
| 291 added: bool, | 292 added: bool, |
| 293 merged: bool, | |
| 292 from_p2: bool, | 294 from_p2: bool, |
| 293 possibly_dirty: bool, | 295 possibly_dirty: bool, |
| 294 ) -> Result<(), DirstateError> { | 296 ) -> Result<(), DirstateError> { |
| 295 self.add_file(filename, entry, added, from_p2, possibly_dirty) | 297 self.add_file(filename, entry, added, merged, from_p2, possibly_dirty) |
| 296 } | 298 } |
| 297 | 299 |
| 298 fn remove_file( | 300 fn remove_file( |
| 299 &mut self, | 301 &mut self, |
| 300 filename: &HgPath, | 302 filename: &HgPath, |