jj-vine 0.3.4

Stacked pull requests for jj (jujutsu). Supports GitLab and bookmark-based flow.
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

use owo_colors::OwoColorize;
use tracing::error;

use crate::{
    error::{Error, Result},
    forge::Forge,
    submit::execute::{
        ActionResultData,
        ExecuteAction,
        ExecutionActionContext,
        MRUpdate,
        MRUpdateType,
    },
};

pub struct UpdateMRBaseAction {
    pub bookmark: String,
    pub mr_iid: String,
    pub new_target_branch: String,
}

impl UpdateMRBaseAction {
    pub fn new(bookmark: String, mr_iid: String, new_target_branch: String) -> Self {
        Self {
            bookmark,
            mr_iid,
            new_target_branch,
        }
    }
}

impl ExecuteAction for UpdateMRBaseAction {
    async fn execute(&self, ctx: ExecutionActionContext<'_, '_>) -> Result<ActionResultData> {
        if ctx.plan.dry_run {
            let msg = format!(
                "Would {} MR {} base for {} to {}",
                "update".yellow(),
                format!("!{}", self.mr_iid).cyan(),
                self.bookmark.magenta(),
                self.new_target_branch.magenta()
            );
            ctx.output.log_message(&msg);
            Ok(ActionResultData::DryRun)
        } else {
            // Get old target before update
            let old_target = if let Ok(Some(existing_mr)) = ctx
                .forge
                .find_merge_request_by_source_branch(&self.bookmark)
                .await
            {
                existing_mr.target_branch().to_string()
            } else {
                "unknown".to_string()
            };

            match ctx
                .forge
                .update_merge_request_base((&self.mr_iid).into(), &self.new_target_branch)
                .await
            {
                Ok(mr) => {
                    ctx.output
                        .log_completed(&format!("Updated MR {}", format!("!{}", mr.iid()).cyan()));
                    Ok(ActionResultData::MRUpdated(Box::new(MRUpdate {
                        mr,
                        bookmark: self.bookmark.clone(),
                        update_type: MRUpdateType::Repointed {
                            old_target,
                            new_target: self.new_target_branch.clone(),
                        },
                    })))
                }
                Err(e) => {
                    let error_msg =
                        format!("Failed to update MR base for {}: {}", self.bookmark, e);
                    ctx.output.log_message(&error_msg);
                    error!("{}", error_msg);
                    Err(Error::new(error_msg))
                }
            }
        }
    }
}