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
|
/*
* libgit2 "log" example - shows how to walk history and get commit info
*
* Written by the libgit2 contributors
*
* To the extent possible under law, the author(s) have dedicated all copyright
* and related and neighboring rights to this software to the public domain
* worldwide. This software is distributed without any warranty.
*
* You should have received a copy of the CC0 Public Domain Dedication along
* with this software. If not, see
* <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
#![deny(warnings)]
use git2::{Commit, DiffOptions, ObjectType, Repository, Signature, Time};
use git2::{DiffFormat, Error, Pathspec};
use std::str;
use structopt::StructOpt;
#[derive(StructOpt)]
struct Args {
#[structopt(name = "topo-order", long)]
/// sort commits in topological order
flag_topo_order: bool,
#[structopt(name = "date-order", long)]
/// sort commits in date order
flag_date_order: bool,
#[structopt(name = "reverse", long)]
/// sort commits in reverse
flag_reverse: bool,
#[structopt(name = "author", long)]
/// author to sort by
flag_author: Option<String>,
#[structopt(name = "committer", long)]
/// committer to sort by
flag_committer: Option<String>,
#[structopt(name = "pat", long = "grep")]
/// pattern to filter commit messages by
flag_grep: Option<String>,
#[structopt(name = "dir", long = "git-dir")]
/// alternative git directory to use
flag_git_dir: Option<String>,
#[structopt(name = "skip", long)]
/// number of commits to skip
flag_skip: Option<usize>,
#[structopt(name = "max-count", short = "n", long)]
/// maximum number of commits to show
flag_max_count: Option<usize>,
#[structopt(name = "merges", long)]
/// only show merge commits
flag_merges: bool,
#[structopt(name = "no-merges", long)]
/// don't show merge commits
flag_no_merges: bool,
#[structopt(name = "no-min-parents", long)]
/// don't require a minimum number of parents
flag_no_min_parents: bool,
#[structopt(name = "no-max-parents", long)]
/// don't require a maximum number of parents
flag_no_max_parents: bool,
#[structopt(name = "max-parents")]
/// specify a maximum number of parents for a commit
flag_max_parents: Option<usize>,
#[structopt(name = "min-parents")]
/// specify a minimum number of parents for a commit
flag_min_parents: Option<usize>,
#[structopt(name = "patch", long, short)]
/// show commit diff
flag_patch: bool,
#[structopt(name = "commit")]
arg_commit: Vec<String>,
#[structopt(name = "spec", last = true)]
arg_spec: Vec<String>,
}
fn run(args: &Args) -> Result<(), Error> {
let path = args.flag_git_dir.as_ref().map(|s| &s[..]).unwrap_or(".");
let repo = Repository::open(path)?;
let mut revwalk = repo.revwalk()?;
// Prepare the revwalk based on CLI parameters
let base = if args.flag_reverse {
git2::Sort::REVERSE
} else {
git2::Sort::NONE
};
revwalk.set_sorting(
base | if args.flag_topo_order {
git2::Sort::TOPOLOGICAL
} else if args.flag_date_order {
git2::Sort::TIME
} else {
git2::Sort::NONE
},
)?;
for commit in &args.arg_commit {
if commit.starts_with('^') {
let obj = repo.revparse_single(&commit[1..])?;
revwalk.hide(obj.id())?;
continue;
}
let revspec = repo.revparse(commit)?;
if revspec.mode().contains(git2::RevparseMode::SINGLE) {
revwalk.push(revspec.from().unwrap().id())?;
} else {
let from = revspec.from().unwrap().id();
let to = revspec.to().unwrap().id();
revwalk.push(to)?;
if revspec.mode().contains(git2::RevparseMode::MERGE_BASE) {
let base = repo.merge_base(from, to)?;
let o = repo.find_object(base, Some(ObjectType::Commit))?;
revwalk.push(o.id())?;
}
revwalk.hide(from)?;
}
}
if args.arg_commit.is_empty() {
revwalk.push_head()?;
}
// Prepare our diff options and pathspec matcher
let (mut diffopts, mut diffopts2) = (DiffOptions::new(), DiffOptions::new());
for spec in &args.arg_spec {
diffopts.pathspec(spec);
diffopts2.pathspec(spec);
}
let ps = Pathspec::new(args.arg_spec.iter())?;
// Filter our revwalk based on the CLI parameters
macro_rules! filter_try {
($e:expr) => {
match $e {
Ok(t) => t,
Err(e) => return Some(Err(e)),
}
};
}
let revwalk = revwalk
.filter_map(|id| {
let id = filter_try!(id);
let commit = filter_try!(repo.find_commit(id));
let parents = commit.parents().len();
if parents < args.min_parents() {
return None;
}
if let Some(n) = args.max_parents() {
if parents >= n {
return None;
}
}
if !args.arg_spec.is_empty() {
match commit.parents().len() {
0 => {
let tree = filter_try!(commit.tree());
let flags = git2::PathspecFlags::NO_MATCH_ERROR;
if ps.match_tree(&tree, flags).is_err() {
return None;
}
}
_ => {
let m = commit.parents().all(|parent| {
match_with_parent(&repo, &commit, &parent, &mut diffopts)
.unwrap_or(false)
});
if !m {
return None;
}
}
}
}
if !sig_matches(&commit.author(), &args.flag_author) {
return None;
}
if !sig_matches(&commit.committer(), &args.flag_committer) {
return None;
}
if !log_message_matches(commit.message(), &args.flag_grep) {
return None;
}
Some(Ok(commit))
})
.skip(args.flag_skip.unwrap_or(0))
.take(args.flag_max_count.unwrap_or(!0));
// print!
for commit in revwalk {
let commit = commit?;
print_commit(&commit);
if !args.flag_patch || commit.parents().len() > 1 {
continue;
}
let a = if commit.parents().len() == 1 {
let parent = commit.parent(0)?;
Some(parent.tree()?)
} else {
None
};
let b = commit.tree()?;
let diff = repo.diff_tree_to_tree(a.as_ref(), Some(&b), Some(&mut diffopts2))?;
diff.print(DiffFormat::Patch, |_delta, _hunk, line| {
match line.origin() {
' ' | '+' | '-' => print!("{}", line.origin()),
_ => {}
}
print!("{}", str::from_utf8(line.content()).unwrap());
true
})?;
}
Ok(())
}
fn sig_matches(sig: &Signature, arg: &Option<String>) -> bool {
match *arg {
Some(ref s) => {
sig.name().map(|n| n.contains(s)).unwrap_or(false)
|| sig.email().map(|n| n.contains(s)).unwrap_or(false)
}
None => true,
}
}
fn log_message_matches(msg: Option<&str>, grep: &Option<String>) -> bool {
match (grep, msg) {
(&None, _) => true,
(&Some(_), None) => false,
(&Some(ref s), Some(msg)) => msg.contains(s),
}
}
fn print_commit(commit: &Commit) {
println!("commit {}", commit.id());
if commit.parents().len() > 1 {
print!("Merge:");
for id in commit.parent_ids() {
print!(" {:.8}", id);
}
println!();
}
let author = commit.author();
println!("Author: {}", author);
print_time(&author.when(), "Date: ");
println!();
for line in String::from_utf8_lossy(commit.message_bytes()).lines() {
println!(" {}", line);
}
println!();
}
fn print_time(time: &Time, prefix: &str) {
let (offset, sign) = match time.offset_minutes() {
n if n < 0 => (-n, '-'),
n => (n, '+'),
};
let (hours, minutes) = (offset / 60, offset % 60);
let ts = time::Timespec::new(time.seconds() + (time.offset_minutes() as i64) * 60, 0);
let time = time::at(ts);
println!(
"{}{} {}{:02}{:02}",
prefix,
time.strftime("%a %b %e %T %Y").unwrap(),
sign,
hours,
minutes
);
}
fn match_with_parent(
repo: &Repository,
commit: &Commit,
parent: &Commit,
opts: &mut DiffOptions,
) -> Result<bool, Error> {
let a = parent.tree()?;
let b = commit.tree()?;
let diff = repo.diff_tree_to_tree(Some(&a), Some(&b), Some(opts))?;
Ok(diff.deltas().len() > 0)
}
impl Args {
fn min_parents(&self) -> usize {
if self.flag_no_min_parents {
return 0;
}
self.flag_min_parents
.unwrap_or(if self.flag_merges { 2 } else { 0 })
}
fn max_parents(&self) -> Option<usize> {
if self.flag_no_max_parents {
return None;
}
self.flag_max_parents
.or(if self.flag_no_merges { Some(1) } else { None })
}
}
fn main() {
let args = Args::from_args();
match run(&args) {
Ok(()) => {}
Err(e) => println!("error: {}", e),
}
}
|