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
use std::collections::VecDeque;
use git_object::TreeRefIter;
use git_odb::FindExt;
use super::{change, Action, Change, Platform, Tracking};
use crate::object::tree::diff::Renames;
use crate::{
bstr::{BStr, BString, ByteSlice, ByteVec},
ext::ObjectIdExt,
Repository, Tree,
};
#[derive(Debug, thiserror::Error)]
#[allow(missing_docs)]
pub enum Error {
#[error(transparent)]
Diff(#[from] git_diff::tree::changes::Error),
#[error("The user-provided callback failed")]
ForEach(#[source] Box<dyn std::error::Error + Send + Sync + 'static>),
}
impl<'a, 'old> Platform<'a, 'old> {
pub fn for_each_to_obtain_tree<'new, E>(
&mut self,
other: &Tree<'new>,
for_each: impl FnMut(Change<'_, 'old, 'new>) -> Result<Action, E>,
) -> Result<(), Error>
where
E: std::error::Error + Sync + Send + 'static,
{
let repo = self.lhs.repo;
let mut delegate = Delegate {
repo: self.lhs.repo,
other_repo: other.repo,
tracking: self.tracking,
_renames: self.renames,
location: BString::default(),
path_deque: Default::default(),
visit: for_each,
err: None,
};
match git_diff::tree::Changes::from(TreeRefIter::from_bytes(&self.lhs.data)).needed_to_obtain(
TreeRefIter::from_bytes(&other.data),
&mut self.state,
|oid, buf| repo.objects.find_tree_iter(oid, buf),
&mut delegate,
) {
Ok(()) => match delegate.err {
Some(err) => Err(Error::ForEach(Box::new(err))),
None => Ok(()),
},
Err(git_diff::tree::changes::Error::Cancelled) => delegate
.err
.map(|err| Err(Error::ForEach(Box::new(err))))
.unwrap_or(Err(Error::Diff(git_diff::tree::changes::Error::Cancelled))),
Err(err) => Err(err.into()),
}
}
}
struct Delegate<'old, 'new, VisitFn, E> {
repo: &'old Repository,
other_repo: &'new Repository,
tracking: Option<Tracking>,
_renames: Option<Renames>,
location: BString,
path_deque: VecDeque<BString>,
visit: VisitFn,
err: Option<E>,
}
impl<A, B> Delegate<'_, '_, A, B> {
fn pop_element(&mut self) {
if let Some(pos) = self.location.rfind_byte(b'/') {
self.location.resize(pos, 0);
} else {
self.location.clear();
}
}
fn push_element(&mut self, name: &BStr) {
if !self.location.is_empty() {
self.location.push(b'/');
}
self.location.push_str(name);
}
}
impl<'old, 'new, VisitFn, E> git_diff::tree::Visit for Delegate<'old, 'new, VisitFn, E>
where
VisitFn: for<'delegate> FnMut(Change<'delegate, 'old, 'new>) -> Result<Action, E>,
E: std::error::Error + Sync + Send + 'static,
{
fn pop_front_tracked_path_and_set_current(&mut self) {
if let Some(Tracking::Path) = self.tracking {
self.location = self
.path_deque
.pop_front()
.expect("every call is matched with push_tracked_path_component");
}
}
fn push_back_tracked_path_component(&mut self, component: &BStr) {
if let Some(Tracking::Path) = self.tracking {
self.push_element(component);
self.path_deque.push_back(self.location.clone());
}
}
fn push_path_component(&mut self, component: &BStr) {
match self.tracking {
Some(Tracking::FileName) => {
self.location.clear();
self.location.push_str(component);
}
Some(Tracking::Path) => {
self.push_element(component);
}
None => {}
}
}
fn pop_path_component(&mut self) {
if let Some(Tracking::Path) = self.tracking {
self.pop_element();
}
}
fn visit(&mut self, change: git_diff::tree::visit::Change) -> git_diff::tree::visit::Action {
use git_diff::tree::visit::Change::*;
let event = match change {
Addition { entry_mode, oid } => change::Event::Addition {
entry_mode,
id: oid.attach(self.other_repo),
},
Deletion { entry_mode, oid } => change::Event::Deletion {
entry_mode,
id: oid.attach(self.repo),
},
Modification {
previous_entry_mode,
previous_oid,
entry_mode,
oid,
} => change::Event::Modification {
previous_entry_mode,
entry_mode,
previous_id: previous_oid.attach(self.repo),
id: oid.attach(self.other_repo),
},
};
match (self.visit)(Change {
event,
location: self.location.as_ref(),
}) {
Ok(Action::Cancel) => git_diff::tree::visit::Action::Cancel,
Ok(Action::Continue) => git_diff::tree::visit::Action::Continue,
Err(err) => {
self.err = Some(err);
git_diff::tree::visit::Action::Cancel
}
}
}
}