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
|
use anyhow::{bail, Context, Result};
#[cfg(not(test))]
use crate::client::Client;
#[cfg(test)]
use crate::client::MockConnect;
use crate::{
cli_interactor::{Interactor, InteractorPrompt, PromptChoiceParms, PromptConfirmParms},
client::Connect,
git::{Repo, RepoActions},
repo_ref,
sub_commands::prs::create::{PATCH_KIND, PR_KIND},
Cli,
};
#[derive(Debug, clap::Args)]
pub struct SubCommandArgs {
/// TODO ignore merged, and closed
#[arg(long, action)]
open_only: bool,
}
pub async fn launch(
_cli_args: &Cli,
_pr_args: &super::SubCommandArgs,
_args: &SubCommandArgs,
) -> Result<()> {
let git_repo = Repo::discover().context("cannot find a git repository")?;
let (main_or_master_branch_name, _) = git_repo
.get_main_or_master_branch()
.context("no main or master branch")?;
let root_commit = git_repo
.get_root_commit(main_or_master_branch_name)
.context("failed to get root commit of the repository")?;
// TODO: check for empty repo
// TODO: check for existing maintaiers file
// TODO: check for other claims
#[cfg(not(test))]
let client = Client::default();
#[cfg(test)]
let client = <MockConnect as std::default::Default>::default();
let repo_ref = repo_ref::fetch(
&git_repo,
root_commit.to_string(),
&client,
client.get_fallback_relays().clone(),
)
.await?;
println!("finding PRs...");
let pr_events: Vec<nostr::Event> = client
.get_events(
repo_ref.relays.clone(),
vec![
nostr::Filter::default()
.kind(nostr::Kind::Custom(PR_KIND))
.reference(format!("r-{root_commit}")),
],
)
.await?
.iter()
.filter(|e| {
e.kind.as_u64() == PR_KIND
&& e.tags
.iter()
.any(|t| t.as_vec().len() > 1 && t.as_vec()[1].eq(&format!("r-{root_commit}")))
})
.map(std::borrow::ToOwned::to_owned)
.collect();
// let pr_branch_names: Vec<String> = pr_events
// .iter()
// .map(|e| {
// format!(
// "{}-{}",
// &e.id.to_string()[..5],
// if let Some(t) = e.tags.iter().find(|t| t.as_vec()[0] ==
// "branch-name") { t.as_vec()[1].to_string()
// } else {
// "".to_string()
// } // git_repo.get_checked_out_branch_name(),
// )
// })
// .collect();
let selected_index = Interactor::default().choice(
PromptChoiceParms::default()
.with_prompt("All PRs")
.with_choices(
pr_events
.iter()
.map(|e| {
if let Ok(name) = tag_value(e, "name") {
name
} else {
e.id.to_string()
}
})
.collect(),
),
)?;
// println!("prs:{:?}", &pr_events);
println!("finding commits...");
let commits_events: Vec<nostr::Event> = client
.get_events(
repo_ref.relays.clone(),
vec![
nostr::Filter::default()
.kind(nostr::Kind::Custom(PATCH_KIND))
.event(pr_events[selected_index].id)
.reference(format!("r-{root_commit}")),
],
)
.await?
.iter()
.filter(|e| {
e.kind.as_u64() == PATCH_KIND
&& e.tags.iter().any(|t| {
t.as_vec().len() > 2
&& t.as_vec()[1].eq(&pr_events[selected_index].id.to_string())
})
&& e.tags
.iter()
.any(|t| t.as_vec().len() > 1 && t.as_vec()[1].eq(&format!("r-{root_commit}")))
})
.map(std::borrow::ToOwned::to_owned)
.collect();
confirm_checkout(&git_repo)?;
let most_recent_pr_patch_chain = get_most_recent_patch_with_ancestors(commits_events)
.context("cannot get most recent patch for PR")?;
let branch_name = tag_value(&pr_events[selected_index], "branch-name")?;
let applied = git_repo
.apply_patch_chain(&branch_name, most_recent_pr_patch_chain)
.context("cannot apply patch chain")?;
if applied.is_empty() {
println!("checked out PR branch. no new commits to pull");
} else {
println!(
"checked out PR branch. pulled {} new commits",
applied.len(),
);
}
// // TODO: look for mapping of existing branch
// // if latest_commit_id exists locally
// if local_branch_base == latest_commit_id {
// // TODO: check if its in the main / master branch (already merged)
// // TODO: check if it has any decendants and warn. maybe the user has
// // been working on a updates to be pushed? Suggest checking
// // out that branch.
// // we could search nostr for decendants of the commit as well?
// // perhaps this is overkill
// // TODO: check out the branch which it is the tip of. if the name of the
// // branch is different then ask the user if they would like to
// // use the existing branch or create one with the name of the PR.
// // TODO: if there are no decendants and its not the tip then
// // its an ophan commit so just make a branch from this commit.
// }
// // if commits ahead exist in a branch other than main or master
// // TODO: Identify probable existing branches - check remote tracker?
// // TODO: beind head
// else {
// // TODO: look for existing branch with same name
// // TODO: create remote tracker
// git_repo.create_branch_at_commit(&branch_name, &local_branch_base);
// git_repo.checkout(&branch_name)?;
// ahead.reverse();
// for event in ahead {
// git_repo.apply_patch(event, branch_name)?;
// }
// println!("applied!")
// }
// // TODO: check if commits in pr exist, if so look for branches with they are
// in // could we suggest pulling updates into that branch?
// //
// TODO: checkout PR branch
Ok(())
}
fn confirm_checkout(git_repo: &Repo) -> Result<()> {
if !Interactor::default().confirm(
PromptConfirmParms::default()
.with_prompt("check out branch?")
.with_default(true),
)? {
bail!("Exiting...");
}
if git_repo.has_outstanding_changes()? {
bail!(
"cannot pull PR branch when repository is not clean. discard or stash (un)staged changes and try again."
);
}
Ok(())
}
pub fn tag_value(event: &nostr::Event, tag_name: &str) -> Result<String> {
Ok(event
.tags
.iter()
.find(|t| t.as_vec()[0].eq(tag_name))
.context(format!("tag '{tag_name}'not present"))?
.as_vec()[1]
.clone())
}
pub fn get_most_recent_patch_with_ancestors(
mut patches: Vec<nostr::Event>,
) -> Result<Vec<nostr::Event>> {
patches.sort_by_key(|e| e.created_at);
let mut res = vec![];
let latest_commit_id = tag_value(patches.first().context("no patches found")?, "commit")?;
let mut commit_id_to_search = latest_commit_id;
while let Some(event) = patches.iter().find(|e| {
tag_value(e, "commit")
.context("patch event doesnt contain commit tag")
.unwrap()
.eq(&commit_id_to_search)
}) {
res.push(event.clone());
commit_id_to_search = tag_value(event, "parent-commit")?;
}
Ok(res)
}
|