2 files changed, 63 insertions, 18 deletions

diff --git a/src/bin/git_remote_nostr/list.rs b/src/bin/git_remote_nostr/list.rs
index b9fb0c0..7bdf170 100644
--- a/src/bin/git_remote_nostr/list.rs
+++ b/src/bin/git_remote_nostr/list.rs
@@ -11,7 +11,7 @@ use ngit::{
         self,
         nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
     },
-    git_events::event_to_cover_letter,
+    git_events::{KIND_PULL_REQUEST, KIND_PULL_REQUEST_UPDATE, event_to_cover_letter, tag_value},
     login::get_curent_user,
     repo_ref::{self, is_grasp_server},
 };
@@ -122,6 +122,16 @@ async fn get_open_and_draft_proposals_state(
 
     // without trusting commit_id we must apply each patch which requires the oid of
     // the parent so we much do a fetch
+
+    // As we are fetching from git servers we mighgt as well get oids from pull
+    // request too
+    // TODO get Pull Request and Pull Request Update Events add these to
+    // refs/nostr/<event-id>
+    // TODO prepare PRs and PRS oids to try and fetch from repo servers that are or
+    // clone urls in PR/update event we are using anyway. TODO after we tried
+    // and failed to get them from these server we should fallback to fetch them
+    // from listed clone urls in PR/update but not during list, only during fetch
+
     for (git_server_url, (oids_from_git_servers, is_grasp_server)) in remote_states {
         if fetch_from_git_server(
             git_repo,
@@ -144,7 +154,7 @@ async fn get_open_and_draft_proposals_state(
     let mut state = HashMap::new();
     let open_and_draft_proposals = get_open_or_draft_proposals(git_repo, repo_ref).await?;
     let current_user = get_curent_user(git_repo)?;
-    for (_, (proposal, patches)) in open_and_draft_proposals {
+    for (_, (proposal, events_to_apply)) in open_and_draft_proposals {
         if let Ok(cl) = event_to_cover_letter(&proposal) {
             if let Ok(mut branch_name) = cl.get_branch_name_with_pr_prefix_and_shorthand_id() {
                 branch_name = if let Some(public_key) = current_user {
@@ -156,15 +166,43 @@ async fn get_open_and_draft_proposals_state(
                 } else {
                     branch_name
                 };
-                match make_commits_for_proposal(git_repo, repo_ref, &patches) {
-                    Ok(tip) => {
-                        state.insert(format!("refs/heads/{branch_name}"), tip);
+                // if events_to_apply contains a PR or PR Update event it should be the only
+                // event in the Vec
+                if let Some(pr_or_pr_update) = events_to_apply
+                    .iter()
+                    .find(|e| e.kind.eq(&KIND_PULL_REQUEST) || e.kind.eq(&KIND_PULL_REQUEST_UPDATE))
+                {
+                    match tag_value(pr_or_pr_update, "c") {
+                        Ok(tip) => {
+                            state.insert(format!("refs/heads/{branch_name}"), tip);
+                        }
+                        Err(_) => {
+                            let _ = term.write_line(
+                                format!(
+                                    "WARNING: failed to fetch branch {branch_name} error: {} event poorly formatted",
+                                    if pr_or_pr_update.kind.eq(&KIND_PULL_REQUEST) {
+                                        "PR"
+                                    } else {
+                                        "PR update"
+                                    }
+                                )
+                                .as_str(),
+                            );
+                        }
                     }
-                    Err(error) => {
-                        let _ = term.write_line(
-                            format!("WARNING: failed to fetch branch {branch_name} error: {error}")
+                } else {
+                    match make_commits_for_proposal(git_repo, repo_ref, &events_to_apply) {
+                        Ok(tip) => {
+                            state.insert(format!("refs/heads/{branch_name}"), tip);
+                        }
+                        Err(error) => {
+                            let _ = term.write_line(
+                                format!(
+                                    "WARNING: failed to fetch branch {branch_name} error: {error}"
+                                )
                                 .as_str(),
-                        );
+                            );
+                        }
                     }
                 }
             }
diff --git a/src/bin/git_remote_nostr/utils.rs b/src/bin/git_remote_nostr/utils.rs
index dc75872..d0b4e7e 100644
--- a/src/bin/git_remote_nostr/utils.rs
+++ b/src/bin/git_remote_nostr/utils.rs
@@ -10,7 +10,7 @@ use anyhow::{Context, Result, bail};
 use git2::Repository;
 use ngit::{
     client::{
-        get_all_proposal_patch_events_from_cache, get_events_from_local_cache,
+        get_all_proposal_patch_pr_pr_update_events_from_cache, get_events_from_local_cache,
         get_proposals_and_revisions_from_cache,
     },
     git::{
@@ -18,7 +18,7 @@ use ngit::{
         nostr_url::{CloneUrl, NostrUrlDecoded, ServerProtocol},
     },
     git_events::{
-        event_is_revision_root, get_most_recent_patch_with_ancestors,
+        event_is_revision_root, get_pr_tip_event_or_most_recent_patch_with_ancestors,
         is_event_proposal_root_for_branch, status_kinds,
     },
     repo_ref::RepoRef,
@@ -140,12 +140,15 @@ pub async fn get_open_or_draft_proposals(
             Kind::GitStatusOpen
         };
         if [Kind::GitStatusOpen, Kind::GitStatusDraft].contains(&status) {
-            if let Ok(commits_events) =
-                get_all_proposal_patch_events_from_cache(git_repo_path, repo_ref, &proposal.id)
-                    .await
+            if let Ok(commits_events) = get_all_proposal_patch_pr_pr_update_events_from_cache(
+                git_repo_path,
+                repo_ref,
+                &proposal.id,
+            )
+            .await
             {
                 if let Ok(most_recent_proposal_patch_chain) =
-                    get_most_recent_patch_with_ancestors(commits_events.clone())
+                    get_pr_tip_event_or_most_recent_patch_with_ancestors(commits_events.clone())
                 {
                     open_or_draft_proposals
                         .insert(proposal.id, (proposal, most_recent_proposal_patch_chain));
@@ -172,11 +175,15 @@ pub async fn get_all_proposals(
     let mut all_proposals = HashMap::new();
 
     for proposal in proposals {
-        if let Ok(commits_events) =
-            get_all_proposal_patch_events_from_cache(git_repo_path, repo_ref, &proposal.id).await
+        if let Ok(commits_events) = get_all_proposal_patch_pr_pr_update_events_from_cache(
+            git_repo_path,
+            repo_ref,
+            &proposal.id,
+        )
+        .await
         {
             if let Ok(most_recent_proposal_patch_chain) =
-                get_most_recent_patch_with_ancestors(commits_events.clone())
+                get_pr_tip_event_or_most_recent_patch_with_ancestors(commits_events.clone())
             {
                 all_proposals.insert(proposal.id, (proposal, most_recent_proposal_patch_chain));
             }