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
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
|
use libc::{c_int, c_uint, c_void};
use std::ffi::CString;
use std::marker;
use crate::util::Binding;
use crate::{panic, raw, Error, Oid, Repository, Sort};
/// A revwalk allows traversal of the commit graph defined by including one or
/// more leaves and excluding one or more roots.
pub struct Revwalk<'repo> {
raw: *mut raw::git_revwalk,
_marker: marker::PhantomData<&'repo Repository>,
}
/// A `Revwalk` with an associated "hide callback", see `with_hide_callback`
pub struct RevwalkWithHideCb<'repo, 'cb, C>
where
C: FnMut(Oid) -> bool,
{
revwalk: Revwalk<'repo>,
_marker: marker::PhantomData<&'cb C>,
}
extern "C" fn revwalk_hide_cb<C>(commit_id: *const raw::git_oid, payload: *mut c_void) -> c_int
where
C: FnMut(Oid) -> bool,
{
panic::wrap(|| unsafe {
let hide_cb = payload as *mut C;
if (*hide_cb)(Oid::from_raw(commit_id)) {
1
} else {
0
}
})
.unwrap_or(-1)
}
impl<'repo, 'cb, C: FnMut(Oid) -> bool> RevwalkWithHideCb<'repo, 'cb, C> {
/// Consumes the `RevwalkWithHideCb` and returns the contained `Revwalk`.
///
/// Note that this will reset the `Revwalk`.
pub fn into_inner(mut self) -> Result<Revwalk<'repo>, Error> {
self.revwalk.reset()?;
Ok(self.revwalk)
}
}
impl<'repo> Revwalk<'repo> {
/// Reset a revwalk to allow re-configuring it.
///
/// The revwalk is automatically reset when iteration of its commits
/// completes.
pub fn reset(&mut self) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_reset(self.raw()));
}
Ok(())
}
/// Set the order in which commits are visited.
pub fn set_sorting(&mut self, sort_mode: Sort) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_sorting(
self.raw(),
sort_mode.bits() as c_uint
));
}
Ok(())
}
/// Simplify the history by first-parent
///
/// No parents other than the first for each commit will be enqueued.
pub fn simplify_first_parent(&mut self) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_simplify_first_parent(self.raw));
}
Ok(())
}
/// Mark a commit to start traversal from.
///
/// The given OID must belong to a commitish on the walked repository.
///
/// The given commit will be used as one of the roots when starting the
/// revision walk. At least one commit must be pushed onto the walker before
/// a walk can be started.
pub fn push(&mut self, oid: Oid) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_push(self.raw(), oid.raw()));
}
Ok(())
}
/// Push the repository's HEAD
///
/// For more information, see `push`.
pub fn push_head(&mut self) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_push_head(self.raw()));
}
Ok(())
}
/// Push matching references
///
/// The OIDs pointed to by the references that match the given glob pattern
/// will be pushed to the revision walker.
///
/// A leading 'refs/' is implied if not present as well as a trailing `/ \
/// *` if the glob lacks '?', ' \ *' or '['.
///
/// Any references matching this glob which do not point to a commitish
/// will be ignored.
pub fn push_glob(&mut self, glob: &str) -> Result<(), Error> {
let glob = CString::new(glob)?;
unsafe {
try_call!(raw::git_revwalk_push_glob(self.raw, glob));
}
Ok(())
}
/// Push and hide the respective endpoints of the given range.
///
/// The range should be of the form `<commit>..<commit>` where each
/// `<commit>` is in the form accepted by `revparse_single`. The left-hand
/// commit will be hidden and the right-hand commit pushed.
pub fn push_range(&mut self, range: &str) -> Result<(), Error> {
let range = CString::new(range)?;
unsafe {
try_call!(raw::git_revwalk_push_range(self.raw, range));
}
Ok(())
}
/// Push the OID pointed to by a reference
///
/// The reference must point to a commitish.
pub fn push_ref(&mut self, reference: &str) -> Result<(), Error> {
let reference = CString::new(reference)?;
unsafe {
try_call!(raw::git_revwalk_push_ref(self.raw, reference));
}
Ok(())
}
/// Mark a commit as not of interest to this revwalk.
pub fn hide(&mut self, oid: Oid) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_hide(self.raw(), oid.raw()));
}
Ok(())
}
/// Hide all commits for which the callback returns true from
/// the walk.
pub fn with_hide_callback<'cb, C>(
self,
callback: &'cb mut C,
) -> Result<RevwalkWithHideCb<'repo, 'cb, C>, Error>
where
C: FnMut(Oid) -> bool,
{
let r = RevwalkWithHideCb {
revwalk: self,
_marker: marker::PhantomData,
};
unsafe {
raw::git_revwalk_add_hide_cb(
r.revwalk.raw(),
Some(revwalk_hide_cb::<C>),
callback as *mut _ as *mut c_void,
);
};
Ok(r)
}
/// Hide the repository's HEAD
///
/// For more information, see `hide`.
pub fn hide_head(&mut self) -> Result<(), Error> {
unsafe {
try_call!(raw::git_revwalk_hide_head(self.raw()));
}
Ok(())
}
/// Hide matching references.
///
/// The OIDs pointed to by the references that match the given glob pattern
/// and their ancestors will be hidden from the output on the revision walk.
///
/// A leading 'refs/' is implied if not present as well as a trailing `/ \
/// *` if the glob lacks '?', ' \ *' or '['.
///
/// Any references matching this glob which do not point to a commitish
/// will be ignored.
pub fn hide_glob(&mut self, glob: &str) -> Result<(), Error> {
let glob = CString::new(glob)?;
unsafe {
try_call!(raw::git_revwalk_hide_glob(self.raw, glob));
}
Ok(())
}
/// Hide the OID pointed to by a reference.
///
/// The reference must point to a commitish.
pub fn hide_ref(&mut self, reference: &str) -> Result<(), Error> {
let reference = CString::new(reference)?;
unsafe {
try_call!(raw::git_revwalk_hide_ref(self.raw, reference));
}
Ok(())
}
}
impl<'repo> Binding for Revwalk<'repo> {
type Raw = *mut raw::git_revwalk;
unsafe fn from_raw(raw: *mut raw::git_revwalk) -> Revwalk<'repo> {
Revwalk {
raw,
_marker: marker::PhantomData,
}
}
fn raw(&self) -> *mut raw::git_revwalk {
self.raw
}
}
impl<'repo> Drop for Revwalk<'repo> {
fn drop(&mut self) {
unsafe { raw::git_revwalk_free(self.raw) }
}
}
impl<'repo> Iterator for Revwalk<'repo> {
type Item = Result<Oid, Error>;
fn next(&mut self) -> Option<Result<Oid, Error>> {
let mut out: raw::git_oid = raw::git_oid {
id: [0; raw::GIT_OID_RAWSZ],
};
unsafe {
try_call_iter!(raw::git_revwalk_next(&mut out, self.raw()));
Some(Ok(Binding::from_raw(&out as *const _)))
}
}
}
impl<'repo, 'cb, C: FnMut(Oid) -> bool> Iterator for RevwalkWithHideCb<'repo, 'cb, C> {
type Item = Result<Oid, Error>;
fn next(&mut self) -> Option<Result<Oid, Error>> {
let out = self.revwalk.next();
crate::panic::check();
out
}
}
#[cfg(test)]
mod tests {
#[test]
fn smoke() {
let (_td, repo) = crate::test::repo_init();
let head = repo.head().unwrap();
let target = head.target().unwrap();
let mut walk = repo.revwalk().unwrap();
walk.push(target).unwrap();
let oids: Vec<crate::Oid> = walk.by_ref().collect::<Result<Vec<_>, _>>().unwrap();
assert_eq!(oids.len(), 1);
assert_eq!(oids[0], target);
walk.reset().unwrap();
walk.push_head().unwrap();
assert_eq!(walk.by_ref().count(), 1);
walk.reset().unwrap();
walk.push_head().unwrap();
walk.hide_head().unwrap();
assert_eq!(walk.by_ref().count(), 0);
}
#[test]
fn smoke_hide_cb() {
let (_td, repo) = crate::test::repo_init();
let head = repo.head().unwrap();
let target = head.target().unwrap();
let mut walk = repo.revwalk().unwrap();
walk.push(target).unwrap();
let oids: Vec<crate::Oid> = walk.by_ref().collect::<Result<Vec<_>, _>>().unwrap();
assert_eq!(oids.len(), 1);
assert_eq!(oids[0], target);
walk.reset().unwrap();
walk.push_head().unwrap();
assert_eq!(walk.by_ref().count(), 1);
walk.reset().unwrap();
walk.push_head().unwrap();
let mut hide_cb = |oid| oid == target;
let mut walk = walk.with_hide_callback(&mut hide_cb).unwrap();
assert_eq!(walk.by_ref().count(), 0);
let mut walk = walk.into_inner().unwrap();
walk.push_head().unwrap();
assert_eq!(walk.by_ref().count(), 1);
}
}
|