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
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
use crate::config;
use crate::error::CliError;
use crate::ops::git;
use crate::ops::replace::{Template, NOW};
use crate::steps::plan;
#[derive(Debug, Clone, clap::Args)]
pub struct CommitStep {
#[command(flatten)]
manifest: clap_cargo::Manifest,
#[arg(short, long = "config", value_name = "PATH")]
custom_config: Option<String>,
#[arg(long)]
isolated: bool,
#[arg(long, value_delimiter = ',')]
allow_branch: Option<Vec<String>>,
#[arg(short = 'x', long)]
execute: bool,
#[arg(short = 'n', long, conflicts_with = "execute", hide = true)]
dry_run: bool,
#[arg(long)]
no_confirm: bool,
#[command(flatten)]
commit: crate::config::CommitArgs,
}
impl CommitStep {
pub fn run(&self) -> Result<(), CliError> {
git::git_version()?;
if self.dry_run {
let _ =
crate::ops::shell::warn("`--dry-run` is superfluous, dry-run is done by default");
}
let ws_meta = self
.manifest
.metadata()
.features(cargo_metadata::CargoOpt::AllFeatures)
.exec()?;
let config = self.to_config();
let ws_config = crate::config::load_workspace_config(&config, &ws_meta)?;
let pkgs = plan::load(&config, &ws_meta)?;
let pkgs = plan::plan(pkgs)?;
let (selected_pkgs, _excluded_pkgs): (Vec<_>, Vec<_>) = pkgs
.into_iter()
.map(|(_, pkg)| pkg)
.partition(|p| p.config.release());
if crate::ops::git::is_dirty(ws_meta.workspace_root.as_std_path())?.is_none() {
let _ = crate::ops::shell::error("nothing to commit");
return Err(2.into());
}
let dry_run = !self.execute;
let mut failed = false;
failed |= !super::verify_git_branch(
ws_meta.workspace_root.as_std_path(),
&ws_config,
dry_run,
log::Level::Warn,
)?;
failed |= !super::verify_if_behind(
ws_meta.workspace_root.as_std_path(),
&ws_config,
dry_run,
log::Level::Warn,
)?;
super::confirm("Commit", &selected_pkgs, self.no_confirm, dry_run)?;
super::commit::workspace_commit(&ws_meta, &ws_config, &selected_pkgs, dry_run)?;
super::finish(failed, dry_run)
}
fn to_config(&self) -> crate::config::ConfigArgs {
crate::config::ConfigArgs {
custom_config: self.custom_config.clone(),
isolated: self.isolated,
allow_branch: self.allow_branch.clone(),
commit: self.commit.clone(),
..Default::default()
}
}
}
pub fn pkg_commit(pkg: &plan::PackageRelease, dry_run: bool) -> Result<(), CliError> {
let cwd = &pkg.package_root;
let crate_name = pkg.meta.name.as_str();
let version = pkg.planned_version.as_ref().unwrap_or(&pkg.initial_version);
let prev_version_var = pkg.initial_version.bare_version_string.as_str();
let prev_metadata_var = pkg.initial_version.full_version.build.as_str();
let version_var = version.bare_version_string.as_str();
let metadata_var = version.full_version.build.as_str();
let template = Template {
prev_version: Some(prev_version_var),
prev_metadata: Some(prev_metadata_var),
version: Some(version_var),
metadata: Some(metadata_var),
crate_name: Some(crate_name),
date: Some(NOW.as_str()),
..Default::default()
};
let commit_msg = template.render(pkg.config.pre_release_commit_message());
let sign = pkg.config.sign_commit();
if !git::commit_all(cwd, &commit_msg, sign, dry_run)? {
return Err(101.into());
}
Ok(())
}
pub fn workspace_commit(
ws_meta: &cargo_metadata::Metadata,
ws_config: &config::Config,
pkgs: &[plan::PackageRelease],
dry_run: bool,
) -> Result<(), CliError> {
let shared_version = super::find_shared_versions(pkgs)?;
let shared_commit_msg = {
let version_var = shared_version
.as_ref()
.map(|v| v.bare_version_string.as_str());
let metadata_var = shared_version
.as_ref()
.map(|v| v.full_version.build.as_str());
let template = Template {
version: version_var,
metadata: metadata_var,
date: Some(NOW.as_str()),
..Default::default()
};
template.render(ws_config.pre_release_commit_message())
};
if !git::commit_all(
ws_meta.workspace_root.as_std_path(),
&shared_commit_msg,
ws_config.sign_commit(),
dry_run,
)? {
return Err(101.into());
}
Ok(())
}