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
|
use anyhow::{bail, Context, Result};
use nostr::prelude::sha1::Hash as Sha1Hash;
#[cfg(not(test))]
use crate::client::Client;
#[cfg(test)]
use crate::client::MockConnect;
use crate::{
client::Connect,
git::{str_to_sha1, Repo, RepoActions},
login,
repo_ref::{self, RepoRef},
sub_commands::{
list::{
find_commits_for_proposal_root_event, find_proposal_events, get_commit_id_from_patch,
get_most_recent_patch_with_ancestors, tag_value,
},
send::{event_to_cover_letter, generate_patch_event, send_events},
},
Cli,
};
pub async fn launch(cli_args: &Cli) -> 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()
.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")
}
#[cfg(not(test))]
let mut client = Client::default();
#[cfg(test)]
let mut 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?;
let (proposal_root_event, commit_events) = fetch_proposal_root_and_most_recent_patch_chain(
&client,
&repo_ref,
&root_commit,
&branch_name,
)
.await?;
// TODO: fix these scenarios:
// - local proposal branch is 2 behind and 1 ahead. intructions: ...
// - proposal has been rebased. (against commit in main) instructions: ...
// - proposal has been rebased. (against commit not in repo) instructions: ..
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_local_branch(&branch_name)?;
let most_recent_patch_commit_id = str_to_sha1(
&get_commit_id_from_patch(&most_recent_proposal_patch_chain[0])
.context("latest patch event doesnt have a commit tag")?,
)
.context("latest patch event commit tag isn't a valid SHA1 hash")?;
if most_recent_patch_commit_id.eq(&branch_tip) {
bail!("nostr proposal already up-to-date with local branch");
}
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!("nostr proposal is ahead of local branch");
}
let (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.")?;
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 (keys, user_ref) = login::launch(&cli_args.nsec, &cli_args.password, Some(&client)).await?;
client.set_keys(&keys).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),
&keys,
&repo_ref,
patch_events.last().map(nostr::Event::id),
None,
None,
)
.context("cannot make patch event from commit")?,
);
}
println!("pushing {} commits", ahead.len());
send_events(
&client,
patch_events,
user_ref.relays.write(),
repo_ref.relays.clone(),
!cli_args.disable_cli_spinners,
)
.await?;
println!("pushed {} commits", ahead.len());
Ok(())
}
pub async fn fetch_proposal_root_and_most_recent_patch_chain(
#[cfg(test)] client: &crate::client::MockConnect,
#[cfg(not(test))] client: &Client,
repo_ref: &RepoRef,
root_commit: &Sha1Hash,
branch_name: &String,
) -> Result<(nostr::Event, Vec<nostr::Event>)> {
println!("finding proposal root event...");
let proposal_events: Vec<nostr::Event> =
find_proposal_events(client, repo_ref, &root_commit.to_string())
.await
.context("cannot get proposal events for repo")?;
let proposal_root_event: nostr::Event = proposal_events
.iter()
.find(|e| {
event_to_cover_letter(e).is_ok_and(|cl| cl.branch_name.eq(branch_name))
// TODO remove the dependancy on same branch name and replace with
// references stored in .git/ngit
})
.context("cannot find a proposal root event associated with the checked out branch name")?
.to_owned();
println!("found proposal root event. finding commits...");
let commits_events: Vec<nostr::Event> =
find_commits_for_proposal_root_event(client, &proposal_root_event, repo_ref).await?;
Ok((proposal_root_event, commits_events))
}
|