equal
deleted
inserted
replaced
24 fn add_file( |
24 fn add_file( |
25 &mut self, |
25 &mut self, |
26 filename: &HgPath, |
26 filename: &HgPath, |
27 old_state: EntryState, |
27 old_state: EntryState, |
28 entry: DirstateEntry, |
28 entry: DirstateEntry, |
|
29 from_p2: bool, |
|
30 possibly_dirty: bool, |
29 ) -> Result<(), DirstateError> { |
31 ) -> Result<(), DirstateError> { |
30 self.get_mut().add_file(filename, old_state, entry) |
32 self.get_mut().add_file( |
|
33 filename, |
|
34 old_state, |
|
35 entry, |
|
36 from_p2, |
|
37 possibly_dirty, |
|
38 ) |
31 } |
39 } |
32 |
40 |
33 fn remove_file( |
41 fn remove_file( |
34 &mut self, |
42 &mut self, |
35 filename: &HgPath, |
43 filename: &HgPath, |