Merge pull request #10457 from gitbutlerapp/kv-branch-55

Implement but oplog

Author: krlvi

crates/but/src/args.rs

@@ -84,6 +84,12 @@ For examples see `but rub --help`."
         /// Commit ID to edit the message for
         commit: String,
     },
+    /// Show operation history (last 20 entries).
+    Oplog {
+        /// Start from this oplog SHA instead of the head
+        #[clap(long)]
+        since: Option<String>,
+    },
     /// Starts up the MCP server.
     Mcp {
         /// Starts the internal MCP server which has more granular tools.
@@ -123,6 +129,8 @@ pub enum CommandName {
     Commit,
     #[clap(alias = "describe")]
     Describe,
+    #[clap(alias = "oplog")]
+    Oplog,
     BaseCheck,
     BaseUpdate,
     BranchNew,

crates/but/src/main.rs

@@ -18,6 +18,7 @@ mod mark;
 mod mcp;
 mod mcp_internal;
 mod metrics;
+mod oplog;
 mod rub;
 mod status;
 
@@ -172,6 +173,11 @@ async fn main() -> Result<()> {
             metrics_if_configured(app_settings, CommandName::Describe, props(start, &result)).ok();
             result
         }
+        Subcommands::Oplog { since } => {
+            let result = oplog::show_oplog(&args.current_dir, args.json, since.as_deref());
+            metrics_if_configured(app_settings, CommandName::Oplog, props(start, &result)).ok();
+            result
+        }
         Subcommands::Init { repo } => init::repo(&args.current_dir, args.json, *repo)
             .context("Failed to initialize GitButler project."),
     }

crates/but/src/oplog/mod.rs

@@ -0,0 +1,117 @@
+use colored::Colorize;
+use gitbutler_oplog::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<()> {
+    let project = Project::find_by_path(repo_path)?;
+
+    let snapshots = if let Some(since_sha) = since {
+        // Get all snapshots first to find the starting point
+        let all_snapshots = but_api::undo::list_snapshots(project.id, 1000, None, None)?; // Get a large number to find the SHA
+        let mut found_index = None;
+
+        // Find the snapshot that matches the since SHA (partial match supported)
+        for (index, snapshot) in all_snapshots.iter().enumerate() {
+            let snapshot_sha = snapshot.commit_id.to_string();
+            if snapshot_sha.starts_with(since_sha) {
+                found_index = Some(index);
+                break;
+            }
+        }
+
+        match found_index {
+            Some(index) => {
+                // Take 20 entries starting from the found index
+                all_snapshots.into_iter().skip(index).take(20).collect()
+            }
+            None => {
+                return Err(anyhow::anyhow!(
+                    "No oplog entry found matching SHA: {}",
+                    since_sha
+                ));
+            }
+        }
+    } else {
+        but_api::undo::list_snapshots(project.id, 20, None, None)?
+    };
+
+    if snapshots.is_empty() {
+        if json {
+            println!("[]");
+        } else {
+            println!("No operations found in history.");
+        }
+        return Ok(());
+    }
+
+    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();
+
+            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",
+                };
+                (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(),
+            };
+
+            println!(
+                "{} {} [{}] {}",
+                commit_id,
+                time_string.dimmed(),
+                operation_colored,
+                title
+            );
+        }
+    }
+
+    Ok(())
+}