Merge pull request #10470 from gitbutlerapp/sc-but-json

JSON stuff

Author: krlvi

crates/but/src/args.rs

@@ -16,7 +16,7 @@ pub struct Args {
 
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommands {
-    /// Provides an overview of the Workspace commit graph.
+    /// Show commits on active branches in your workspace.
     Log,
     /// Overview of the uncommitted changes in the repository.
     #[clap(alias = "st")]

crates/but/src/log/mod.rs

@@ -11,7 +11,7 @@ use std::path::Path;
 
 use crate::id::CliId;
 
-pub(crate) fn commit_graph(repo_path: &Path, _json: bool) -> anyhow::Result<()> {
+pub(crate) fn commit_graph(repo_path: &Path, json: bool) -> anyhow::Result<()> {
     let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     but_rules::process_rules(ctx).ok(); // TODO: this is doing double work (dependencies can be reused)
@@ -21,6 +21,10 @@ pub(crate) fn commit_graph(repo_path: &Path, _json: bool) -> anyhow::Result<()>
         .filter_map(Result::ok)
         .collect::<Vec<_>>();
 
+    if json {
+        return output_json(stacks.into_iter().map(|(_, stack)| stack).collect());
+    }
+
     let mut nesting = 0;
     for (i, (stack_id, stack)) in stacks.iter().enumerate() {
         let marked = crate::mark::stack_marked(ctx, *stack_id).unwrap_or_default();
@@ -209,3 +213,9 @@ pub(crate) fn stack_details(
         but_workspace::stack_details(&ctx.project().gb_dir(), stack_id, ctx)
     }
 }
+
+fn output_json(stacks: Vec<but_workspace::ui::StackDetails>) -> anyhow::Result<()> {
+    let json_output = serde_json::to_string_pretty(&stacks)?;
+    println!("{json_output}");
+    Ok(())
+}

crates/but/src/status/assignment.rs

@@ -1,7 +1,7 @@
 use bstr::BString;
 use but_hunk_assignment::HunkAssignment;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize)]
 pub(crate) struct FileAssignment {
     pub path: BString,
     pub assignments: Vec<HunkAssignment>,

crates/but/src/status/mod.rs

@@ -13,7 +13,7 @@ pub(crate) mod assignment;
 
 use crate::id::CliId;
 
-pub(crate) fn worktree(repo_path: &Path, _json: bool, show_files: bool) -> anyhow::Result<()> {
+pub(crate) fn worktree(repo_path: &Path, json: bool, show_files: bool) -> anyhow::Result<()> {
     let project = Project::find_by_path(repo_path).expect("Failed to create project from path");
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     but_rules::process_rules(ctx).ok(); // TODO: this is doing double work (dependencies can be reused)
@@ -45,6 +45,12 @@ pub(crate) fn worktree(repo_path: &Path, _json: bool, show_files: bool) -> anyho
         stack_details.push((stack.id, (Some(details), assignments)));
     }
 
+    if json {
+        let json_output = serde_json::to_string_pretty(&stack_details)?;
+        println!("{json_output}");
+        return Ok(());
+    }
+
     for (stack_id, (details, assignments)) in stack_details {
         let mut stack_mark = stack_id.and_then(|stack_id| {
             if crate::mark::stack_marked(ctx, stack_id).unwrap_or_default() {