tbdflow 0.29.0

A CLI to streamline your Git workflow for Trunk-Based Development.
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
119

use crate::config::Config;
use crate::git::{GitError, RunOpts};
use crate::{commands, config, git, intent};
use anyhow::Result;
use colored::Colorize;
use std::path::PathBuf;

pub fn get_default_branch_name(config: &Config) -> &str {
    config.main_branch_name.as_str()
}

pub fn handle_branch(
    r#type: Option<String>,
    config: &Config,
    name: Option<String>,
    issue: Option<String>,
    from_commit: Option<String>,
    opts: RunOpts,
) -> Result<()> {
    println!(
        "{}",
        "--- Creating short-lived branch ---".to_string().blue()
    );

    let main_branch_name = get_default_branch_name(config);
    let prefix = commands::get_branch_prefix_or_error(&config.branch_types, &r#type.unwrap())?;

    let branch_name = match config.issue_handling.strategy {
        config::IssueHandlingStrategy::BranchName => {
            let issue_part = issue.map_or("".to_string(), |i| format!("{}-", i));
            format!("{}{}{}", prefix, issue_part, name.unwrap())
        }
        config::IssueHandlingStrategy::CommitScope => {
            format!("{}{}", prefix, name.unwrap())
        }
    };

    git::is_working_directory_clean(opts)?;
    git::checkout_main(opts, main_branch_name)?;
    git::pull_latest_with_rebase(opts)?;
    git::create_branch(&branch_name, from_commit.as_deref(), opts)?;
    git::push_set_upstream(&branch_name, opts)?;
    println!(
        "\n{}",
        format!("Success! Switched to new branch: '{}'", branch_name).green()
    );
    Ok(())
}

pub fn handle_complete(r#type: String, name: String, config: &Config, opts: RunOpts) -> Result<()> {
    println!(
        "{}",
        "--- Completing short-lived branch ---".to_string().blue()
    );

    let main_branch_name = get_default_branch_name(config);

    if name == main_branch_name {
        return Err(GitError::CannotCompleteMainBranch.into());
    }

    let branch_name = git::find_branch(&name, &r#type, config, opts)?;
    println!("{}", format!("Branch to complete: {}", branch_name).blue());

    git::branch_exists_locally(&branch_name, opts)?;

    if r#type == "release" {
        let tag_name = format!("{}{}", config.automatic_tags.release_prefix, name);

        if git::tag_exists(&tag_name, opts)? {
            return Err(GitError::TagAlreadyExists(tag_name).into());
        }
    }

    git::is_working_directory_clean(opts)?;
    git::checkout_main(opts, main_branch_name)?;
    git::pull_latest_with_rebase(opts)?;
    git::merge_branch(&branch_name, opts)?;

    if r#type == "release" {
        let tag_name = format!("{}{}", config.automatic_tags.release_prefix, name);
        let merge_commit_hash = git::get_head_commit_hash(opts)?;
        git::create_tag(
            &tag_name,
            &format!("Release {}", name),
            &merge_commit_hash,
            opts,
        )?;
        println!(
            "{}",
            format!("Created tag '{}' on merge commit.", tag_name).green()
        );
    }

    git::push(opts)?;
    if r#type == "release" {
        git::push_tags(opts)?;
    }

    git::delete_local_branch(&branch_name, opts)?;
    git::delete_remote_branch(&branch_name, opts)?;

    // Cleanup the intent log after merging back to trunk
    let git_root = PathBuf::from(git::get_git_root(opts)?);
    if intent::load_intent_log(&git_root)?.is_some() {
        intent::cleanup_intent_log(&git_root)?;
        println!("{}", "Intent log cleared after branch completion.".dimmed());
    }

    println!(
        "\n{}",
        format!(
            "Success! Branch '{}' was merged into main and deleted.",
            branch_name
        )
        .green()
    );
    Ok(())
}