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
use std::convert::TryFrom;
use thiserror::Error;
use crate::{
diff::{self, Diff, Hunk, Line, LineDiff},
file_system::Path,
vcs,
};
#[derive(Debug, PartialEq, Error)]
#[non_exhaustive]
pub enum Error {
#[error("couldn't retrieve file path")]
PathUnavailable,
#[error("couldn't retrieve patch for {0}")]
PatchUnavailable(Path),
#[error("git delta type is not handled")]
DeltaUnhandled(git2::Delta),
#[error("invalid `git2::DiffLine`")]
InvalidLineDiff,
}
impl<'a> TryFrom<git2::DiffLine<'a>> for LineDiff {
type Error = Error;
fn try_from(line: git2::DiffLine) -> Result<Self, Self::Error> {
match (line.old_lineno(), line.new_lineno()) {
(None, Some(n)) => Ok(Self::addition(line.content().to_owned(), n)),
(Some(n), None) => Ok(Self::deletion(line.content().to_owned(), n)),
(Some(l), Some(r)) => Ok(Self::context(line.content().to_owned(), l, r)),
(None, None) => Err(Error::InvalidLineDiff),
}
}
}
impl<'a> TryFrom<git2::Diff<'a>> for Diff {
type Error = vcs::git::error::Error;
fn try_from(git_diff: git2::Diff) -> Result<Diff, Self::Error> {
use git2::{Delta, Patch};
let mut diff = Diff::new();
for (idx, delta) in git_diff.deltas().enumerate() {
match delta.status() {
Delta::Added => {
let diff_file = delta.new_file();
let path = diff_file.path().ok_or(diff::git::Error::PathUnavailable)?;
let path = Path::try_from(path.to_path_buf())?;
diff.add_created_file(path);
},
Delta::Deleted => {
let diff_file = delta.old_file();
let path = diff_file.path().ok_or(diff::git::Error::PathUnavailable)?;
let path = Path::try_from(path.to_path_buf())?;
diff.add_deleted_file(path);
},
Delta::Modified => {
let diff_file = delta.new_file();
let path = diff_file.path().ok_or(diff::git::Error::PathUnavailable)?;
let path = Path::try_from(path.to_path_buf())?;
let patch = Patch::from_diff(&git_diff, idx)?;
if let Some(patch) = patch {
let mut hunks: Vec<Hunk> = Vec::new();
for h in 0..patch.num_hunks() {
let (hunk, hunk_lines) = patch.hunk(h)?;
let header = Line(hunk.header().to_owned());
let mut lines: Vec<LineDiff> = Vec::new();
for l in 0..hunk_lines {
let line = patch.line_in_hunk(h, l)?;
let line = LineDiff::try_from(line)?;
lines.push(line);
}
hunks.push(Hunk { header, lines });
}
diff.add_modified_file(path, hunks);
} else if diff_file.is_binary() {
diff.add_modified_binary_file(path);
} else {
return Err(diff::git::Error::PatchUnavailable(path).into());
}
},
Delta::Renamed => {
let old = delta
.old_file()
.path()
.ok_or(diff::git::Error::PathUnavailable)?;
let new = delta
.new_file()
.path()
.ok_or(diff::git::Error::PathUnavailable)?;
let old_path = Path::try_from(old.to_path_buf())?;
let new_path = Path::try_from(new.to_path_buf())?;
diff.add_moved_file(old_path, new_path);
},
Delta::Copied => {
let old = delta
.old_file()
.path()
.ok_or(diff::git::Error::PathUnavailable)?;
let new = delta
.new_file()
.path()
.ok_or(diff::git::Error::PathUnavailable)?;
let old_path = Path::try_from(old.to_path_buf())?;
let new_path = Path::try_from(new.to_path_buf())?;
diff.add_copied_file(old_path, new_path);
},
status => {
return Err(diff::git::Error::DeltaUnhandled(status).into());
},
}
}
Ok(diff)
}
}