diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-20 06:25:17 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-20 06:25:17 +0100 |
| commit | fedf5166f0c57db14b9e43747121e4b7845b63dd (patch) | |
| tree | 0bcbcc200239b75180931f6d5d6d76ee6ace1bf6 /src/git_remote_helper.rs | |
| parent | 42b0bad048b64ef51f45da6a6988823e5a49da1d (diff) | |
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/`
Diffstat (limited to 'src/git_remote_helper.rs')
| -rw-r--r-- | src/git_remote_helper.rs | 10 |
1 files changed, 5 insertions, 5 deletions
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( | |||
| 233 | .clone() | 233 | .clone() |
| 234 | }; | 234 | }; |
| 235 | 235 | ||
| 236 | state.retain(|k, _| !k.starts_with("refs/heads/prs/")); | 236 | state.retain(|k, _| !k.starts_with("refs/heads/pr/")); |
| 237 | 237 | ||
| 238 | let open_proposals = get_open_proposals(git_repo, repo_ref).await?; | 238 | let open_proposals = get_open_proposals(git_repo, repo_ref).await?; |
| 239 | let current_user = get_curent_user(git_repo)?; | 239 | let current_user = get_curent_user(git_repo)?; |
| @@ -447,7 +447,7 @@ async fn fetch( | |||
| 447 | 447 | ||
| 448 | let oids_from_git_servers = fetch_batch | 448 | let oids_from_git_servers = fetch_batch |
| 449 | .iter() | 449 | .iter() |
| 450 | .filter(|(refstr, _)| !refstr.contains("refs/heads/prs/")) | 450 | .filter(|(refstr, _)| !refstr.contains("refs/heads/pr/")) |
| 451 | .map(|(_, oid)| oid.clone()) | 451 | .map(|(_, oid)| oid.clone()) |
| 452 | .collect::<Vec<String>>(); | 452 | .collect::<Vec<String>>(); |
| 453 | 453 | ||
| @@ -488,7 +488,7 @@ async fn fetch( | |||
| 488 | ); | 488 | ); |
| 489 | } | 489 | } |
| 490 | 490 | ||
| 491 | fetch_batch.retain(|refstr, _| refstr.contains("refs/heads/prs/")); | 491 | fetch_batch.retain(|refstr, _| refstr.contains("refs/heads/pr/")); |
| 492 | 492 | ||
| 493 | if !fetch_batch.is_empty() { | 493 | if !fetch_batch.is_empty() { |
| 494 | let open_proposals = get_open_proposals(git_repo, repo_ref).await?; | 494 | let open_proposals = get_open_proposals(git_repo, repo_ref).await?; |
| @@ -580,13 +580,13 @@ async fn push( | |||
| 580 | 580 | ||
| 581 | let proposal_refspecs = refspecs | 581 | let proposal_refspecs = refspecs |
| 582 | .iter() | 582 | .iter() |
| 583 | .filter(|r| r.contains("refs/heads/prs/")) | 583 | .filter(|r| r.contains("refs/heads/pr/")) |
| 584 | .cloned() | 584 | .cloned() |
| 585 | .collect::<Vec<String>>(); | 585 | .collect::<Vec<String>>(); |
| 586 | 586 | ||
| 587 | let mut git_server_refspecs = refspecs | 587 | let mut git_server_refspecs = refspecs |
| 588 | .iter() | 588 | .iter() |
| 589 | .filter(|r| !r.contains("refs/heads/prs/")) | 589 | .filter(|r| !r.contains("refs/heads/pr/")) |
| 590 | .cloned() | 590 | .cloned() |
| 591 | .collect::<Vec<String>>(); | 591 | .collect::<Vec<String>>(); |
| 592 | 592 | ||