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
use std::marker;
use std::mem;
use libc::c_uint;
use {raw, Oid, Commit, FileFavor};
use util::Binding;
use call::Convert;
pub struct AnnotatedCommit<'repo> {
raw: *mut raw::git_annotated_commit,
_marker: marker::PhantomData<Commit<'repo>>,
}
pub struct MergeOptions {
raw: raw::git_merge_options,
}
impl<'repo> AnnotatedCommit<'repo> {
pub fn id(&self) -> Oid {
unsafe { Binding::from_raw(raw::git_annotated_commit_id(self.raw)) }
}
}
impl MergeOptions {
pub fn new() -> MergeOptions {
let mut opts = MergeOptions {
raw: unsafe { mem::zeroed() },
};
assert_eq!(unsafe {
raw::git_merge_init_options(&mut opts.raw, 1)
}, 0);
opts
}
pub fn find_renames(&mut self, find: bool) -> &mut MergeOptions {
if find {
self.raw.flags |= raw::GIT_MERGE_FIND_RENAMES;
} else {
self.raw.flags &= !raw::GIT_MERGE_FIND_RENAMES;
}
self
}
pub fn rename_threshold(&mut self, thresh: u32) -> &mut MergeOptions {
self.raw.rename_threshold = thresh;
self
}
pub fn target_limit(&mut self, limit: u32) -> &mut MergeOptions {
self.raw.target_limit = limit as c_uint;
self
}
pub fn recursion_limit(&mut self, limit: u32) -> &mut MergeOptions {
self.raw.recursion_limit = limit as c_uint;
self
}
pub fn file_favor(&mut self, favor: FileFavor) -> &mut MergeOptions {
self.raw.file_favor = favor.convert();
self
}
fn flag(&mut self, opt: raw::git_merge_file_flag_t, val: bool) -> &mut MergeOptions {
if val {
self.raw.file_flags |= opt;
} else {
self.raw.file_flags &= !opt;
}
self
}
pub fn standard_style(&mut self, standard: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_STYLE_MERGE, standard)
}
pub fn diff3_style(&mut self, diff3: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_STYLE_DIFF3, diff3)
}
pub fn simplify_alnum(&mut self, simplify: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_SIMPLIFY_ALNUM, simplify)
}
pub fn ignore_whitespace(&mut self, ignore: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_IGNORE_WHITESPACE, ignore)
}
pub fn ignore_whitespace_change(&mut self, ignore: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE, ignore)
}
pub fn ignore_whitespace_eol(&mut self, ignore: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL, ignore)
}
pub fn patience(&mut self, patience: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_DIFF_PATIENCE, patience)
}
pub fn minimal(&mut self, minimal: bool) -> &mut MergeOptions {
self.flag(raw::GIT_MERGE_FILE_DIFF_MINIMAL, minimal)
}
pub unsafe fn raw(&self) -> *const raw::git_merge_options {
&self.raw as *const _
}
}
impl<'repo> Binding for AnnotatedCommit<'repo> {
type Raw = *mut raw::git_annotated_commit;
unsafe fn from_raw(raw: *mut raw::git_annotated_commit)
-> AnnotatedCommit<'repo> {
AnnotatedCommit {
raw: raw,
_marker: marker::PhantomData,
}
}
fn raw(&self) -> *mut raw::git_annotated_commit { self.raw }
}
impl<'repo> Drop for AnnotatedCommit<'repo> {
fn drop(&mut self) {
unsafe { raw::git_annotated_commit_free(self.raw) }
}
}