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
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
use std::ffi::{OsStr, OsString};
use std::io::Write;
use std::ops::Deref;
use std::path::PathBuf;
use std::process::{Command, Stdio};
use crate::util::{get_sh, wrap_git_error, GitRunInfo, GitVersion};
use anyhow::Context;
use fn_error_context::context;
use tempfile::TempDir;
const DUMMY_NAME: &str = "Testy McTestface";
const DUMMY_EMAIL: &str = "test@example.com";
const DUMMY_DATE: &str = "Wed 29 Oct 12:34:56 2020 PDT";
#[derive(Clone, Debug)]
pub struct Git {
pub repo_path: PathBuf,
pub path_to_git: PathBuf,
}
#[derive(Debug)]
pub struct GitInitOptions {
pub make_initial_commit: bool,
pub run_branchless_init: bool,
}
impl Default for GitInitOptions {
fn default() -> Self {
GitInitOptions {
make_initial_commit: true,
run_branchless_init: true,
}
}
}
#[derive(Debug)]
pub struct GitRunOptions {
pub time: isize,
pub expected_exit_code: i32,
pub input: Option<String>,
}
impl Default for GitRunOptions {
fn default() -> Self {
GitRunOptions {
time: 0,
expected_exit_code: 0,
input: None,
}
}
}
impl Git {
pub fn new(repo_path: PathBuf, git_run_info: GitRunInfo) -> Self {
let GitRunInfo {
path_to_git,
working_directory: _,
env: _,
} = git_run_info;
Git {
repo_path,
path_to_git,
}
}
pub fn preprocess_stdout(&self, stdout: String) -> anyhow::Result<String> {
let path_to_git = self
.path_to_git
.to_str()
.ok_or_else(|| anyhow::anyhow!("Could not convert path to Git to string"))?;
let stdout = stdout.replace(path_to_git, "<git-executable>");
Ok(stdout)
}
pub fn get_path_for_env(&self) -> OsString {
let cargo_bin_path = assert_cmd::cargo::cargo_bin("git-branchless");
let branchless_path = cargo_bin_path
.parent()
.expect("Unable to find git-branchless path parent");
let git_path = self
.path_to_git
.parent()
.expect("Unable to find git path parent");
let bash = get_sh().expect("bash missing?");
let bash_path = bash.parent().unwrap();
std::env::join_paths(
vec![
branchless_path,
git_path,
bash_path,
]
.iter()
.map(|path| path.to_str().expect("Unable to decode path component")),
)
.expect("joining paths")
}
#[context("Running Git command with args: {:?} and options: {:?}", args, options)]
pub fn run_with_options<S: AsRef<str> + std::fmt::Debug>(
&self,
args: &[S],
options: &GitRunOptions,
) -> anyhow::Result<(String, String)> {
let GitRunOptions {
time,
expected_exit_code,
input,
} = options;
let date: OsString = format!("{date} -{time:0>2}", date = DUMMY_DATE, time = time).into();
let args: Vec<&str> = {
let repo_path = self.repo_path.to_str().expect("Could not decode repo path");
let mut new_args: Vec<&str> = vec!["-C", repo_path];
new_args.extend(args.iter().map(|arg| arg.as_ref()));
new_args
};
let git_editor = OsString::from(":");
let new_path = self.get_path_for_env();
let env: Vec<(&str, &OsStr)> = vec![
("GIT_AUTHOR_DATE", &date),
("GIT_COMMITTER_DATE", &date),
("GIT_EDITOR", &git_editor),
("PATH_TO_GIT", &self.path_to_git.as_os_str()),
("PATH", &new_path),
];
let mut command = Command::new(&self.path_to_git);
command.args(&args).env_clear().envs(env.iter().copied());
let result = if let Some(input) = input {
let mut child = command
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()?;
write!(child.stdin.take().unwrap(), "{}", &input)?;
child.wait_with_output().with_context(|| {
format!(
"Running git
Executable: {:?}
Args: {:?}
Stdin: {:?}
Env: <not shown>",
&self.path_to_git, &args, input
)
})?
} else {
command.output().with_context(|| {
format!(
"Running git
Executable: {:?}
Args: {:?}
Env: <not shown>",
&self.path_to_git, &args
)
})?
};
let exit_code = result
.status
.code()
.expect("Failed to read exit code from Git process");
let result = if exit_code != *expected_exit_code {
anyhow::bail!(
"Git command {:?} {:?} exited with unexpected code {} (expected {})
stdout:
{}
stderr:
{}",
&self.path_to_git,
&args,
exit_code,
expected_exit_code,
&String::from_utf8_lossy(&result.stdout),
&String::from_utf8_lossy(&result.stderr),
)
} else {
result
};
let stdout = String::from_utf8(result.stdout)?;
let stdout = self.preprocess_stdout(stdout)?;
let stderr = String::from_utf8(result.stderr)?;
Ok((stdout, stderr))
}
pub fn run<S: AsRef<str> + std::fmt::Debug>(
&self,
args: &[S],
) -> anyhow::Result<(String, String)> {
self.run_with_options(args, &Default::default())
}
#[context("Initializing Git repo with options: {:?}", options)]
pub fn init_repo_with_options(&self, options: &GitInitOptions) -> anyhow::Result<()> {
self.run(&["init"])?;
self.run(&["config", "user.name", DUMMY_NAME])?;
self.run(&["config", "user.email", DUMMY_EMAIL])?;
if options.make_initial_commit {
self.commit_file("initial", 0)?;
}
self.run(&["config", "branchless.commitMetadata.relativeTime", "false"])?;
if options.run_branchless_init {
self.run(&["branchless", "init"])?;
}
Ok(())
}
pub fn init_repo(&self) -> anyhow::Result<()> {
self.init_repo_with_options(&Default::default())
}
pub fn write_file(&self, name: &str, contents: &str) -> anyhow::Result<()> {
let file_path = self.repo_path.join(format!("{}.txt", name));
std::fs::write(&file_path, contents)?;
Ok(())
}
#[context(
"Committing file {:?} at time {:?} with contents: {:?}",
name,
time,
contents
)]
pub fn commit_file_with_contents(
&self,
name: &str,
time: isize,
contents: &str,
) -> anyhow::Result<git2::Oid> {
self.write_file(name, contents)?;
self.run(&["add", "."])?;
self.run_with_options(
&["commit", "-m", &format!("create {}.txt", name)],
&GitRunOptions {
time,
..Default::default()
},
)?;
let repo = self.get_repo()?;
let oid = repo.head()?.peel_to_commit()?.id();
Ok(oid)
}
pub fn commit_file(&self, name: &str, time: isize) -> anyhow::Result<git2::Oid> {
self.commit_file_with_contents(name, time, &format!("{} contents\n", name))
}
#[context("Detaching HEAD")]
pub fn detach_head(&self) -> anyhow::Result<()> {
self.run(&["checkout", "--detach"])?;
Ok(())
}
#[context("Getting the `git2::Repository` object for {:?}", self)]
pub fn get_repo(&self) -> anyhow::Result<git2::Repository> {
git2::Repository::open(&self.repo_path).map_err(wrap_git_error)
}
#[context("Getting the Git version for {:?}", self)]
pub fn get_version(&self) -> anyhow::Result<GitVersion> {
let (version_str, _stderr) = self.run(&["version"])?;
version_str.parse()
}
#[context("Detecting reference-transaction support for {:?}", self)]
pub fn supports_reference_transactions(&self) -> anyhow::Result<bool> {
let version = self.get_version()?;
Ok(version >= GitVersion(2, 29, 0))
}
#[context("Resolving file {:?} with contents: {:?}", name, contents)]
pub fn resolve_file(&self, name: &str, contents: &str) -> anyhow::Result<()> {
let file_path = self.repo_path.join(format!("{}.txt", name));
std::fs::write(&file_path, contents)?;
let file_path = match file_path.to_str() {
None => anyhow::bail!("Could not convert file path to string: {:?}", file_path),
Some(file_path) => file_path,
};
self.run(&["add", file_path])?;
Ok(())
}
}
#[context("Getting the Git executable to use")]
pub fn get_path_to_git() -> anyhow::Result<PathBuf> {
let path_to_git = std::env::var_os("PATH_TO_GIT").with_context(|| {
"No path to git set. Try running as: PATH_TO_GIT=$(which git) cargo test ..."
})?;
let path_to_git = PathBuf::from(&path_to_git);
Ok(path_to_git)
}
pub struct GitWrapper {
_repo_dir: TempDir,
git: Git,
}
impl Deref for GitWrapper {
type Target = Git;
fn deref(&self) -> &Self::Target {
&self.git
}
}
pub fn make_git() -> anyhow::Result<GitWrapper> {
let repo_dir = tempfile::tempdir()?;
let path_to_git = get_path_to_git()?;
let path_to_git = GitRunInfo {
path_to_git,
working_directory: repo_dir.path().to_path_buf(),
env: std::env::vars_os().collect(),
};
let git = Git::new(repo_dir.path().to_path_buf(), path_to_git);
Ok(GitWrapper {
_repo_dir: repo_dir,
git,
})
}