cli: Add cancel command to abort pending reviews
PATCH 1/1 cli: Add cancel command to abort pending reviews
Hi,
I still need to setup a github repo, see if this is acceptable,
first patch, ran clippy, rust-fmt, tests passed, works for me :-)
- Arnaldo
---
Add sashiko-cli cancel <id> to cancel patchsets in Pending or Incomplete state. With --force, also cancels patchsets already In Review. The reviewer now checks for Cancelled status before writing its final result, preventing a force-cancelled review from being overwritten.
Co-Authored-By Claude Opus 4.6 (1M context) <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- src/api.rs | 46 ++++++++++++++++++++++++++++++++++++++ src/bin/sashiko-cli.rs | 50 ++++++++++++++++++++++++++++++++++++++++++ src/db.rs | 25 +++++++++++++++++++++ src/reviewer.rs | 24 +++++++++++++------- 4 files changed, 137 insertions(+), 8 deletions(-)
src/api.rs +46 -0
@@ -186,6 +186,13 @@ pub struct SubsystemQuery { pub subsystem_id: Option<i64>, } +#[derive( Deserialize )] +pub struct CancelQuery { +pub id:i64 , +#[serde( default )] +pub force:bool , +} +#[derive( Deserialize )] pub struct InjectRequest {pub raw:String ,
@@ -267,6 +274,7 @@ pub async fn run_server( .route("/api/stats/tools", get(stats_tools)) .route ("/api/submit" ,post (submit_patch)) .route ("/api/patchset/rerun" ,post (rerun_patchset)) + .route ("/api/patchset/cancel" ,post (cancel_patchset)) .route ("/api/patch/rerun" ,post (rerun_patch)) .route ("/" ,get_service (ServeFile ::new ("static/index.html" ))) .nest_service ("/static" ,ServeDir ::new ("static" ))
@@ -931,6 +939,44 @@ async fn rerun_patchset(Ok (Json (serde_json::json!({"status" :"accepted" }))) } +async fn cancel_patchset ( +ConnectInfo (addr):ConnectInfo <SocketAddr >, +State (state):State <Arc <AppState >>, +Query (query):Query <CancelQuery >, +) ->Result <Json <serde_json::Value >,StatusCode > { +if state.read_only { +return Err (StatusCode ::FORBIDDEN ); + } + +if !state.allow_all_submit && !addr.ip ().is_loopback () { +return Err (StatusCode ::FORBIDDEN ); + } + +let cancelled = state + .db + .cancel_patchset (query.id, query.force) + .await + .map_err (|e| { +error! ("Failed to cancel patchset {}: {}" , query.id, e); +StatusCode ::INTERNAL_SERVER_ERROR + })?; + +if cancelled { +info! ("Patchset {} cancelled (force={})" , query.id, query.force); +Ok (Json (serde_json::json!({"status" :"cancelled" }))) + }else { +let reason =if query.force { +"Patchset is not in a cancellable state (must be Pending, Incomplete, or In Review)" + }else { +"Patchset is not in a cancellable state (must be Pending or Incomplete; use force=true for In Review)" + }; +Ok (Json (serde_json::json!({ +"status" :"not_modified" , +"reason" : reason + }))) + } +} +async fn rerun_patch (ConnectInfo (addr):ConnectInfo <SocketAddr >, State(state): State<Arc<AppState>>,
src/bin/sashiko-cli.rs +50 -0
74 lines not on this page · raw message
src/db.rs +25 -0
@@ -3205,6 +3205,31 @@ impl Database {Ok (()) } +pub async fn get_patchset_status (&self, id:i64 ) ->Result <Option <String >> { +let mut rows = self + .conn + .query ( +"SELECT status FROM patchsets WHERE id = ?" , + libsql::params![id], + ) + .await ?; +if let Some (row) = rows.next ().await ? { +Ok (Some (row.get (0 )?)) + }else { +Ok (None ) + } + } + +pub async fn cancel_patchset (&self, id:i64 , force:bool ) ->Result <bool > { +let query =if force { +"UPDATE patchsets SET status = 'Cancelled' WHERE id = ? AND status IN ('Pending', 'Incomplete', 'In Review')" + }else { +"UPDATE patchsets SET status = 'Cancelled' WHERE id = ? AND status IN ('Pending', 'Incomplete')" + }; +let count = self.conn.execute (query, libsql::params![id]).await ?; +Ok (count >0 ) + } +pub async fn restart_failed_reviews (&self) ->Result <u64 > {let count = self.conn.execute ( "UPDATE patchsets SET status = 'Pending', failed_reason = NULL WHERE status = 'Failed'",
src/reviewer.rs +16 -8
@@ -644,16 +644,24 @@ impl Reviewer {// Cleanup worktree here since we kept it alive for reuse let _ = worktree.remove ().await ; -let final_status =if review_success { -ReviewStatus ::Reviewed .as_str ().to_string () +let current_status = ctx.db.get_patchset_status (patchset_id).await .ok ().flatten (); +if current_status.as_deref () ==Some (ReviewStatus ::Cancelled .as_str ()) { +info! ( +"Patchset {} was cancelled during review, preserving status" , + patchset_id + ); }else { -ReviewStatus ::Failed .as_str ().to_string () - }; +let final_status =if review_success { +ReviewStatus ::Reviewed .as_str ().to_string () + }else { +ReviewStatus ::Failed .as_str ().to_string () + }; -let _ = ctx - .db - .update_patchset_status (patchset_id, &final_status) - .await ; +let _ = ctx + .db + .update_patchset_status (patchset_id, &final_status) + .await ; + } }else {// No baseline found warn! ("No working baseline found for patchset {}" , patchset_id);
Signature · 1 line
2.53.0