diff options
Diffstat (limited to 'src/bin/git_remote_nostr')
| -rw-r--r-- | src/bin/git_remote_nostr/fetch.rs | 4 | ||||
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/git_remote_nostr/fetch.rs b/src/bin/git_remote_nostr/fetch.rs index 221d964..2cc87da 100644 --- a/src/bin/git_remote_nostr/fetch.rs +++ b/src/bin/git_remote_nostr/fetch.rs | |||
| @@ -18,7 +18,7 @@ use ngit::{ | |||
| 18 | }, | 18 | }, |
| 19 | git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value}, | 19 | git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, tag_value}, |
| 20 | login::get_curent_user, | 20 | login::get_curent_user, |
| 21 | repo_ref::{RepoRef, is_grasp_server}, | 21 | repo_ref::{RepoRef, is_grasp_server_in_list}, |
| 22 | utils::{ | 22 | utils::{ |
| 23 | Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch, | 23 | Direction, find_proposal_and_patches_by_branch_name, get_oids_from_fetch_batch, |
| 24 | get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and, | 24 | get_open_or_draft_proposals, get_read_protocols_to_try, join_with_and, |
| @@ -96,7 +96,7 @@ pub async fn run_fetch( | |||
| 96 | git_server_url, | 96 | git_server_url, |
| 97 | &repo_ref.to_nostr_git_url(&None), | 97 | &repo_ref.to_nostr_git_url(&None), |
| 98 | &term, | 98 | &term, |
| 99 | is_grasp_server(git_server_url, &repo_ref.grasp_servers()), | 99 | is_grasp_server_in_list(git_server_url, &repo_ref.grasp_servers()), |
| 100 | ) { | 100 | ) { |
| 101 | errors.push(error); | 101 | errors.push(error); |
| 102 | } | 102 | } |
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index f98e792..d42c904 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs | |||
| @@ -20,7 +20,7 @@ use ngit::{ | |||
| 20 | list::list_from_remotes, | 20 | list::list_from_remotes, |
| 21 | login::{self, user::UserRef}, | 21 | login::{self, user::UserRef}, |
| 22 | push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote}, | 22 | push::{push_refs_and_generate_pr_or_pr_update_event, push_to_remote}, |
| 23 | repo_ref::{self, get_repo_config_from_yaml, is_grasp_server}, | 23 | repo_ref::{self, get_repo_config_from_yaml, is_grasp_server_in_list}, |
| 24 | repo_state, | 24 | repo_state, |
| 25 | utils::{ | 25 | utils::{ |
| 26 | find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url, | 26 | find_proposal_and_patches_by_branch_name, get_all_proposals, get_remote_name_by_url, |
| @@ -153,7 +153,7 @@ pub async fn run_push( | |||
| 153 | &repo_ref.to_nostr_git_url(&None), | 153 | &repo_ref.to_nostr_git_url(&None), |
| 154 | &remote_refspecs, | 154 | &remote_refspecs, |
| 155 | &term, | 155 | &term, |
| 156 | is_grasp_server(&git_server_url, &repo_ref.grasp_servers()), | 156 | is_grasp_server_in_list(&git_server_url, &repo_ref.grasp_servers()), |
| 157 | ); | 157 | ); |
| 158 | } | 158 | } |
| 159 | } | 159 | } |
| @@ -458,7 +458,7 @@ async fn generate_patches_or_pr_event_or_pr_updates( | |||
| 458 | let repo_grasp_clone_urls: Vec<String> = repo_ref | 458 | let repo_grasp_clone_urls: Vec<String> = repo_ref |
| 459 | .git_server | 459 | .git_server |
| 460 | .iter() | 460 | .iter() |
| 461 | .filter(|s| is_grasp_server(s, &repo_grasps)) | 461 | .filter(|s| is_grasp_server_in_list(s, &repo_grasps)) |
| 462 | .cloned() | 462 | .cloned() |
| 463 | .collect(); | 463 | .collect(); |
| 464 | 464 | ||