Mercurial > hg
comparison rust/hg-core/src/dirstate_tree/dirstate_map.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 | 80617f3c0f9a |
comparison
equal
deleted
inserted
replaced
| 47526:8bcae9bf9e8d | 47527:c6b91a9c242a |
|---|---|
| 721 fn add_file( | 721 fn add_file( |
| 722 &mut self, | 722 &mut self, |
| 723 filename: &HgPath, | 723 filename: &HgPath, |
| 724 entry: DirstateEntry, | 724 entry: DirstateEntry, |
| 725 added: bool, | 725 added: bool, |
| 726 merged: bool, | |
| 726 from_p2: bool, | 727 from_p2: bool, |
| 727 possibly_dirty: bool, | 728 possibly_dirty: bool, |
| 728 ) -> Result<(), DirstateError> { | 729 ) -> Result<(), DirstateError> { |
| 729 let mut entry = entry; | 730 let mut entry = entry; |
| 730 if added { | 731 if added { |
| 731 assert!(!possibly_dirty); | 732 assert!(!possibly_dirty); |
| 732 assert!(!from_p2); | 733 assert!(!from_p2); |
| 733 entry.state = EntryState::Added; | 734 entry.state = EntryState::Added; |
| 734 entry.size = SIZE_NON_NORMAL; | 735 entry.size = SIZE_NON_NORMAL; |
| 736 entry.mtime = MTIME_UNSET; | |
| 737 } else if merged { | |
| 738 assert!(!possibly_dirty); | |
| 739 assert!(!from_p2); | |
| 740 entry.state = EntryState::Merged; | |
| 741 entry.size = SIZE_FROM_OTHER_PARENT; | |
| 735 entry.mtime = MTIME_UNSET; | 742 entry.mtime = MTIME_UNSET; |
| 736 } else if from_p2 { | 743 } else if from_p2 { |
| 737 assert!(!possibly_dirty); | 744 assert!(!possibly_dirty); |
| 738 entry.size = SIZE_FROM_OTHER_PARENT; | 745 entry.size = SIZE_FROM_OTHER_PARENT; |
| 739 entry.mtime = MTIME_UNSET; | 746 entry.mtime = MTIME_UNSET; |