cascade-cli 0.1.152

Stacked diffs CLI for Bitbucket Server
Documentation 
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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85

use crate::errors::{CascadeError, Result};
use serde::{Deserialize, Serialize};
use std::path::{Path, PathBuf};

/// State for an in-progress sync operation
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct SyncState {
    /// ID of the stack being synced
    pub stack_id: String,
    /// Name of the stack
    pub stack_name: String,
    /// Branch user was on before sync started
    pub original_branch: String,
    /// Base branch being rebased onto
    pub target_base: String,
    /// Entry IDs that still need to be processed
    pub remaining_entry_ids: Vec<String>,
    /// Entry currently being cherry-picked (the one with conflicts)
    pub current_entry_id: String,
    /// Current entry's branch name
    pub current_entry_branch: String,
    /// Temp branch for current entry
    pub current_temp_branch: String,
    /// All temp branches created so far (for cleanup)
    pub temp_branches: Vec<String>,
}

impl SyncState {
    fn state_path(repo_root: &Path) -> Result<PathBuf> {
        Ok(crate::git::resolve_git_dir(repo_root)?.join("CASCADE_SYNC_STATE"))
    }

    /// Save sync state to disk
    pub fn save(&self, repo_root: &Path) -> Result<()> {
        let state_path = Self::state_path(repo_root)?;
        let json = serde_json::to_string_pretty(self)
            .map_err(|e| CascadeError::config(format!("Failed to serialize sync state: {e}")))?;

        std::fs::write(&state_path, json)
            .map_err(|e| CascadeError::config(format!("Failed to write sync state: {e}")))?;

        tracing::debug!("Saved sync state to {:?}", state_path);
        Ok(())
    }

    /// Load sync state from disk
    pub fn load(repo_root: &Path) -> Result<Self> {
        let state_path = Self::state_path(repo_root)?;

        if !state_path.exists() {
            return Err(CascadeError::config(
                "No in-progress sync found. Nothing to continue.".to_string(),
            ));
        }

        let json = std::fs::read_to_string(&state_path)
            .map_err(|e| CascadeError::config(format!("Failed to read sync state: {e}")))?;

        let state: Self = serde_json::from_str(&json)
            .map_err(|e| CascadeError::config(format!("Failed to parse sync state: {e}")))?;

        tracing::debug!("Loaded sync state from {:?}", state_path);
        Ok(state)
    }

    /// Delete sync state file
    pub fn delete(repo_root: &Path) -> Result<()> {
        let state_path = Self::state_path(repo_root)?;

        if state_path.exists() {
            std::fs::remove_file(&state_path)
                .map_err(|e| CascadeError::config(format!("Failed to delete sync state: {e}")))?;
            tracing::debug!("Deleted sync state file");
        }

        Ok(())
    }

    /// Check if sync state exists
    pub fn exists(repo_root: &Path) -> bool {
        crate::git::resolve_git_dir(repo_root)
            .map(|d| d.join("CASCADE_SYNC_STATE").exists())
            .unwrap_or(false)
    }
}