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
|
use anyhow::{bail, Context, Result};
use ngit::{client::send_events, git_events::tag_value};
use crate::{
cli::Cli,
client::{
fetching_with_report, get_all_proposal_patch_events_from_cache,
get_proposals_and_revisions_from_cache, get_repo_ref_from_cache, Client, Connect,
},
git::{identify_ahead_behind, str_to_sha1, Repo, RepoActions},
git_events::{
event_is_revision_root, event_to_cover_letter, generate_patch_event,
get_commit_id_from_patch, get_most_recent_patch_with_ancestors,
},
login,
repo_ref::get_repo_coordinates,
sub_commands,
};
#[derive(Debug, clap::Args)]
pub struct SubCommandArgs {
#[arg(long, action)]
/// send proposal revision from checked out proposal branch
force: bool,
}
#[allow(clippy::too_many_lines)]
pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
let git_repo = Repo::discover().context("cannot find a git repository")?;
let git_repo_path = git_repo.get_path()?;
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()
.context("failed to get root commit of the repository")?;
let branch_name = git_repo
.get_checked_out_branch_name()
.context("cannot get checked out branch name")?;
if branch_name == main_or_master_branch_name {
bail!("checkout a branch associated with a proposal first")
}
let mut client = Client::default();
let repo_coordinates = get_repo_coordinates(&git_repo, &client).await?;
fetching_with_report(git_repo_path, &client, &repo_coordinates).await?;
let repo_ref = get_repo_ref_from_cache(git_repo_path, &repo_coordinates).await?;
let proposal_root_event =
get_proposals_and_revisions_from_cache(git_repo_path, repo_ref.coordinates())
.await?
.iter()
.find(|e| {
event_to_cover_letter(e)
.is_ok_and(|cl| cl.get_branch_name().is_ok_and(|s| s.eq(&branch_name)))
&& !event_is_revision_root(e)
})
.context("cannot find proposal that matches the current branch name")?
.clone();
let commit_events = get_all_proposal_patch_events_from_cache(
git_repo_path,
&repo_ref,
&proposal_root_event.id(),
)
.await?;
let most_recent_proposal_patch_chain = get_most_recent_patch_with_ancestors(commit_events)
.context("cannot get most recent patch for proposal")?;
let branch_tip = git_repo.get_tip_of_branch(&branch_name)?;
let most_recent_patch_commit_id = str_to_sha1(
&get_commit_id_from_patch(
most_recent_proposal_patch_chain
.first()
.context("no patches found")?,
)
.context("latest patch event doesnt have a commit tag")?,
)
.context("latest patch event commit tag isn't a valid SHA1 hash")?;
let proposal_base_commit_id = str_to_sha1(
&tag_value(
most_recent_proposal_patch_chain
.last()
.context("no patches found")?,
"parent-commit",
)
.context("patch is incorrectly formatted")?,
)
.context("latest patch event parent-commit tag isn't a valid SHA1 hash")?;
if most_recent_patch_commit_id.eq(&branch_tip) {
bail!("proposal already up-to-date with local branch");
}
if args.force {
println!("preparing to force push proposal revision...");
sub_commands::send::launch(
cli_args,
&sub_commands::send::SubCommandArgs {
// if not ahead of master prompt, otherwise assume proposal revision is all commits
// ahead
since_or_range: if let Ok((_, _, ahead, _)) =
identify_ahead_behind(&git_repo, &None, &None)
{
if ahead.is_empty() {
String::new()
} else {
format!("HEAD~{}", ahead.len())
}
} else {
String::new()
},
in_reply_to: vec![proposal_root_event.id.to_string()],
title: None,
description: None,
no_cover_letter: true,
},
true,
)
.await?;
println!("force pushed proposal revision");
return Ok(());
}
if most_recent_proposal_patch_chain.iter().any(|e| {
let c = tag_value(e, "parent-commit").unwrap_or_default();
c.eq(&branch_tip.to_string())
}) {
bail!("proposal is ahead of local branch");
}
let Ok((ahead, behind)) = git_repo
.get_commits_ahead_behind(&most_recent_patch_commit_id, &branch_tip)
.context("the latest patch in proposal doesnt share an ancestor with your branch.")
else {
if git_repo.ancestor_of(&proposal_base_commit_id, &branch_tip)? {
bail!("local unpublished proposal ammendments. consider force pushing.");
}
bail!("local unpublished proposal has been rebased. consider force pushing");
};
if !behind.is_empty() {
bail!(
"your local proposal branch is {} behind patches on nostr. consider rebasing or force pushing",
behind.len()
)
}
println!(
"{} commits ahead. preparing to create creating patch events.",
ahead.len()
);
let (signer, user_ref) = login::launch(
&git_repo,
&cli_args.bunker_uri,
&cli_args.bunker_app_key,
&cli_args.nsec,
&cli_args.password,
Some(&client),
false,
false,
)
.await?;
let mut patch_events: Vec<nostr::Event> = vec![];
for commit in &ahead {
patch_events.push(
generate_patch_event(
&git_repo,
&root_commit,
commit,
Some(proposal_root_event.id),
&signer,
&repo_ref,
patch_events.last().map(nostr::Event::id),
None,
None,
&None,
&[],
)
.await
.context("cannot make patch event from commit")?,
);
}
println!("pushing {} commits", ahead.len());
client.set_signer(signer).await;
send_events(
&client,
git_repo_path,
patch_events,
user_ref.relays.write(),
repo_ref.relays.clone(),
!cli_args.disable_cli_spinners,
false,
)
.await?;
println!("pushed {} commits", ahead.len());
Ok(())
}
|