6e0d885 fix(src/ci_event.rs): don't error if namespaced ref is not branch — radicle-ci-broker

rad:zwTxygwuz5LDGBq255RA2CbNGrz8

Radicle CI broker

fix(src/ci_event.rs): don't error if namespaced ref is not branch

Lars Wirzenius committed 1 year ago

commit 6e0d8853d0304da84c1638584fe09a639a894983
parent 041e736

1 file changed +15 -9

modified src/ci_event.rs

@@ -194,9 +194,11 @@ impl CiEvent {

                             if let Ok(patch_id) = patch_id(name) {
                                 Self::patch_created(origin, *rid, patch_id, *oid)
                             } else if let Ok(branch) = namespaced_from_str(name) {
                                 let branch = branch_from_namespaced(&branch)
                                     .map_err(|err| CiEventError::branch_name(&branch, err))?;
                                 Self::branch_created(origin, *rid, &branch, *oid)?
                                 if let Ok(branch) = branch_from_namespaced(&branch) {
                                     Self::branch_created(origin, *rid, &branch, *oid)?
                                 } else {
                                     continue;
                                 }
                             } else {
                                 continue;
                             }

@@ -206,9 +208,11 @@ impl CiEvent {

                             if let Ok(patch_id) = patch_id(name) {
                                 Self::patch_updated(origin, *rid, patch_id, *new)
                             } else if let Ok(branch) = namespaced_from_str(name) {
                                 let branch = branch_from_namespaced(&branch)
                                     .map_err(|err| CiEventError::branch_name(&branch, err))?;
                                 Self::branch_updated(origin, *rid, &branch, *new, *old)?
                                 if let Ok(branch) = branch_from_namespaced(&branch) {
                                     Self::branch_updated(origin, *rid, &branch, *new, *old)?
                                 } else {
                                     continue;
                                 }
                             } else {
                                 continue;
                             }

@@ -217,9 +221,11 @@ impl CiEvent {

                             let origin = originator(name.to_namespaced().unwrap())?;
                             let branch = namespaced_from_str(name)
                                 .map_err(|err| CiEventError::branch_name(name, err))?;
                             let branch = branch_from_namespaced(&branch)
                                 .map_err(|err| CiEventError::branch_name(&branch, err))?;
                             Self::branch_deleted(origin, *rid, &branch, *oid)?
                             if let Ok(branch) = branch_from_namespaced(&branch) {
                                 Self::branch_deleted(origin, *rid, &branch, *oid)?
                             } else {
                                 continue;
                             }
                         }
                         RefUpdate::Skipped { .. } => continue,
                     };