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
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
use std::ffi::OsString;
use std::fmt::Write;
use std::path::PathBuf;
use console::style;
use eyre::Context;
use tracing::{instrument, warn};
use crate::git::{ConfigRead, GitRunInfo, GitRunOpts, Repo};
use super::effects::Effects;
#[instrument]
pub fn get_core_hooks_path(repo: &Repo) -> eyre::Result<PathBuf> {
repo.get_readonly_config()?
.get_or_else("core.hooksPath", || repo.get_path().join("hooks"))
}
#[instrument]
pub fn get_main_branch_name(repo: &Repo) -> eyre::Result<String> {
let config = repo.get_readonly_config()?;
if let Some(branch_name) = config.get("branchless.core.mainBranch")? {
return Ok(branch_name);
}
if let Some(branch_name) = config.get("branchless.mainBranch")? {
return Ok(branch_name);
}
if let Some(branch_name) = get_default_branch_name(repo)? {
return Ok(branch_name);
}
Ok("master".to_string())
}
#[instrument]
pub fn get_comment_char(repo: &Repo) -> eyre::Result<char> {
let from_config: Option<String> = repo.get_readonly_config()?.get("core.commentChar")?;
let comment_char = match from_config {
Some(comment_char) => comment_char.chars().next().unwrap(),
None => char::from(git2::DEFAULT_COMMENT_CHAR.unwrap()),
};
Ok(comment_char)
}
#[instrument]
pub fn get_commit_template(repo: &Repo) -> eyre::Result<Option<String>> {
let commit_template_path: Option<String> =
repo.get_readonly_config()?.get("commit.template")?;
let commit_template_path = match commit_template_path {
Some(commit_template_path) => PathBuf::from(commit_template_path),
None => return Ok(None),
};
let commit_template_path = if commit_template_path.is_relative() {
match repo.get_working_copy_path() {
Some(root) => root.join(commit_template_path),
None => {
warn!(?commit_template_path, "Commit template path was relative, but this repository does not have a working copy");
return Ok(None);
}
}
} else {
commit_template_path
};
match std::fs::read_to_string(&commit_template_path) {
Ok(contents) => Ok(Some(contents)),
Err(e) => {
warn!(?e, ?commit_template_path, "Could not read commit template");
Ok(None)
}
}
}
#[instrument]
pub fn get_default_branch_name(repo: &Repo) -> eyre::Result<Option<String>> {
let config = repo.get_readonly_config()?;
let default_branch_name: Option<String> = config.get("init.defaultBranch")?;
Ok(default_branch_name)
}
#[instrument]
pub fn get_editor(git_run_info: &GitRunInfo, repo: &Repo) -> eyre::Result<Option<OsString>> {
if let Ok(result) =
git_run_info.run_silent(repo, None, &["var", "GIT_EDITOR"], GitRunOpts::default())
{
if result.exit_code == 0 {
let editor =
std::str::from_utf8(&result.stdout).context("Decoding git var output as UTF-8")?;
let editor = editor.trim_end();
let editor = OsString::from(editor);
return Ok(Some(editor));
} else {
warn!(?result, "`git var` invocation failed");
}
}
let editor = std::env::var_os("GIT_EDITOR");
if editor != None {
return Ok(editor);
}
let config = repo.get_readonly_config()?;
let editor: Option<String> = config.get("core.editor")?;
match editor {
Some(editor) => Ok(Some(editor.into())),
None => Ok(None),
}
}
#[instrument]
pub fn get_undo_create_snapshots(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.undo.createSnapshots", true)
}
#[instrument]
pub fn get_restack_preserve_timestamps(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.restack.preserveTimestamps", false)
}
#[instrument]
pub fn get_next_interactive(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.next.interactive", false)
}
#[instrument]
pub fn get_commit_descriptors_branches(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.commitDescriptors.branches", true)
}
#[instrument]
pub fn get_commit_descriptors_differential_revision(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.commitDescriptors.differentialRevision", true)
}
#[instrument]
pub fn get_commit_descriptors_relative_time(repo: &Repo) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or("branchless.commitDescriptors.relativeTime", true)
}
pub const RESTACK_WARN_ABANDONED_CONFIG_KEY: &str = "branchless.restack.warnAbandoned";
#[derive(Clone, Debug)]
pub enum Hint {
RestackWarnAbandoned,
SmartlogFixAbandoned,
MoveImplicitHeadArgument,
}
impl Hint {
fn get_config_key(&self) -> &'static str {
match self {
Hint::RestackWarnAbandoned => "branchless.hint.restackWarnAbandoned",
Hint::SmartlogFixAbandoned => "branchless.hint.smartlogFixAbandoned",
Hint::MoveImplicitHeadArgument => "branchless.hint.moveImplicitHeadArgument",
}
}
}
pub fn get_hint_enabled(repo: &Repo, hint: Hint) -> eyre::Result<bool> {
repo.get_readonly_config()?
.get_or(hint.get_config_key(), true)
}
pub fn print_hint_suppression_notice(effects: &Effects, hint: Hint) -> eyre::Result<()> {
writeln!(
effects.get_output_stream(),
"{}: disable this hint by running: git config --global {} false",
style("hint").blue().bold(),
hint.get_config_key(),
)?;
Ok(())
}
pub mod env_vars {
use std::path::PathBuf;
use tracing::instrument;
pub const TEST_GIT: &str = "TEST_GIT";
pub const TEST_GIT_EXEC_PATH: &str = "TEST_GIT_EXEC_PATH";
#[instrument]
pub fn get_path_to_git() -> eyre::Result<PathBuf> {
let path_to_git = std::env::var_os(TEST_GIT).ok_or_else(|| {
eyre::eyre!(
"No path to Git executable was set. \
Try running as: `{0}=$(which git) cargo test ...` \
or set `env.{0}` in your `config.toml` \
(see https://doc.rust-lang.org/cargo/reference/config.html)",
TEST_GIT,
)
})?;
let path_to_git = PathBuf::from(&path_to_git);
Ok(path_to_git)
}
#[instrument]
pub fn get_git_exec_path() -> eyre::Result<PathBuf> {
let git_exec_path = std::env::var_os(TEST_GIT_EXEC_PATH).ok_or_else(|| {
eyre::eyre!(
"No Git exec path was set. \
Try running as: `{0}=$(git --exec-path) cargo test ...` \
or set `env.{0}` in your `config.toml` \
(see https://doc.rust-lang.org/cargo/reference/config.html)",
TEST_GIT_EXEC_PATH,
)
})?;
let git_exec_path = PathBuf::from(&git_exec_path);
Ok(git_exec_path)
}
}