Support JSON output for but -j oplog

Allow the oplog command to return JSON when the json flag is set. 

Previously the json parameter was unused; this change wires the flag 
into show_oplog, prints an empty JSON array when no snapshots are found,
and emits pretty-printed JSON for the snapshots. 

When not in JSON mode, the existing human-readable, colorized output is 
preserved. Additionally, minor refactoring fixes variable indentation 
and ensures snapshot details are handled correctly for both output 
modes.

Author: schacon

crates/but/src/oplog/mod.rs

@@ -5,7 +5,7 @@ use gitbutler_oplog::{OplogExt, entry::OperationKind};
 use gitbutler_project::Project;
 use std::path::Path;
 
-pub(crate) fn show_oplog(repo_path: &Path, _json: bool, since: Option<&str>) -> anyhow::Result<()> {
+pub(crate) fn show_oplog(repo_path: &Path, json: bool, since: Option<&str>) -> anyhow::Result<()> {
     let project = Project::from_path(repo_path)?;
     let ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
 
@@ -37,69 +37,80 @@ pub(crate) fn show_oplog(repo_path: &Path, _json: bool, since: Option<&str>) ->
     };
 
     if snapshots.is_empty() {
-        println!("No operations found in history.");
+        if json {
+            println!("[]");
+        } else {
+            println!("No operations found in history.");
+        }
         return Ok(());
     }
 
-    println!("{}", "Operations History".blue().bold());
-    println!("{}", "─".repeat(50).dimmed());
+    if json {
+        // Output JSON format
+        let json_output = serde_json::to_string_pretty(&snapshots)?;
+        println!("{}", json_output);
+    } else {
+        // Output human-readable format
+        println!("{}", "Operations History".blue().bold());
+        println!("{}", "─".repeat(50).dimmed());
 
-    for snapshot in snapshots {
-        let time_string = chrono::DateTime::from_timestamp(snapshot.created_at.seconds(), 0)
-            .ok_or(anyhow::anyhow!("Could not parse timestamp"))?
-            .format("%Y-%m-%d %H:%M:%S")
-            .to_string();
+        for snapshot in snapshots {
+            let time_string = chrono::DateTime::from_timestamp(snapshot.created_at.seconds(), 0)
+                .ok_or(anyhow::anyhow!("Could not parse timestamp"))?
+                .format("%Y-%m-%d %H:%M:%S")
+                .to_string();
 
-        let commit_id = format!(
-            "{}{}",
-            &snapshot.commit_id.to_string()[..7].blue().underline(),
-            &snapshot.commit_id.to_string()[7..12].blue().dimmed()
-        );
+            let commit_id = format!(
+                "{}{}",
+                &snapshot.commit_id.to_string()[..7].blue().underline(),
+                &snapshot.commit_id.to_string()[7..12].blue().dimmed()
+            );
 
-        let (operation_type, title) = if let Some(details) = &snapshot.details {
-            let op_type = match details.operation {
-                OperationKind::CreateCommit => "CREATE",
-                OperationKind::CreateBranch => "BRANCH",
-                OperationKind::AmendCommit => "AMEND",
-                OperationKind::UndoCommit => "UNDO",
-                OperationKind::SquashCommit => "SQUASH",
-                OperationKind::UpdateCommitMessage => "REWORD",
-                OperationKind::MoveCommit => "MOVE",
-                OperationKind::RestoreFromSnapshot => "RESTORE",
-                OperationKind::ReorderCommit => "REORDER",
-                OperationKind::InsertBlankCommit => "INSERT",
-                OperationKind::MoveHunk => "MOVE_HUNK",
-                OperationKind::ReorderBranches => "REORDER_BRANCH",
-                OperationKind::UpdateWorkspaceBase => "UPDATE_BASE",
-                OperationKind::UpdateBranchName => "RENAME",
-                OperationKind::GenericBranchUpdate => "BRANCH_UPDATE",
-                OperationKind::ApplyBranch => "APPLY",
-                OperationKind::UnapplyBranch => "UNAPPLY",
-                OperationKind::DeleteBranch => "DELETE",
-                OperationKind::DiscardChanges => "DISCARD",
-                _ => "OTHER",
+            let (operation_type, title) = if let Some(details) = &snapshot.details {
+                let op_type = match details.operation {
+                    OperationKind::CreateCommit => "CREATE",
+                    OperationKind::CreateBranch => "BRANCH",
+                    OperationKind::AmendCommit => "AMEND",
+                    OperationKind::UndoCommit => "UNDO",
+                    OperationKind::SquashCommit => "SQUASH",
+                    OperationKind::UpdateCommitMessage => "REWORD",
+                    OperationKind::MoveCommit => "MOVE",
+                    OperationKind::RestoreFromSnapshot => "RESTORE",
+                    OperationKind::ReorderCommit => "REORDER",
+                    OperationKind::InsertBlankCommit => "INSERT",
+                    OperationKind::MoveHunk => "MOVE_HUNK",
+                    OperationKind::ReorderBranches => "REORDER_BRANCH",
+                    OperationKind::UpdateWorkspaceBase => "UPDATE_BASE",
+                    OperationKind::UpdateBranchName => "RENAME",
+                    OperationKind::GenericBranchUpdate => "BRANCH_UPDATE",
+                    OperationKind::ApplyBranch => "APPLY",
+                    OperationKind::UnapplyBranch => "UNAPPLY",
+                    OperationKind::DeleteBranch => "DELETE",
+                    OperationKind::DiscardChanges => "DISCARD",
+                    _ => "OTHER",
+                };
+                (op_type, details.title.clone())
+            } else {
+                ("UNKNOWN", "Unknown operation".to_string())
             };
-            (op_type, details.title.clone())
-        } else {
-            ("UNKNOWN", "Unknown operation".to_string())
-        };
 
-        let operation_colored = match operation_type {
-            "CREATE" => operation_type.green(),
-            "AMEND" | "REWORD" => operation_type.yellow(),
-            "UNDO" | "RESTORE" => operation_type.red(),
-            "BRANCH" | "CHECKOUT" => operation_type.purple(),
-            "MOVE" | "REORDER" | "MOVE_HUNK" => operation_type.cyan(),
-            _ => operation_type.normal(),
-        };
+            let operation_colored = match operation_type {
+                "CREATE" => operation_type.green(),
+                "AMEND" | "REWORD" => operation_type.yellow(),
+                "UNDO" | "RESTORE" => operation_type.red(),
+                "BRANCH" | "CHECKOUT" => operation_type.purple(),
+                "MOVE" | "REORDER" | "MOVE_HUNK" => operation_type.cyan(),
+                _ => operation_type.normal(),
+            };
 
-        println!(
-            "{} {} {} {}",
-            commit_id,
-            time_string.dimmed(),
-            format!("[{}]", operation_colored),
-            title
-        );
+            println!(
+                "{} {} {} {}",
+                commit_id,
+                time_string.dimmed(),
+                format!("[{}]", operation_colored),
+                title
+            );
+        }
     }
 
     Ok(())