equal
deleted
inserted
replaced
47 fn add_file( |
47 fn add_file( |
48 &mut self, |
48 &mut self, |
49 filename: &HgPath, |
49 filename: &HgPath, |
50 old_state: EntryState, |
50 old_state: EntryState, |
51 entry: DirstateEntry, |
51 entry: DirstateEntry, |
|
52 from_p2: bool, |
|
53 possibly_dirty: bool, |
52 ) -> Result<(), DirstateError>; |
54 ) -> Result<(), DirstateError>; |
53 |
55 |
54 /// Mark a file as "removed" (as in `hg rm`). |
56 /// Mark a file as "removed" (as in `hg rm`). |
55 /// |
57 /// |
56 /// `old_state` is the state in the entry that `get` would have returned |
58 /// `old_state` is the state in the entry that `get` would have returned |
285 fn add_file( |
287 fn add_file( |
286 &mut self, |
288 &mut self, |
287 filename: &HgPath, |
289 filename: &HgPath, |
288 old_state: EntryState, |
290 old_state: EntryState, |
289 entry: DirstateEntry, |
291 entry: DirstateEntry, |
|
292 from_p2: bool, |
|
293 possibly_dirty: bool, |
290 ) -> Result<(), DirstateError> { |
294 ) -> Result<(), DirstateError> { |
291 self.add_file(filename, old_state, entry) |
295 self.add_file(filename, old_state, entry, from_p2, possibly_dirty) |
292 } |
296 } |
293 |
297 |
294 fn remove_file( |
298 fn remove_file( |
295 &mut self, |
299 &mut self, |
296 filename: &HgPath, |
300 filename: &HgPath, |