1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
use diff::LineDiff;
use crate::storage::File;
use crate::{NodeId, PatchId};
#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
#[serde(transparent)]
pub struct Changes {
pub changes: Vec<Change>,
}
enum LastLine<'a> {
Start,
File1(&'a NodeId),
File2(&'a NodeId),
}
impl<'a> LastLine<'a> {
fn either(&self) -> Option<&NodeId> {
match *self {
LastLine::File1(i) => Some(i),
LastLine::File2(i) => Some(i),
LastLine::Start => None,
}
}
}
impl Changes {
pub fn from_diff(file1: &File, file2: &File, diff: &[LineDiff]) -> Changes {
let mut changes = Vec::new();
let mut last = LastLine::Start;
for d in diff {
match *d {
LineDiff::New(i) => {
let id = file2.node_id(i);
changes.push(Change::NewNode {
id: *id,
contents: file2.node(i).to_owned(),
});
if let Some(last_id) = last.either() {
changes.push(Change::NewEdge {
src: *last_id,
dest: *id,
});
}
last = LastLine::File2(id);
}
LineDiff::Keep(i, _) => {
let id = file1.node_id(i);
if let LastLine::File2(last_id) = last {
changes.push(Change::NewEdge {
src: *last_id,
dest: *id,
});
}
last = LastLine::File1(id);
}
LineDiff::Delete(i) => {
let id = file1.node_id(i);
changes.push(Change::DeleteNode { id: *id });
}
}
}
Changes { changes }
}
pub fn set_patch_id(&mut self, new_id: &PatchId) {
for ch in &mut self.changes {
ch.set_patch_id(new_id);
}
}
}
#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
pub enum Change {
NewNode {
id: NodeId,
contents: Vec<u8>,
},
DeleteNode {
id: NodeId,
},
NewEdge {
src: NodeId,
dest: NodeId,
},
}
impl Change {
fn set_patch_id(&mut self, new_id: &PatchId) {
match *self {
Change::NewNode { ref mut id, .. } => {
id.set_patch_id(new_id);
}
Change::NewEdge {
ref mut src,
ref mut dest,
} => {
src.set_patch_id(new_id);
dest.set_patch_id(new_id);
}
Change::DeleteNode { ref mut id } => {
id.set_patch_id(new_id);
}
}
}
}
#[cfg(test)]
mod tests {
use super::Change::*;
use super::Changes;
use crate::storage::File;
use crate::NodeId;
use diff::LineDiff::*;
#[test]
fn from_diff_empty_first() {
let file1 = File::from_bytes(b"");
let file2 = File::from_bytes(b"something");
let diff = vec![New(0)];
let expected = vec![NewNode {
id: NodeId::cur(0),
contents: b"something".to_vec(),
}];
assert_eq!(Changes::from_diff(&file1, &file2, &diff).changes, expected);
}
}