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
|
use std::fmt::{Debug, Display};
use tracing::debug;
use crate::{
batch::batch,
repo::{LocalRepoState, Repo, RepoError, Repos},
};
impl crate::GTree {
pub fn update(&self, repos: Repos) {
batch(repos, |mut repo| {
if repo.repo.is_some() {
match repo.update() {
Ok(u) => println!("{}", u),
Err(u) => println!("{}", u),
};
}
});
}
}
impl Repo {
/// Fetch any new state from the remote and fast forward merge changes into local branches
#[tracing::instrument(level = "trace")]
pub fn update(&mut self) -> Result<UpdateResult, UpdateResult> {
let repo_name = self.name.clone();
if self.repo.is_some() {
self.update_inner()
.map_err(|e| UpdateResult::err(repo_name, e))
} else {
Ok(UpdateResult::err(repo_name, RepoError::NoLocalRepo))
}
}
fn update_inner(&mut self) -> Result<UpdateResult, RepoError> {
let repo_state = self.is_clean()?;
if self.repo.is_some() && repo_state != LocalRepoState::Clean {
return Ok(UpdateResult::dirty(self.name.clone(), repo_state));
};
debug!("repo is clean");
let mut progress = gix::progress::Discard {};
let _fetched = self.fetch()?;
let (remote, head) = self.default_remote_head()?;
self.update_default_branch_ref(remote.clone(), head)?;
self.checkout(remote, head, &mut progress)?;
// let merged = repo.branches(Some(BranchType::Local))?
// .filter_map(|x| x.ok())
// .try_fold(false, |mut merged, (mut branch, _)| {
// let name = format!("refs/heads/{}", Repo::branch_name(&branch));
// if branch.upstream().is_ok() {
// let upstream = branch.upstream().unwrap();
// debug!("branch: {}", name);
// merged |= self.merge(repo, &mut branch, &upstream)?;
// Ok::<bool, RepoError>(merged)
// } else {
// debug!("not updating branch: {}: branch does not have upstream tracking branch set", name);
// Ok(merged)
// }
// })?;
// if merged {
// Ok(UpdateResult::merged(self.name.clone()))
// } else {
// Ok(UpdateResult::no_changes(self.name.clone()))
// }
Ok(UpdateResult::no_changes(self.name.clone()))
}
}
#[derive(Debug)]
pub enum UpdateResult {
NoChanges { name: String },
Dirty { name: String, state: LocalRepoState },
Merged { name: String },
Error { name: String, error: RepoError },
}
impl UpdateResult {
pub fn err(name: String, error: RepoError) -> UpdateResult {
UpdateResult::Error { name, error }
}
pub fn merged(name: String) -> UpdateResult {
UpdateResult::Merged { name }
}
pub fn dirty(name: String, state: LocalRepoState) -> UpdateResult {
UpdateResult::Dirty { name, state }
}
pub fn no_changes(name: String) -> UpdateResult {
UpdateResult::NoChanges { name }
}
}
impl Display for UpdateResult {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
use ansi_term::Colour::{Blue, Green, Red, Yellow};
match self {
UpdateResult::NoChanges { name } => {
f.write_fmt(format_args!("{} {}", Blue.paint("FETCHED"), name))
}
UpdateResult::Dirty { name, state } => f.write_fmt(format_args!(
"{} {} [{}]",
Yellow.paint("DIRTY "),
name,
state
)),
UpdateResult::Merged { name } => {
f.write_fmt(format_args!("{} {}", Green.paint("PULLED "), name))
}
UpdateResult::Error { name, error } => f.write_fmt(format_args!(
"{} {} [{}]",
Red.paint("ERROR "),
name,
error
)),
}
}
}
|
