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
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
use crate::{BranchHeads, GitCommitMeta, GitRepo};
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use color_eyre::eyre::{eyre, Result};
use git2::{Branch, BranchType, Commit, Oid, Repository};
use log::debug;
use mktemp::Temp;
impl GitRepo {
/// Return the remote name from the given `git2::Repository`
/// For example, the typical remote name: `origin`
pub fn get_remote_name(&self, r: &git2::Repository) -> Result<String> {
let remote_name = r
.branch_upstream_remote(
r.head()
.and_then(|h| h.resolve())?
.name()
.expect("branch name is valid utf8"),
)
.map(|b| b.as_str().expect("valid utf8").to_string())
.unwrap_or_else(|_| "origin".into());
Ok(remote_name)
}
/// Return a `HashMap<String, GitCommitMeta>` for a branch containing
/// the branch names and the latest commit of the branch`.
/// Providing a `branch_filter` will only return branches based on
/// patterns matching the start of the branch name.
pub fn get_remote_branch_head_refs(
//pub fn get_remote_branch_heads(
&self,
branch_filter: Option<Vec<String>>,
) -> Result<BranchHeads> {
// Create a temp directory (In case we need to clone)
let temp_dir = Temp::new_dir().unwrap();
// Check on path. If it doesn't exist, then we gotta clone and open the repo
// so we can have a git2::Repository to work with
let repo = if let Some(p) = self.path.clone() {
GitRepo::to_repository_from_path(p.clone())?
} else {
// Shallow clone
self.git_clone_shallow(temp_dir.as_path())?
.to_repository()?
};
let cb = self.build_git2_remotecallback();
let remote = self
.get_remote_name(&repo)
.expect("Could not read remote name from git2::Repository");
let mut remote = repo
.find_remote(&remote)
.or_else(|_| repo.remote_anonymous(&remote))
.unwrap();
// Connect to the remote and call the printing function for each of the
// remote references.
let connection = remote
.connect_auth(git2::Direction::Fetch, Some(cb), None)
.expect("Unable to connect to git repo");
let git_branch_ref_prefix = "refs/heads/";
let mut ref_map: HashMap<String, GitCommitMeta> = HashMap::new();
for git_ref in connection
.list()?
.iter()
.filter(|head| head.name().starts_with(git_branch_ref_prefix))
{
let branch_name = git_ref
.name()
.to_string()
.rsplit(git_branch_ref_prefix)
.collect::<Vec<&str>>()[0]
.to_string();
if let Some(ref branches) = branch_filter {
if branches.contains(&branch_name.to_string()) {
continue;
}
}
// Get the commit object
let commit = repo.find_commit(git_ref.oid())?;
let head_commit = GitCommitMeta::new(commit.id().as_bytes())
.with_timestamp(commit.time().seconds())
.with_message(commit.message().map_or(None, |m| Some(m.to_string())));
ref_map.insert(branch_name, head_commit);
}
Ok(ref_map)
}
/// Returns a `bool` if a commit exists in the branch using the `git2` crate
pub fn is_commit_in_branch<'repo>(
r: &'repo Repository,
commit: &Commit,
branch: &Branch,
) -> bool {
let branch_head = branch.get().peel_to_commit();
if branch_head.is_err() {
return false;
}
let branch_head = branch_head.expect("Unable to extract branch HEAD commit");
if branch_head.id() == commit.id() {
return true;
}
// We get here if we're not working with HEAD commits, and we gotta dig deeper
let check_commit_in_branch = r.graph_descendant_of(branch_head.id(), commit.id());
//println!("is {:?} a decendent of {:?}: {:?}", &commit.id(), &branch_head.id(), is_commit_in_branch);
if check_commit_in_branch.is_err() {
return false;
}
check_commit_in_branch.expect("Unable to determine if commit exists within branch")
}
/// Return the `git2::Branch` struct for a local repo (as opposed to a remote repo)
/// If `local_branch` is not provided, we'll select the current active branch, based on HEAD
pub fn get_git2_branch<'repo>(
r: &'repo Repository,
local_branch: &Option<String>,
) -> Result<Branch<'repo>> {
match local_branch {
Some(branch) => {
//println!("User passed branch: {:?}", branch);
let b = r.find_branch(&branch, BranchType::Local)?;
debug!("Returning given branch: {:?}", &b.name());
Ok(b)
}
None => {
// Getting the HEAD of the current
let head = r.head();
//let commit = head.unwrap().peel_to_commit();
//println!("{:?}", commit);
// Find the current local branch...
let local_branch = Branch::wrap(head?);
debug!("Returning HEAD branch: {:?}", local_branch.name()?);
// Convert git2::Error to anyhow::Error
match r.find_branch(
local_branch
.name()?
.expect("Unable to return local branch name"),
BranchType::Local,
) {
Ok(b) => Ok(b),
Err(e) => Err(e.into()),
}
}
}
}
/// Return the remote url from the given Repository
pub fn remote_url_from_repository<'repo>(r: &'repo Repository) -> Result<String> {
// Get the name of the remote from the Repository
let remote_name = GitRepo::remote_name_from_repository(&r)?;
let remote_url: String = r
.find_remote(&remote_name)?
.url()
.expect("Unable to extract repo url from remote")
.chars()
.collect();
Ok(remote_url)
}
/// Return the remote name from the given Repository
fn remote_name_from_repository<'repo>(r: &'repo Repository) -> Result<String> {
let remote_name = r
.branch_upstream_remote(
r.head()
.and_then(|h| h.resolve())?
.name()
.expect("branch name is valid utf8"),
)
.map(|b| b.as_str().expect("valid utf8").to_string())
.unwrap_or_else(|_| "origin".into());
debug!("Remote name: {:?}", &remote_name);
Ok(remote_name)
}
/// Returns the remote url after opening and validating repo from the local path
pub fn git_remote_from_path(path: &Path) -> Result<String> {
let r = GitRepo::to_repository_from_path(path)?;
GitRepo::remote_url_from_repository(&r)
}
/// Returns the remote url from the `git2::Repository` struct
pub fn git_remote_from_repo(local_repo: &Repository) -> Result<String> {
GitRepo::remote_url_from_repository(&local_repo)
}
/// Returns a `Result<Option<Vec<PathBuf>>>` containing files changed between `commit1` and `commit2`
pub fn list_files_changed_between<S: AsRef<str>>(
&self,
commit1: S,
commit2: S,
) -> Result<Option<Vec<PathBuf>>> {
let repo = self.to_repository()?;
let commit1 = self.expand_partial_commit_id(commit1.as_ref())?;
let commit2 = self.expand_partial_commit_id(commit2.as_ref())?;
let oid1 = Oid::from_str(&commit1)?;
let oid2 = Oid::from_str(&commit2)?;
let git2_commit1 = repo.find_commit(oid1)?.tree()?;
let git2_commit2 = repo.find_commit(oid2)?.tree()?;
let diff = repo.diff_tree_to_tree(Some(&git2_commit1), Some(&git2_commit2), None)?;
let mut paths = Vec::new();
diff.print(git2::DiffFormat::NameOnly, |delta, _hunk, _line| {
paths.push(
delta
.new_file()
.path()
.expect("Expected the new file path")
.to_path_buf(),
);
//let f = delta.new_file().path().unwrap().display();
//println!("{:?}", f );
true
})?;
if paths.len() > 0 {
return Ok(Some(paths));
}
Ok(None)
}
/// Returns a `Result<Option<Vec<PathBuf>>>` containing files changed between `commit` and `commit~1` (the previous commit)
pub fn list_files_changed_at<S: AsRef<str>>(&self, commit: S) -> Result<Option<Vec<PathBuf>>> {
let repo = self.to_repository()?;
let commit = self.expand_partial_commit_id(commit.as_ref())?;
let oid = Oid::from_str(&commit)?;
let git2_commit = repo.find_commit(oid)?;
let mut changed_files = Vec::new();
for parent in git2_commit.parents() {
let parent_commit_id = hex::encode(parent.id().as_bytes());
match self.list_files_changed_between(&parent_commit_id, &commit)? {
Some(path_vec) => {
for p in path_vec {
changed_files.push(p);
}
}
None => {}
}
}
if changed_files.len() > 0 {
Ok(Some(changed_files))
} else {
Ok(None)
}
}
/// Takes in a partial commit SHA-1, and attempts to expand to the full 40-char commit id
pub fn expand_partial_commit_id<S: AsRef<str>>(&self, partial_commit_id: S) -> Result<String> {
// Don't need to do anything if the commit is already complete
// I guess the only issue is not validating it exists. Is that ok?
if partial_commit_id.as_ref().len() == 40 {
return Ok(partial_commit_id.as_ref().to_string());
}
// We can't reliably succeed if repo is a shallow clone
if self.to_repository()?.is_shallow() {
return Err(eyre!(
"No support for partial commit id expand on shallow clones"
));
}
let repo = self.to_repository()?;
let extended_commit = hex::encode(
repo.revparse_single(partial_commit_id.as_ref())?
.peel_to_commit()?
.id()
.as_bytes(),
);
Ok(extended_commit)
}
/// Checks the list of files changed between last 2 commits (`HEAD` and `HEAD~1`).
/// Returns `bool` depending on whether any changes were made in `path`.
/// A `path` should be relative to the repo root. Can be a file or a directory.
pub fn has_path_changed<P: AsRef<Path>>(&self, path: P) -> bool {
let repo = self.to_repository().expect("Could not open repo");
// Get `HEAD~1` commit
// This could actually be multiple parent commits, if merge commit
let head = repo
.head()
.expect("Could not get HEAD ref")
.peel_to_commit()
.expect("Could not convert to commit");
let head_commit_id = hex::encode(head.id().as_bytes());
for commit in head.parents() {
let parent_commit_id = hex::encode(commit.id().as_bytes());
if self.has_path_changed_between(&path, &head_commit_id, &parent_commit_id) {
return true;
}
}
false
}
/// Checks the list of files changed between 2 commits (`commit1` and `commit2`).
/// Returns `bool` depending on whether any changes were made in `path`.
/// A `path` should be relative to the repo root. Can be a file or a directory.
pub fn has_path_changed_between<P: AsRef<Path>, S: AsRef<str>>(
&self,
path: P,
commit1: S,
commit2: S,
) -> bool {
let commit1 = self
.expand_partial_commit_id(commit1.as_ref())
.expect("Could not expand partial id");
let commit2 = self
.expand_partial_commit_id(commit2.as_ref())
.expect("Could not expand partial id");
let changed_files = self
.list_files_changed_between(&commit1, &commit2)
.expect("Error retrieving commit changes");
if let Some(files) = changed_files {
for f in files.iter() {
if f.to_str()
.expect("Couldn't convert pathbuf to str")
.starts_with(
&path
.as_ref()
.to_path_buf()
.to_str()
.expect("Couldn't convert pathbuf to str"),
)
{
return true;
}
}
}
false
}
/// Check if new commits exist by performing a shallow clone and comparing branch heads
pub fn new_commits_exist(&self) -> bool {
// Let's do a shallow clone behind the scenes using the same branch and creds
let repo = GitRepo::new(self.url.to_string())
.expect("Could not crete new GitUrl")
.with_branch(Some(self.branch.clone().expect("No branch set")))
.with_credentials(self.credentials.clone());
let tempdir = Temp::new_dir().expect("Could not create temporary dir");
// We can do a shallow clone, because we only want the newest history
let repo = repo
.git_clone_shallow(tempdir)
.expect("Could not shallow clone dir");
// If the HEAD commits don't match, we assume that `repo` is newer
self.head != repo.head
}
}