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
//! Branch command implementation
use crate::cli::output::Output;
use crate::core::manifest::Manifest;
use crate::core::repo::{filter_repos, get_manifest_repo_info, RepoInfo};
use crate::git::{
branch::{branch_exists, create_and_checkout_branch, delete_local_branch, list_local_branches},
get_current_branch, open_repo,
};
use std::path::PathBuf;
/// Options for the branch command
pub struct BranchOptions<'a> {
pub workspace_root: &'a PathBuf,
pub manifest: &'a Manifest,
pub name: Option<&'a str>,
pub delete: bool,
pub move_commits: bool,
pub repos_filter: Option<&'a [String]>,
pub group_filter: Option<&'a [String]>,
pub json: bool,
}
/// Run the branch command
pub fn run_branch(opts: BranchOptions<'_>) -> anyhow::Result<()> {
let mut repos: Vec<RepoInfo> = filter_repos(
opts.manifest,
opts.workspace_root,
opts.repos_filter,
opts.group_filter,
false,
);
// Include manifest repo in branch operations
if let Some(manifest_repo) = get_manifest_repo_info(opts.manifest, opts.workspace_root) {
repos.push(manifest_repo);
}
match opts.name {
Some(branch_name) if opts.delete => {
// Delete branch
Output::header(&format!("Deleting branch '{}'", branch_name));
println!();
for repo in &repos {
if !repo.exists() {
Output::warning(&format!("{}: not cloned", repo.name));
continue;
}
match open_repo(&repo.absolute_path) {
Ok(git_repo) => {
if !branch_exists(&git_repo, branch_name) {
Output::info(&format!("{}: branch doesn't exist", repo.name));
continue;
}
match delete_local_branch(&git_repo, branch_name, false) {
Ok(()) => Output::success(&format!("{}: deleted", repo.name)),
Err(e) => Output::error(&format!("{}: {}", repo.name, e)),
}
}
Err(e) => Output::error(&format!("{}: {}", repo.name, e)),
}
}
}
Some(branch_name) if opts.move_commits => {
// Move commits to new branch (create branch, reset current to remote, checkout new)
Output::header(&format!(
"Moving commits to branch '{}' in {} repos...",
branch_name,
repos.len()
));
println!();
for repo in &repos {
if !repo.exists() {
Output::warning(&format!("{}: not cloned", repo.name));
continue;
}
match open_repo(&repo.absolute_path) {
Ok(git_repo) => {
let current = match get_current_branch(&git_repo) {
Ok(b) => b,
Err(e) => {
Output::error(&format!(
"{}: failed to get current branch - {}",
repo.name, e
));
continue;
}
};
if branch_exists(&git_repo, branch_name) {
Output::error(&format!(
"{}: branch '{}' already exists",
repo.name, branch_name
));
continue;
}
// Create branch at current HEAD
let head = match git_repo.head() {
Ok(h) => h,
Err(e) => {
Output::error(&format!(
"{}: failed to get HEAD - {}",
repo.name, e
));
continue;
}
};
let head_commit = match head.peel_to_commit() {
Ok(c) => c,
Err(e) => {
Output::error(&format!(
"{}: failed to get HEAD commit - {}",
repo.name, e
));
continue;
}
};
if let Err(e) = git_repo.branch(branch_name, &head_commit, false) {
Output::error(&format!(
"{}: failed to create branch - {}",
repo.name, e
));
continue;
}
// Reset current branch to origin/<current>
let remote_ref = format!("refs/remotes/origin/{}", current);
let remote_commit = match git_repo.revparse_single(&remote_ref) {
Ok(obj) => match obj.peel_to_commit() {
Ok(c) => c,
Err(e) => {
Output::error(&format!(
"{}: failed to find remote commit - {}",
repo.name, e
));
continue;
}
},
Err(e) => {
Output::error(&format!(
"{}: no remote tracking branch origin/{} - {}",
repo.name, current, e
));
continue;
}
};
if let Err(e) =
git_repo.reset(remote_commit.as_object(), git2::ResetType::Hard, None)
{
Output::error(&format!(
"{}: failed to reset to origin/{} - {}",
repo.name, current, e
));
continue;
}
// Checkout the new branch
if let Err(e) = git_repo.set_head(&format!("refs/heads/{}", branch_name)) {
Output::error(&format!(
"{}: failed to checkout new branch - {}",
repo.name, e
));
continue;
}
if let Err(e) = git_repo
.checkout_head(Some(git2::build::CheckoutBuilder::new().force()))
{
Output::error(&format!(
"{}: failed to update working tree - {}",
repo.name, e
));
continue;
}
Output::success(&format!(
"{}: moved commits from {} to {}",
repo.name, current, branch_name
));
}
Err(e) => Output::error(&format!("{}: {}", repo.name, e)),
}
}
println!();
println!(
"Commits moved to branch: {}",
Output::branch_name(branch_name)
);
}
Some(branch_name) => {
// Create branch
Output::header(&format!(
"Creating branch '{}' in {} repos...",
branch_name,
repos.len()
));
println!();
for repo in &repos {
if !repo.exists() {
Output::warning(&format!("{}: not cloned", repo.name));
continue;
}
match open_repo(&repo.absolute_path) {
Ok(git_repo) => {
if branch_exists(&git_repo, branch_name) {
Output::info(&format!("{}: already exists", repo.name));
continue;
}
match create_and_checkout_branch(&git_repo, branch_name) {
Ok(()) => Output::success(&format!("{}: created", repo.name)),
Err(e) => Output::error(&format!("{}: {}", repo.name, e)),
}
}
Err(e) => Output::error(&format!("{}: {}", repo.name, e)),
}
}
println!();
println!(
"All repos now on branch: {}",
Output::branch_name(branch_name)
);
}
None => {
if opts.json {
// JSON output for list mode
#[derive(serde::Serialize)]
struct JsonBranch {
repo: String,
branch: String,
default_branch: String,
}
let mut results: Vec<JsonBranch> = Vec::new();
for repo in &repos {
if !repo.exists() {
continue;
}
if let Ok(git_repo) = open_repo(&repo.absolute_path) {
let current = get_current_branch(&git_repo).unwrap_or_default();
results.push(JsonBranch {
repo: repo.name.clone(),
branch: current,
default_branch: repo.default_branch.clone(),
});
}
}
println!("{}", serde_json::to_string_pretty(&results)?);
} else {
// List branches
Output::header("Branches");
println!();
for repo in &repos {
if !repo.exists() {
continue;
}
match open_repo(&repo.absolute_path) {
Ok(git_repo) => {
let current = get_current_branch(&git_repo).unwrap_or_default();
let branches = list_local_branches(&git_repo).unwrap_or_default();
println!(" {}:", Output::repo_name(&repo.name));
for branch in branches {
let marker = if branch == current { "* " } else { " " };
let formatted = if branch == current {
Output::branch_name(&branch)
} else {
branch
};
println!(" {}{}", marker, formatted);
}
}
Err(_) => continue,
}
}
}
}
}
Ok(())
}