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
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
|
use clap::{Args, Subcommand};
use eyre::OptionExt;
use forgejo_api::{
structs::{
CreatePullRequestOption, MergePullRequestOption, RepoGetPullRequestCommitsQuery,
RepoGetPullRequestFilesQuery,
},
Forgejo,
};
use crate::repo::{RepoInfo, RepoName};
#[derive(Args, Clone, Debug)]
pub struct PrCommand {
#[clap(long, short = 'R')]
remote: Option<String>,
#[clap(long, short)]
repo: Option<String>,
#[clap(subcommand)]
command: PrSubcommand,
}
#[derive(Subcommand, Clone, Debug)]
pub enum PrSubcommand {
Create {
base: String,
head: String,
title: String,
#[clap(long)]
body: Option<String>,
},
Edit {
pr: u64,
#[clap(subcommand)]
command: EditCommand,
},
Merge {
pr: u64,
#[clap(long, short)]
method: Option<MergeMethod>,
#[clap(long, short)]
delete: bool,
},
Comment {
pr: u64,
body: Option<String>,
},
Close {
pr: u64,
#[clap(long, short)]
with_msg: Option<Option<String>>,
},
Search {
query: Option<String>,
#[clap(long, short)]
labels: Option<String>,
#[clap(long, short)]
creator: Option<String>,
#[clap(long, short)]
assignee: Option<String>,
#[clap(long, short)]
state: Option<crate::issues::State>,
},
View {
id: u64,
#[clap(subcommand)]
command: Option<ViewCommand>,
},
Browse {
id: Option<u64>,
},
}
#[derive(clap::ValueEnum, Clone, Copy, Debug)]
pub enum MergeMethod {
Merge,
Rebase,
RebaseMerge,
Squash,
Manual,
}
impl From<MergeMethod> for forgejo_api::structs::MergePullRequestOptionDo {
fn from(value: MergeMethod) -> Self {
use forgejo_api::structs::MergePullRequestOptionDo::*;
match value {
MergeMethod::Merge => Merge,
MergeMethod::Rebase => Rebase,
MergeMethod::RebaseMerge => RebaseMerge,
MergeMethod::Squash => Squash,
MergeMethod::Manual => ManuallyMerged,
}
}
}
#[derive(Subcommand, Clone, Debug)]
pub enum EditCommand {
Title {
new_title: Option<String>,
},
Body {
new_body: Option<String>,
},
Comment {
idx: usize,
new_body: Option<String>,
},
}
#[derive(Subcommand, Clone, Debug)]
pub enum ViewCommand {
Body,
Comment {
idx: usize,
},
Comments,
Diff {
/// Get the diff in patch format
#[clap(long, short)]
patch: bool,
/// View the diff in your text editor
#[clap(long, short)]
editor: bool,
},
Files,
Commits {
/// View one commit per line
#[clap(long, short)]
oneline: bool,
},
}
impl PrCommand {
pub async fn run(self, keys: &crate::KeyInfo, host_name: Option<&str>) -> eyre::Result<()> {
use PrSubcommand::*;
let repo = RepoInfo::get_current(host_name, self.repo.as_deref(), self.remote.as_deref())?;
let api = keys.get_api(repo.host_url())?;
let repo = repo
.name()
.ok_or_eyre("couldn't get repo name, try specifying with --repo")?;
match self.command {
Create {
title,
base,
head,
body,
} => create_pr(&repo, &api, title, base, head, body).await?,
Merge { pr, method, delete } => merge_pr(&repo, &api, pr, method, delete).await?,
View { id, command } => match command.unwrap_or(ViewCommand::Body) {
ViewCommand::Body => view_pr(&repo, &api, id).await?,
ViewCommand::Comment { idx } => {
crate::issues::view_comment(&repo, &api, id, idx).await?
}
ViewCommand::Comments => crate::issues::view_comments(&repo, &api, id).await?,
ViewCommand::Diff { patch, editor } => {
view_diff(&repo, &api, id, patch, editor).await?
}
ViewCommand::Files => view_pr_files(&repo, &api, id).await?,
ViewCommand::Commits { oneline } => {
view_pr_commits(&repo, &api, id, oneline).await?
}
},
Search {
query,
labels,
creator,
assignee,
state,
} => view_prs(&repo, &api, query, labels, creator, assignee, state).await?,
Edit { pr, command } => match command {
EditCommand::Title { new_title } => {
crate::issues::edit_title(&repo, &api, pr, new_title).await?
}
EditCommand::Body { new_body } => {
crate::issues::edit_body(&repo, &api, pr, new_body).await?
}
EditCommand::Comment { idx, new_body } => {
crate::issues::edit_comment(&repo, &api, pr, idx, new_body).await?
}
},
Close { pr, with_msg } => crate::issues::close_issue(&repo, &api, pr, with_msg).await?,
Browse { id } => crate::issues::browse_issue(&repo, &api, id).await?,
Comment { pr, body } => crate::issues::add_comment(&repo, &api, pr, body).await?,
}
Ok(())
}
}
pub async fn view_pr(repo: &RepoName, api: &Forgejo, id: u64) -> eyre::Result<()> {
let mut additions = 0;
let mut deletions = 0;
let query = RepoGetPullRequestFilesQuery {
limit: Some(u32::MAX),
..Default::default()
};
let (_, files) = api
.repo_get_pull_request_files(repo.owner(), repo.name(), id, query)
.await?;
for file in files {
additions += file.additions.unwrap_or_default();
deletions += file.deletions.unwrap_or_default();
}
let pr = api
.repo_get_pull_request(repo.owner(), repo.name(), id)
.await?;
let title = pr
.title
.as_ref()
.ok_or_else(|| eyre::eyre!("pr does not have title"))?;
let user = pr
.user
.as_ref()
.ok_or_else(|| eyre::eyre!("pr does not have creator"))?;
let username = user
.login
.as_ref()
.ok_or_else(|| eyre::eyre!("user does not have login"))?;
println!("#{}: {}", id, title);
println!(
"By {} - \x1b[92m+{additions} \x1b[91m-{deletions}\x1b[0m",
username
);
if let Some(body) = &pr.body {
println!();
for line in body.lines() {
println!(" {line}");
}
println!();
}
Ok(())
}
async fn create_pr(
repo: &RepoName,
api: &Forgejo,
title: String,
base: String,
head: String,
body: Option<String>,
) -> eyre::Result<()> {
let (repo_owner, repo_name, base, head) = match base.strip_prefix("^") {
Some(parent_base) => {
let mut repo_data = api.repo_get(repo.owner(), repo.name()).await?;
let parent = *repo_data
.parent
.take()
.ok_or_eyre("cannot create pull request upstream, there is no upstream")?;
let parent_owner = parent
.owner
.ok_or_eyre("parent has no owner")?
.login
.ok_or_eyre("parent owner has no login")?;
let parent_name = parent.name.ok_or_eyre("parent has no name")?;
(
parent_owner,
parent_name,
parent_base.to_owned(),
format!("{}:{}", repo.owner(), head),
)
}
None => (repo.owner().to_owned(), repo.name().to_owned(), base, head),
};
let body = match body {
Some(body) => body,
None => {
let mut body = String::new();
crate::editor(&mut body, Some("md")).await?;
body
}
};
let pr = api
.repo_create_pull_request(
&repo_owner,
&repo_name,
CreatePullRequestOption {
assignee: None,
assignees: None,
base: Some(base.to_owned()),
body: Some(body),
due_date: None,
head: Some(head),
labels: None,
milestone: None,
title: Some(title),
},
)
.await?;
let number = pr
.number
.ok_or_else(|| eyre::eyre!("pr does not have number"))?;
let title = pr
.title
.as_ref()
.ok_or_else(|| eyre::eyre!("pr does not have title"))?;
println!("created pull request #{}: {}", number, title);
Ok(())
}
async fn merge_pr(
repo: &RepoName,
api: &Forgejo,
pr: u64,
method: Option<MergeMethod>,
delete: bool,
) -> eyre::Result<()> {
let repo_info = api.repo_get(repo.owner(), repo.name()).await?;
let default_merge = repo_info
.default_merge_style
.map(|x| x.into())
.unwrap_or(forgejo_api::structs::MergePullRequestOptionDo::Merge);
let body = MergePullRequestOption {
r#do: method.map(|x| x.into()).unwrap_or(default_merge),
merge_commit_id: None,
merge_message_field: None,
merge_title_field: None,
delete_branch_after_merge: Some(delete),
force_merge: None,
head_commit_id: None,
merge_when_checks_succeed: None,
};
api.repo_merge_pull_request(repo.owner(), repo.name(), pr, body)
.await?;
Ok(())
}
async fn view_prs(
repo: &RepoName,
api: &Forgejo,
query_str: Option<String>,
labels: Option<String>,
creator: Option<String>,
assignee: Option<String>,
state: Option<crate::issues::State>,
) -> eyre::Result<()> {
let labels = labels
.map(|s| s.split(',').map(|s| s.to_string()).collect::<Vec<_>>())
.unwrap_or_default();
let query = forgejo_api::structs::IssueListIssuesQuery {
q: query_str,
labels: Some(labels.join(",")),
created_by: creator,
assigned_by: assignee,
state: state.map(|s| s.into()),
r#type: Some(forgejo_api::structs::IssueListIssuesQueryType::Pulls),
milestones: None,
since: None,
before: None,
mentioned_by: None,
page: None,
limit: None,
};
let prs = api
.issue_list_issues(repo.owner(), repo.name(), query)
.await?;
if prs.len() == 1 {
println!("1 pull request");
} else {
println!("{} pull requests", prs.len());
}
for pr in prs {
let number = pr
.number
.ok_or_else(|| eyre::eyre!("pr does not have number"))?;
let title = pr
.title
.as_ref()
.ok_or_else(|| eyre::eyre!("pr does not have title"))?;
let user = pr
.user
.as_ref()
.ok_or_else(|| eyre::eyre!("pr does not have creator"))?;
let username = user
.login
.as_ref()
.ok_or_else(|| eyre::eyre!("user does not have login"))?;
println!("#{}: {} (by {})", number, title, username);
}
Ok(())
}
async fn view_diff(
repo: &RepoName,
api: &Forgejo,
pr: u64,
patch: bool,
editor: bool,
) -> eyre::Result<()> {
let diff_type = if patch { "patch" } else { "diff" };
let diff = api
.repo_download_pull_diff_or_patch(
repo.owner(),
repo.name(),
pr,
diff_type,
forgejo_api::structs::RepoDownloadPullDiffOrPatchQuery::default(),
)
.await?;
if editor {
let mut view = diff.clone();
crate::editor(&mut view, Some(diff_type)).await?;
if view != diff {
println!("changes made to the diff will not persist");
}
} else {
println!("{diff}");
}
Ok(())
}
async fn view_pr_files(repo: &RepoName, api: &Forgejo, pr: u64) -> eyre::Result<()> {
let query = RepoGetPullRequestFilesQuery {
limit: Some(u32::MAX),
..Default::default()
};
let (headers, files) = api
.repo_get_pull_request_files(repo.owner(), repo.name(), pr, query)
.await?;
let max_additions = files
.iter()
.map(|x| x.additions.unwrap_or_default())
.max()
.unwrap_or_default();
let max_deletions = files
.iter()
.map(|x| x.deletions.unwrap_or_default())
.max()
.unwrap_or_default();
let additions_width = max_additions.checked_ilog10().unwrap_or_default() as usize + 1;
let deletions_width = max_deletions.checked_ilog10().unwrap_or_default() as usize + 1;
for file in files {
let name = file.filename.as_deref().unwrap_or("???");
let additions = file.additions.unwrap_or_default();
let deletions = file.deletions.unwrap_or_default();
println!("\x1b[92m+{additions:<additions_width$} \x1b[91m-{deletions:<deletions_width$}\x1b[0m {name}");
}
Ok(())
}
async fn view_pr_commits(
repo: &RepoName,
api: &Forgejo,
pr: u64,
oneline: bool,
) -> eyre::Result<()> {
let query = RepoGetPullRequestCommitsQuery {
limit: Some(u32::MAX),
files: Some(false),
..Default::default()
};
let (_headers, commits) = api
.repo_get_pull_request_commits(repo.owner(), repo.name(), pr, query)
.await?;
let max_additions = commits
.iter()
.filter_map(|x| x.stats.as_ref())
.map(|x| x.additions.unwrap_or_default())
.max()
.unwrap_or_default();
let max_deletions = commits
.iter()
.filter_map(|x| x.stats.as_ref())
.map(|x| x.deletions.unwrap_or_default())
.max()
.unwrap_or_default();
let additions_width = max_additions.checked_ilog10().unwrap_or_default() as usize + 1;
let deletions_width = max_deletions.checked_ilog10().unwrap_or_default() as usize + 1;
for commit in commits {
let repo_commit = commit
.commit
.as_ref()
.ok_or_eyre("commit does not have commit?")?;
let message = repo_commit.message.as_deref().unwrap_or("[no msg]");
let name = message.lines().next().unwrap_or(&message);
let sha = commit
.sha
.as_deref()
.ok_or_eyre("commit does not have sha")?;
let short_sha = &sha[..7];
let stats = commit
.stats
.as_ref()
.ok_or_eyre("commit does not have stats")?;
let additions = stats.additions.unwrap_or_default();
let deletions = stats.deletions.unwrap_or_default();
if oneline {
println!("\x1b[33m{short_sha}\x1b[0m \x1b[92m+{additions:<additions_width$} \x1b[91m-{deletions:<deletions_width$}\x1b[0m {name}");
} else {
let author = repo_commit
.author
.as_ref()
.ok_or_eyre("commit has no author")?;
let author_name = author.name.as_deref().ok_or_eyre("author has no name")?;
let author_email = author.email.as_deref().ok_or_eyre("author has no email")?;
let date = commit
.created
.as_ref()
.ok_or_eyre("commit as no creation date")?;
println!("\x1b[33mcommit {sha}\x1b[0m (\x1b[92m+{additions}\x1b[0m, \x1b[91m-{deletions}\x1b[0m)");
println!("Author: {author_name} <{author_email}>");
print!("Date: ");
let format = time::macros::format_description!("[weekday repr:short] [month repr:short] [day] [hour repr:24]:[minute]:[second] [year] [offset_hour sign:mandatory][offset_minute]");
date.format_into(&mut std::io::stdout().lock(), format)?;
println!();
println!();
for line in message.lines() {
println!(" {line}");
}
println!();
}
}
Ok(())
}
|