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
use crate::build::CheckoutBuilder;
use crate::util::Binding;
use crate::{panic, raw, Oid, StashApplyProgress};
use libc::{c_char, c_int, c_void, size_t};
use std::ffi::CStr;
use std::mem;
pub type StashApplyProgressCb<'a> = dyn FnMut(StashApplyProgress) -> bool + 'a;
pub type StashCb<'a> = dyn FnMut(usize, &str, &Oid) -> bool + 'a;
#[allow(unused)]
pub struct StashApplyOptions<'cb> {
progress: Option<Box<StashApplyProgressCb<'cb>>>,
checkout_options: Option<CheckoutBuilder<'cb>>,
raw_opts: raw::git_stash_apply_options,
}
impl<'cb> Default for StashApplyOptions<'cb> {
fn default() -> Self {
Self::new()
}
}
impl<'cb> StashApplyOptions<'cb> {
pub fn new() -> StashApplyOptions<'cb> {
let mut opts = StashApplyOptions {
progress: None,
checkout_options: None,
raw_opts: unsafe { mem::zeroed() },
};
assert_eq!(
unsafe { raw::git_stash_apply_init_options(&mut opts.raw_opts, 1) },
0
);
opts
}
pub fn reinstantiate_index(&mut self) -> &mut StashApplyOptions<'cb> {
self.raw_opts.flags = raw::GIT_STASH_APPLY_REINSTATE_INDEX as u32;
self
}
pub fn checkout_options(&mut self, opts: CheckoutBuilder<'cb>) -> &mut StashApplyOptions<'cb> {
self.checkout_options = Some(opts);
self
}
pub fn progress_cb<C>(&mut self, callback: C) -> &mut StashApplyOptions<'cb>
where
C: FnMut(StashApplyProgress) -> bool + 'cb,
{
self.progress = Some(Box::new(callback) as Box<StashApplyProgressCb<'cb>>);
self.raw_opts.progress_cb = Some(stash_apply_progress_cb);
self.raw_opts.progress_payload = self as *mut _ as *mut _;
self
}
pub fn raw(&mut self) -> &raw::git_stash_apply_options {
unsafe {
if let Some(opts) = self.checkout_options.as_mut() {
opts.configure(&mut self.raw_opts.checkout_options);
}
}
&self.raw_opts
}
}
#[allow(unused)]
pub struct StashCbData<'a> {
pub callback: &'a mut StashCb<'a>,
}
#[allow(unused)]
pub extern "C" fn stash_cb(
index: size_t,
message: *const c_char,
stash_id: *const raw::git_oid,
payload: *mut c_void,
) -> c_int {
panic::wrap(|| unsafe {
let mut data = &mut *(payload as *mut StashCbData<'_>);
let res = {
let mut callback = &mut data.callback;
callback(
index,
CStr::from_ptr(message).to_str().unwrap(),
&Binding::from_raw(stash_id),
)
};
if res {
0
} else {
1
}
})
.unwrap_or(1)
}
fn convert_progress(progress: raw::git_stash_apply_progress_t) -> StashApplyProgress {
match progress {
raw::GIT_STASH_APPLY_PROGRESS_NONE => StashApplyProgress::None,
raw::GIT_STASH_APPLY_PROGRESS_LOADING_STASH => StashApplyProgress::LoadingStash,
raw::GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX => StashApplyProgress::AnalyzeIndex,
raw::GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED => StashApplyProgress::AnalyzeModified,
raw::GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED => StashApplyProgress::AnalyzeUntracked,
raw::GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED => StashApplyProgress::CheckoutUntracked,
raw::GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED => StashApplyProgress::CheckoutModified,
raw::GIT_STASH_APPLY_PROGRESS_DONE => StashApplyProgress::Done,
_ => StashApplyProgress::None,
}
}
#[allow(unused)]
extern "C" fn stash_apply_progress_cb(
progress: raw::git_stash_apply_progress_t,
payload: *mut c_void,
) -> c_int {
panic::wrap(|| unsafe {
let mut options = &mut *(payload as *mut StashApplyOptions<'_>);
let res = {
let mut callback = options.progress.as_mut().unwrap();
callback(convert_progress(progress))
};
if res {
0
} else {
-1
}
})
.unwrap_or(-1)
}
#[cfg(test)]
mod tests {
use crate::stash::StashApplyOptions;
use crate::test::repo_init;
use crate::{Repository, StashFlags, Status};
use std::fs;
use std::io::Write;
use std::path::Path;
fn make_stash<C>(next: C)
where
C: FnOnce(&mut Repository),
{
let (_td, mut repo) = repo_init();
let signature = repo.signature().unwrap();
let p = Path::new(repo.workdir().unwrap()).join("file_b.txt");
println!("using path {:?}", p);
fs::File::create(&p)
.unwrap()
.write("data".as_bytes())
.unwrap();
let rel_p = Path::new("file_b.txt");
assert!(repo.status_file(&rel_p).unwrap() == Status::WT_NEW);
repo.stash_save(&signature, "msg1", Some(StashFlags::INCLUDE_UNTRACKED))
.unwrap();
assert!(repo.status_file(&rel_p).is_err());
let mut count = 0;
repo.stash_foreach(|index, name, _oid| {
count += 1;
assert!(index == 0);
assert!(name == "On master: msg1");
true
})
.unwrap();
assert!(count == 1);
next(&mut repo);
}
fn count_stash(repo: &mut Repository) -> usize {
let mut count = 0;
repo.stash_foreach(|_, _, _| {
count += 1;
true
})
.unwrap();
count
}
#[test]
fn smoke_stash_save_drop() {
make_stash(|repo| {
repo.stash_drop(0).unwrap();
assert!(count_stash(repo) == 0)
})
}
#[test]
fn smoke_stash_save_pop() {
make_stash(|repo| {
repo.stash_pop(0, None).unwrap();
assert!(count_stash(repo) == 0)
})
}
#[test]
fn smoke_stash_save_apply() {
make_stash(|repo| {
let mut options = StashApplyOptions::new();
options.progress_cb(|progress| {
println!("{:?}", progress);
true
});
repo.stash_apply(0, Some(&mut options)).unwrap();
assert!(count_stash(repo) == 1)
})
}
}