stkd-cli 0.1.0

CLI for Stkd - stacked diffs for Git
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61

//! Continue command

use anyhow::Result;
use clap::Args;
use stkd_core::Repository;

use crate::output;

#[derive(Args)]
pub struct ContinueArgs {}

pub async fn execute(_args: ContinueArgs) -> Result<()> {
    let repo = Repository::open(".")?;

    let state = repo.storage().load_state()?;

    if state.operation.is_none() && state.conflict_state.is_none() {
        output::info("No operation in progress");
        return Ok(());
    }

    if let Some(ref conflict) = state.conflict_state {
        output::info(&format!(
            "Continuing rebase of '{}' onto '{}'",
            conflict.branch, conflict.onto
        ));

        // Check if conflicts are resolved
        let index = repo.git().index()?;
        if index.has_conflicts() {
            output::error("Conflicts not resolved. Fix conflicts and stage changes.");
            return Ok(());
        }

        // Continue rebase
        let status = std::process::Command::new("git")
            .args(["rebase", "--continue"])
            .status()?;

        if !status.success() {
            anyhow::bail!("Rebase continue failed");
        }

        // Clear conflict state
        repo.storage().clear_conflict()?;

        // Continue with remaining branches
        if !conflict.remaining.is_empty() {
            output::info(&format!(
                "Continuing to restack {} remaining branches...",
                conflict.remaining.len()
            ));
            // Would continue restacking here
        }
    }

    repo.storage().complete_operation()?;
    output::success("Operation complete");

    Ok(())
}