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
|
use anyhow::{bail, Context, Result};
use nostr::{prelude::sha1::Hash as Sha1Hash, EventBuilder, Marker, Tag, TagKind};
use crate::{
cli_interactor::{Interactor, InteractorPrompt, PromptConfirmParms, PromptInputParms},
git::{Repo, RepoActions},
login, Cli,
};
#[derive(Debug, clap::Args)]
pub struct SubCommandArgs {
#[clap(short, long)]
/// title of pull request (defaults to first line of first commit)
title: Option<String>,
#[clap(short, long)]
/// optional description
description: Option<String>,
#[clap(long)]
/// branch to get changes from (defaults to head)
from_branch: Option<String>,
#[clap(long)]
/// destination branch (defaults to main or master)
to_branch: Option<String>,
}
pub fn launch(
cli_args: &Cli,
_pr_args: &super::SubCommandArgs,
args: &SubCommandArgs,
) -> Result<()> {
let git_repo = Repo::discover().context("cannot find a git repository")?;
let (from_branch, to_branch, ahead, behind) =
identify_ahead_behind(&git_repo, &args.from_branch, &args.to_branch)?;
if ahead.is_empty() {
bail!(format!(
"'{from_branch}' is 0 commits ahead of '{to_branch}' so no patches were created"
));
}
if behind.is_empty() {
println!(
"creating patch for {} commits from '{from_branch}' that can be merged into '{to_branch}'",
ahead.len(),
);
} else {
if !Interactor::default().confirm(
PromptConfirmParms::default()
.with_prompt(
format!(
"'{from_branch}' is {} commits behind '{to_branch}' and {} ahead. Consider rebasing before sending patches. Proceed anyway?",
behind.len(),
ahead.len(),
)
)
.with_default(false)
).context("failed to get confirmation response from interactor confirm")? {
bail!("aborting so branch can be rebased");
}
println!(
"creating patch for {} commit{} from '{from_branch}' that {} {} behind '{to_branch}'",
ahead.len(),
if ahead.len() > 1 { "s" } else { "" },
if ahead.len() > 1 { "are" } else { "is" },
behind.len(),
);
}
let title = match &args.title {
Some(t) => t.clone(),
None => Interactor::default().input(PromptInputParms::default().with_prompt("title"))?,
};
let description = match &args.description {
Some(t) => t.clone(),
None => Interactor::default()
.input(PromptInputParms::default().with_prompt("description (Optional)"))?,
};
let root_commit = git_repo
.get_root_commit(to_branch.as_str())
.context("failed to get root commit of the repository")?;
// create PR event
let keys = login::launch(&cli_args.nsec, &cli_args.password)?;
let pr_event = EventBuilder::new(
nostr::event::Kind::Custom(318),
format!("{title}\r\n\r\n{description}"),
&[Tag::Hashtag(format!("r-{root_commit}"))],
// TODO: suggested branch name
// Tag::Generic(
// TagKind::Custom("suggested-branch-name".to_string()),
// vec![],
// ),
// TODO: add Repo event as root
// TODO: people tag maintainers
// TODO: add relay tags
)
.to_event(&keys)
.context("failed to create pr event")?;
let mut patch_events = vec![];
for commit in &ahead {
let commit_parent = git_repo
.get_commit_parent(commit)
.context("failed to create patch event")?;
patch_events.push(
EventBuilder::new(
nostr::event::Kind::Custom(317),
git_repo
.make_patch_from_commit(commit)
.context(format!("cannot make patch for commit {commit}"))?,
&[
Tag::Hashtag(format!("r-{root_commit}")),
Tag::Hashtag(commit.to_string()),
Tag::Hashtag(commit_parent.to_string()),
Tag::Event(
pr_event.id,
None, // TODO: add relay
Some(Marker::Root),
),
Tag::Generic(
TagKind::Custom("commit".to_string()),
vec![commit.to_string()],
),
Tag::Generic(
TagKind::Custom("parent-commit".to_string()),
vec![commit_parent.to_string()],
),
// TODO: add Repo event tags
// TODO: people tag maintainers
// TODO: add relay tags
],
)
.to_event(&keys),
);
}
// TODO check if there is already a similarly named PR
// TODO connect to relays and post
Ok(())
}
// TODO
// - find profile
// - file relays
// - find repo events
// -
/**
* returns `(from_branch,to_branch,ahead,behind)`
*/
fn identify_ahead_behind(
git_repo: &Repo,
from_branch: &Option<String>,
to_branch: &Option<String>,
) -> Result<(String, String, Vec<Sha1Hash>, Vec<Sha1Hash>)> {
let (from_branch, from_tip) = match from_branch {
Some(name) => (
name.to_string(),
git_repo
.get_tip_of_local_branch(name)
.context(format!("cannot find from_branch '{name}'"))?,
),
None => (
"head".to_string(),
git_repo
.get_head_commit()
.context("failed to get head commit")
.context(
"checkout a commit or specify a from_branch. head does not reveal a commit",
)?,
),
};
let (to_branch, to_tip) = match to_branch {
Some(name) => (
name.to_string(),
git_repo
.get_tip_of_local_branch(name)
.context(format!("cannot find to_branch '{name}'"))?,
),
None => {
let (name, commit) = git_repo
.get_main_or_master_branch()
.context("a destination branch (to_branch) is not specified and the defaults (main or master) do not exist")?;
(name.to_string(), commit)
}
};
match git_repo.get_commits_ahead_behind(&to_tip, &from_tip) {
Err(e) => {
if e.to_string().contains("is not an ancestor of") {
return Err(e).context(format!(
"'{from_branch}' is not branched from '{to_branch}'"
));
}
Err(e).context(format!(
"failed to get commits ahead and behind from '{from_branch}' to '{to_branch}'"
))
}
Ok((ahead, behind)) => Ok((from_branch, to_branch, ahead, behind)),
}
}
#[cfg(test)]
mod tests {
use test_utils::git::GitTestRepo;
use super::*;
mod identify_ahead_behind {
use super::*;
use crate::git::oid_to_sha1;
#[test]
fn when_from_branch_doesnt_exist_return_error() -> Result<()> {
let test_repo = GitTestRepo::default();
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
let branch_name = "doesnt_exist";
assert_eq!(
identify_ahead_behind(&git_repo, &Some(branch_name.to_string()), &None)
.unwrap_err()
.to_string(),
format!("cannot find from_branch '{}'", &branch_name),
);
Ok(())
}
#[test]
fn when_to_branch_doesnt_exist_return_error() -> Result<()> {
let test_repo = GitTestRepo::default();
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
let branch_name = "doesnt_exist";
assert_eq!(
identify_ahead_behind(&git_repo, &None, &Some(branch_name.to_string()))
.unwrap_err()
.to_string(),
format!("cannot find to_branch '{}'", &branch_name),
);
Ok(())
}
#[test]
fn when_to_branch_is_none_and_no_main_or_master_branch_return_error() -> Result<()> {
let test_repo = GitTestRepo::new("notmain")?;
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
assert_eq!(
identify_ahead_behind(&git_repo, &None, &None)
.unwrap_err()
.to_string(),
"a destination branch (to_branch) is not specified and the defaults (main or master) do not exist",
);
Ok(())
}
#[test]
fn when_from_branch_is_none_return_as_head() -> Result<()> {
let test_repo = GitTestRepo::default();
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
// create feature branch with 1 commit ahead
test_repo.create_branch("feature")?;
test_repo.checkout("feature")?;
std::fs::write(test_repo.dir.join("t3.md"), "some content")?;
let head_oid = test_repo.stage_and_commit("add t3.md")?;
// make feature branch 1 commit behind
test_repo.checkout("main")?;
std::fs::write(test_repo.dir.join("t4.md"), "some content")?;
let main_oid = test_repo.stage_and_commit("add t4.md")?;
// checkout feature
test_repo.checkout("feature")?;
let (from_branch, to_branch, ahead, behind) =
identify_ahead_behind(&git_repo, &None, &None)?;
assert_eq!(from_branch, "head");
assert_eq!(ahead, vec![oid_to_sha1(&head_oid)]);
assert_eq!(to_branch, "main");
assert_eq!(behind, vec![oid_to_sha1(&main_oid)]);
Ok(())
}
#[test]
fn when_from_branch_is_not_head_return_as_from_branch() -> Result<()> {
let test_repo = GitTestRepo::default();
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
// create feature branch with 1 commit ahead
test_repo.create_branch("feature")?;
test_repo.checkout("feature")?;
std::fs::write(test_repo.dir.join("t3.md"), "some content")?;
let head_oid = test_repo.stage_and_commit("add t3.md")?;
// make feature branch 1 commit behind
test_repo.checkout("main")?;
std::fs::write(test_repo.dir.join("t4.md"), "some content")?;
let main_oid = test_repo.stage_and_commit("add t4.md")?;
let (from_branch, to_branch, ahead, behind) =
identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?;
assert_eq!(from_branch, "feature");
assert_eq!(ahead, vec![oid_to_sha1(&head_oid)]);
assert_eq!(to_branch, "main");
assert_eq!(behind, vec![oid_to_sha1(&main_oid)]);
Ok(())
}
#[test]
fn when_to_branch_is_not_main_return_as_to_branch() -> Result<()> {
let test_repo = GitTestRepo::default();
let git_repo = Repo::from_path(&test_repo.dir)?;
test_repo.populate()?;
// create dev branch with 1 commit ahead
test_repo.create_branch("dev")?;
test_repo.checkout("dev")?;
std::fs::write(test_repo.dir.join("t3.md"), "some content")?;
let dev_oid_first = test_repo.stage_and_commit("add t3.md")?;
// create feature branch with 1 commit ahead of dev
test_repo.create_branch("feature")?;
test_repo.checkout("feature")?;
std::fs::write(test_repo.dir.join("t4.md"), "some content")?;
let feature_oid = test_repo.stage_and_commit("add t4.md")?;
// make feature branch 1 behind
test_repo.checkout("dev")?;
std::fs::write(test_repo.dir.join("t3.md"), "some content")?;
let dev_oid = test_repo.stage_and_commit("add t3.md")?;
let (from_branch, to_branch, ahead, behind) = identify_ahead_behind(
&git_repo,
&Some("feature".to_string()),
&Some("dev".to_string()),
)?;
assert_eq!(from_branch, "feature");
assert_eq!(ahead, vec![oid_to_sha1(&feature_oid)]);
assert_eq!(to_branch, "dev");
assert_eq!(behind, vec![oid_to_sha1(&dev_oid)]);
let (from_branch, to_branch, ahead, behind) =
identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?;
assert_eq!(from_branch, "feature");
assert_eq!(
ahead,
vec![oid_to_sha1(&feature_oid), oid_to_sha1(&dev_oid_first)]
);
assert_eq!(to_branch, "main");
assert_eq!(behind, vec![]);
Ok(())
}
}
}
|