upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin/git_remote_nostr/push.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/git_remote_nostr/push.rs')
-rw-r--r--src/bin/git_remote_nostr/push.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 48122e3..f2ac169 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -299,7 +299,7 @@ async fn process_proposal_refspecs(
299 let tip_of_pushed_branch = git_repo.get_commit_or_tip_of_reference(from)?; 299 let tip_of_pushed_branch = git_repo.get_commit_or_tip_of_reference(from)?;
300 300
301 if let Some((_, (proposal, patches))) = 301 if let Some((_, (proposal, patches))) =
302 find_proposal_and_patches_by_branch_name(to, &all_proposals, &current_user) 302 find_proposal_and_patches_by_branch_name(to, &all_proposals, current_user.as_ref())
303 { 303 {
304 if [repo_ref.maintainers.clone(), vec![proposal.pubkey]] 304 if [repo_ref.maintainers.clone(), vec![proposal.pubkey]]
305 .concat() 305 .concat()
@@ -576,7 +576,7 @@ fn report_on_transfer_progress(
576 total: usize, 576 total: usize,
577 bytes: usize, 577 bytes: usize,
578 start_time: &Instant, 578 start_time: &Instant,
579 end_time: &Option<Instant>, 579 end_time: Option<&Instant>,
580) -> Option<String> { 580) -> Option<String> {
581 if total == 0 { 581 if total == 0 {
582 return None; 582 return None;
@@ -688,7 +688,7 @@ impl<'a> PushReporter<'a> {
688 total, 688 total,
689 bytes, 689 bytes,
690 &self.start_time.unwrap(), 690 &self.start_time.unwrap(),
691 &self.end_time, 691 self.end_time.as_ref(),
692 ) { 692 ) {
693 let existing_lines = self.count_all_existing_lines(); 693 let existing_lines = self.count_all_existing_lines();
694 if report.contains("100%") { 694 if report.contains("100%") {
@@ -1215,11 +1215,12 @@ async fn create_merge_events(
1215 signer, 1215 signer,
1216 repo_ref, 1216 repo_ref,
1217 &proposal, 1217 &proposal,
1218 &if let Some(revision_id) = revision_id { 1218 if let Some(revision_id) = revision_id {
1219 Some(get_event_from_cache_by_id(git_repo, revision_id).await?) 1219 Some(get_event_from_cache_by_id(git_repo, revision_id).await?)
1220 } else { 1220 } else {
1221 None 1221 None
1222 }, 1222 }
1223 .as_ref(),
1223 if let Some((commit, _)) = merged_patches 1224 if let Some((commit, _)) = merged_patches
1224 .iter() 1225 .iter()
1225 .find(|(_, m)| **m == MergedPRCommitType::MergeCommit) 1226 .find(|(_, m)| **m == MergedPRCommitType::MergeCommit)
@@ -1263,7 +1264,7 @@ async fn create_merge_status(
1263 signer: &Arc<dyn NostrSigner>, 1264 signer: &Arc<dyn NostrSigner>,
1264 repo_ref: &RepoRef, 1265 repo_ref: &RepoRef,
1265 proposal: &Event, 1266 proposal: &Event,
1266 revision: &Option<Event>, 1267 revision: Option<&Event>,
1267 merge_commits: Vec<Sha1Hash>, 1268 merge_commits: Vec<Sha1Hash>,
1268 merged_patches: Vec<EventId>, 1269 merged_patches: Vec<EventId>,
1269 applied: bool, 1270 applied: bool,