From fedf5166f0c57db14b9e43747121e4b7845b63dd Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 20 Aug 2024 06:25:17 +0100
Subject: feat: set proposal branch prefix to `pr/`

from `prs/`.

whilst plural reflects usage of `heads` and `tags` in git refs,
singular is shorter and more reflective of usage of branch prefixes
such as `feature/` `fix/`
---
 src/git_remote_helper.rs | 10 +++++-----
 src/sub_commands/send.rs | 16 +++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/git_remote_helper.rs b/src/git_remote_helper.rs
index 9b9b000..e55a2eb 100644
--- a/src/git_remote_helper.rs
+++ b/src/git_remote_helper.rs
@@ -233,7 +233,7 @@ async fn list(
             .clone()
     };
 
-    state.retain(|k, _| !k.starts_with("refs/heads/prs/"));
+    state.retain(|k, _| !k.starts_with("refs/heads/pr/"));
 
     let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
     let current_user = get_curent_user(git_repo)?;
@@ -447,7 +447,7 @@ async fn fetch(
 
     let oids_from_git_servers = fetch_batch
         .iter()
-        .filter(|(refstr, _)| !refstr.contains("refs/heads/prs/"))
+        .filter(|(refstr, _)| !refstr.contains("refs/heads/pr/"))
         .map(|(_, oid)| oid.clone())
         .collect::<Vec<String>>();
 
@@ -488,7 +488,7 @@ async fn fetch(
         );
     }
 
-    fetch_batch.retain(|refstr, _| refstr.contains("refs/heads/prs/"));
+    fetch_batch.retain(|refstr, _| refstr.contains("refs/heads/pr/"));
 
     if !fetch_batch.is_empty() {
         let open_proposals = get_open_proposals(git_repo, repo_ref).await?;
@@ -580,13 +580,13 @@ async fn push(
 
     let proposal_refspecs = refspecs
         .iter()
-        .filter(|r| r.contains("refs/heads/prs/"))
+        .filter(|r| r.contains("refs/heads/pr/"))
         .cloned()
         .collect::<Vec<String>>();
 
     let mut git_server_refspecs = refspecs
         .iter()
-        .filter(|r| !r.contains("refs/heads/prs/"))
+        .filter(|r| !r.contains("refs/heads/pr/"))
         .cloned()
         .collect::<Vec<String>>();
 
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs
index a005bd7..8369b10 100644
--- a/src/sub_commands/send.rs
+++ b/src/sub_commands/send.rs
@@ -648,7 +648,7 @@ pub async fn generate_cover_letter_and_patch_events(
                     vec![
                         Tag::custom(
                             nostr::TagKind::Custom(std::borrow::Cow::Borrowed("branch-name")),
-                            vec![if let Some(branch_name) = branch_name.strip_prefix("prs/") {
+                            vec![if let Some(branch_name) = branch_name.strip_prefix("pr/") {
                                 branch_name.to_string()
                             } else {
                                 branch_name
@@ -691,13 +691,11 @@ pub async fn generate_cover_letter_and_patch_events(
                             && !branch_name.eq("origin/main")
                             && !branch_name.eq("origin/master")
                         {
-                            Some(
-                                if let Some(branch_name) = branch_name.strip_prefix("prs/") {
-                                    branch_name.to_string()
-                                } else {
-                                    branch_name
-                                },
-                            )
+                            Some(if let Some(branch_name) = branch_name.strip_prefix("pr/") {
+                                branch_name.to_string()
+                            } else {
+                                branch_name
+                            })
                         } else {
                             None
                         }
@@ -793,7 +791,7 @@ pub struct CoverLetter {
 impl CoverLetter {
     pub fn get_branch_name(&self) -> Result<String> {
         Ok(format!(
-            "prs/{}({})",
+            "pr/{}({})",
             self.branch_name,
             &self
                 .event_id
-- 
cgit v1.2.3