stax 0.50.2

Fast stacked Git branches and PRs
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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

use crate::commands::restack;
use crate::config::Config;
use crate::engine::BranchMetadata;
use crate::git::{GitRepo, RebaseResult};
use crate::ops::receipt::{OpKind, OpReceipt, OpStatus};
use anyhow::Result;
use colored::Colorize;

pub(crate) fn continue_rebase_and_update_metadata(repo: &GitRepo) -> Result<RebaseResult> {
    match repo.rebase_continue()? {
        RebaseResult::Success => {
            // Update metadata for current branch
            let current = repo.current_branch()?;
            if let Some(meta) = BranchMetadata::read(repo.inner(), &current)? {
                let new_parent_rev = repo.branch_commit(&meta.parent_branch_name)?;
                let updated_meta = BranchMetadata {
                    parent_branch_revision: new_parent_rev,
                    ..meta
                };
                updated_meta.write(repo.inner(), &current)?;
            }
            Ok(RebaseResult::Success)
        }
        RebaseResult::Conflict => Ok(RebaseResult::Conflict),
    }
}

pub(crate) fn latest_failed_restack(repo: &GitRepo) -> Result<Option<OpReceipt>> {
    let git_dir = repo.git_dir()?;
    let current = repo.current_branch()?;
    let workdir = repo.workdir()?.to_string_lossy().to_string();

    Ok(OpReceipt::load_latest(git_dir)?.filter(|receipt| {
        receipt.kind == OpKind::Restack
            && receipt.status == OpStatus::Failed
            && receipt.repo_workdir == workdir
            && receipt
                .error
                .as_ref()
                .and_then(|error| error.failed_branch.as_deref())
                == Some(current.as_str())
    }))
}

/// Like `latest_failed_restack` but does not require the current branch to
/// match. Used by `restack --continue` to recover metadata when the user
/// may have finished the rebase via `git rebase --continue` directly.
pub(crate) fn latest_failed_restack_receipt(repo: &GitRepo) -> Result<Option<OpReceipt>> {
    let git_dir = repo.git_dir()?;
    let workdir = repo.workdir()?.to_string_lossy().to_string();

    Ok(OpReceipt::load_latest(git_dir)?.filter(|receipt| {
        matches!(
            receipt.kind,
            OpKind::Restack | OpKind::SyncRestack | OpKind::UpstackRestack
        ) && receipt.status == OpStatus::Failed
            && receipt.repo_workdir == workdir
    }))
}

fn continue_impl(repo: &GitRepo, resume_restack: bool) -> Result<()> {
    if !repo.rebase_in_progress()? {
        println!("{}", "No rebase in progress.".yellow());
        return Ok(());
    }

    println!("Continuing rebase...");

    match continue_rebase_and_update_metadata(repo)? {
        RebaseResult::Success => {
            println!("{}", "✓ Rebase completed successfully!".green());

            if resume_restack {
                if let Some(receipt) = latest_failed_restack(repo)? {
                    println!();
                    println!("{}", "Continuing restack...".bold());
                    restack::resume_after_rebase(
                        receipt.auto_stash_pop,
                        Some(receipt.head_branch_before.clone()),
                    )?;
                    return Ok(());
                }
            }

            let config = Config::load().unwrap_or_default();
            if config.ui.tips {
                println!();
                println!(
                    "You may want to run {} to continue restacking.",
                    "stax rs".cyan()
                );
            }
        }
        RebaseResult::Conflict => {
            println!("{}", "More conflicts to resolve.".yellow());
            let config = Config::load().unwrap_or_default();
            if config.ui.tips {
                println!();
                println!(
                    "Resolve the conflicts and run {} again.",
                    "stax continue".cyan()
                );
            }
        }
    }

    Ok(())
}

pub fn run() -> Result<()> {
    let repo = GitRepo::open()?;
    continue_impl(&repo, false)
}

pub fn run_and_resume_restack() -> Result<()> {
    let repo = GitRepo::open()?;
    continue_impl(&repo, true)
}