Show More
@@ -46,11 +46,6 b' pub trait DirstateMapMethods {' | |||
|
46 | 46 | ) -> Result<(), DirstateV2ParseError>; |
|
47 | 47 | |
|
48 | 48 | /// Add or change the information associated to a given file. |
|
49 | /// | |
|
50 | /// `old_state` is the state in the entry that `get` would have returned | |
|
51 | /// before this call, or `EntryState::Unknown` if there was no such entry. | |
|
52 | /// | |
|
53 | /// `entry.state` should never be `EntryState::Unknown`. | |
|
54 | 49 | fn add_file( |
|
55 | 50 | &mut self, |
|
56 | 51 | filename: &HgPath, |
@@ -62,25 +57,15 b' pub trait DirstateMapMethods {' | |||
|
62 | 57 | ) -> Result<(), DirstateError>; |
|
63 | 58 | |
|
64 | 59 | /// Mark a file as "removed" (as in `hg rm`). |
|
65 | /// | |
|
66 | /// `old_state` is the state in the entry that `get` would have returned | |
|
67 | /// before this call, or `EntryState::Unknown` if there was no such entry. | |
|
68 | /// | |
|
69 | /// `size` is not actually a size but the 0 or -1 or -2 value that would be | |
|
70 | /// put in the size field in the dirstate-v1 format. | |
|
71 | 60 | fn remove_file( |
|
72 | 61 | &mut self, |
|
73 | 62 | filename: &HgPath, |
|
74 | 63 | in_merge: bool, |
|
75 | 64 | ) -> Result<(), DirstateError>; |
|
76 | 65 | |
|
77 |
/// Drop information about this file from the map if any |
|
|
78 | /// whether there was any. | |
|
66 | /// Drop information about this file from the map if any. | |
|
79 | 67 | /// |
|
80 | 68 | /// `get` will now return `None` for this filename. |
|
81 | /// | |
|
82 | /// `old_state` is the state in the entry that `get` would have returned | |
|
83 | /// before this call, or `EntryState::Unknown` if there was no such entry. | |
|
84 | 69 | fn drop_file(&mut self, filename: &HgPath) -> Result<(), DirstateError>; |
|
85 | 70 | |
|
86 | 71 | /// Among given files, mark the stored `mtime` as ambiguous if there is one |
General Comments 0
You need to be logged in to leave comments.
Login now