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
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
use std::collections::{BTreeMap, HashMap};
use std::ffi::OsString;
use std::fs;
use std::io::Write;
use std::ops::Deref;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use crate::core::config::env_vars::{get_git_exec_path, get_path_to_git, TEST_GIT};
use crate::git::{GitVersion, NonZeroOid, Repo};
use crate::util::get_sh;
use eyre::Context;
use itertools::Itertools;
use lazy_static::lazy_static;
use regex::{Captures, Regex};
use tempfile::TempDir;
use tracing::instrument;
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,
pub git_exec_path: 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, Default)]
pub struct GitRunOptions {
pub time: isize,
pub expected_exit_code: i32,
pub input: Option<String>,
pub env: HashMap<String, String>,
}
impl Git {
pub fn new(path_to_git: PathBuf, repo_path: PathBuf, git_exec_path: PathBuf) -> Self {
Git {
repo_path,
path_to_git,
git_exec_path,
}
}
pub fn preprocess_output(&self, stdout: String) -> eyre::Result<String> {
let path_to_git = self
.path_to_git
.to_str()
.ok_or_else(|| eyre::eyre!("Could not convert path to Git to string"))?;
let output = stdout.replace(path_to_git, "<git-executable>");
let repo_path = std::fs::canonicalize(&self.repo_path)?;
let repo_path = repo_path
.to_str()
.ok_or_else(|| eyre::eyre!("Could not convert repo path to string"))?;
let output = output.replace(&repo_path, "<repo-path>");
lazy_static! {
static ref CLEAR_LINE_RE: Regex = Regex::new(r"(^|\n).*(\r|\x1B\[K)").unwrap();
}
let output = CLEAR_LINE_RE
.replace_all(&output, |captures: &Captures| {
captures[1].to_string()
})
.into_owned();
Ok(output)
}
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 bash = get_sh().expect("bash missing?");
let bash_path = bash.parent().unwrap();
std::env::join_paths(
vec![
branchless_path.as_os_str(),
self.git_exec_path.as_os_str(),
bash_path.as_os_str(),
]
.into_iter(),
)
.expect("joining paths")
}
pub fn get_base_env(&self, time: isize) -> Vec<(OsString, OsString)> {
let date: OsString = format!("{date} -{time:0>2}", date = DUMMY_DATE, time = time).into();
let git_editor = OsString::from(":");
let new_path = self.get_path_for_env();
let envs = vec![
("GIT_CONFIG_NOSYSTEM", OsString::from("1")),
("GIT_AUTHOR_DATE", date.clone()),
("GIT_COMMITTER_DATE", date),
("GIT_EDITOR", git_editor),
("GIT_EXEC_PATH", self.git_exec_path.as_os_str().into()),
("PATH", new_path),
(TEST_GIT, self.path_to_git.as_os_str().into()),
];
envs.into_iter()
.map(|(key, value)| (OsString::from(key), value))
.collect()
}
#[instrument]
fn run_with_options_inner(
&self,
args: &[&str],
options: &GitRunOptions,
) -> eyre::Result<(String, String)> {
let GitRunOptions {
time,
expected_exit_code,
input,
env,
} = options;
let env: BTreeMap<_, _> = self
.get_base_env(*time)
.into_iter()
.chain(
env.iter()
.map(|(k, v)| (OsString::from(k), OsString::from(v))),
)
.collect();
let mut command = Command::new(&self.path_to_git);
command
.current_dir(&self.repo_path)
.args(args)
.env_clear()
.envs(&env);
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().wrap_err_with(|| {
format!(
"Running git
Executable: {:?}
Args: {:?}
Stdin: {:?}
Env: <not shown>",
&self.path_to_git, &args, input
)
})?
} else {
command.output().wrap_err_with(|| {
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 {
eyre::bail!(
"Git command {:?} {:?} exited with unexpected code {} (expected {})
env:
{:#?}
stdout:
{}
stderr:
{}",
&self.path_to_git,
&args,
exit_code,
expected_exit_code,
&env,
&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_output(stdout)?;
let stderr = String::from_utf8(result.stderr)?;
let stderr = self.preprocess_output(stderr)?;
Ok((stdout, stderr))
}
pub fn run_with_options<S: AsRef<str> + std::fmt::Debug>(
&self,
args: &[S],
options: &GitRunOptions,
) -> eyre::Result<(String, String)> {
self.run_with_options_inner(
args.iter().map(|arg| arg.as_ref()).collect_vec().as_slice(),
options,
)
}
pub fn run<S: AsRef<str> + std::fmt::Debug>(
&self,
args: &[S],
) -> eyre::Result<(String, String)> {
self.run_with_options(args, &Default::default())
}
#[instrument]
pub fn init_repo_with_options(&self, options: &GitInitOptions) -> eyre::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.commitDescriptors.relativeTime",
"false",
])?;
self.run(&["config", "branchless.restack.preserveTimestamps", "true"])?;
self.run(&["config", "core.autocrlf", "false"])?;
if options.run_branchless_init {
self.run(&["branchless", "init"])?;
}
Ok(())
}
pub fn init_repo(&self) -> eyre::Result<()> {
self.init_repo_with_options(&Default::default())
}
pub fn clone_repo_into(&self, target: &Git, additional_args: &[&str]) -> eyre::Result<()> {
let args = {
let mut args = vec![
"clone",
"-c",
"core.autocrlf=false",
self.repo_path.to_str().unwrap(),
target.repo_path.to_str().unwrap(),
];
args.extend(additional_args.iter());
args
};
let (_stdout, _stderr) = self.run(args.as_slice())?;
Ok(())
}
pub fn write_file(&self, name: &str, contents: &str) -> eyre::Result<()> {
let path = PathBuf::from(name);
if let Some(dir) = path.parent() {
std::fs::create_dir_all(self.repo_path.join(dir))?;
}
let file_path = self.repo_path.join(format!("{}.txt", name));
std::fs::write(&file_path, contents)?;
Ok(())
}
pub fn delete_file(&self, name: &str) -> eyre::Result<()> {
let file_path = self.repo_path.join(format!("{}.txt", name));
fs::remove_file(file_path)?;
Ok(())
}
pub fn set_file_permissions(
&self,
name: &str,
permissions: fs::Permissions,
) -> eyre::Result<()> {
let file_path = self.repo_path.join(format!("{}.txt", name));
fs::set_permissions(file_path, permissions)?;
Ok(())
}
#[instrument]
pub fn commit_file_with_contents(
&self,
name: &str,
time: isize,
contents: &str,
) -> eyre::Result<NonZeroOid> {
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
.get_head_info()?
.oid
.expect("Could not find OID for just-created commit");
Ok(oid)
}
pub fn commit_file(&self, name: &str, time: isize) -> eyre::Result<NonZeroOid> {
self.commit_file_with_contents(name, time, &format!("{} contents\n", name))
}
#[instrument]
pub fn detach_head(&self) -> eyre::Result<()> {
self.run(&["checkout", "--detach"])?;
Ok(())
}
#[instrument]
pub fn get_repo(&self) -> eyre::Result<Repo> {
Repo::from_dir(&self.repo_path)
}
#[instrument]
pub fn get_version(&self) -> eyre::Result<GitVersion> {
let (version_str, _stderr) = self.run(&["version"])?;
version_str.parse()
}
#[instrument]
pub fn supports_reference_transactions(&self) -> eyre::Result<bool> {
let version = self.get_version()?;
Ok(version >= GitVersion(2, 29, 0))
}
pub fn supports_committer_date_is_author_date(&self) -> eyre::Result<bool> {
let version = self.get_version()?;
Ok(version >= GitVersion(2, 29, 0))
}
pub fn supports_log_exclude_decoration(&self) -> eyre::Result<bool> {
let version = self.get_version()?;
Ok(version >= GitVersion(2, 27, 0))
}
#[instrument]
pub fn resolve_file(&self, name: &str, contents: &str) -> eyre::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 => eyre::bail!("Could not convert file path to string: {:?}", file_path),
Some(file_path) => file_path,
};
self.run(&["add", file_path])?;
Ok(())
}
}
pub struct GitWrapper {
repo_dir: TempDir,
git: Git,
}
impl Deref for GitWrapper {
type Target = Git;
fn deref(&self) -> &Self::Target {
&self.git
}
}
fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> std::io::Result<()> {
fs::create_dir_all(&dst)?;
for entry in fs::read_dir(src)? {
let entry = entry?;
let ty = entry.file_type()?;
if ty.is_dir() {
copy_dir_all(entry.path(), dst.as_ref().join(entry.file_name()))?;
} else {
fs::copy(entry.path(), dst.as_ref().join(entry.file_name()))?;
}
}
Ok(())
}
impl GitWrapper {
pub fn duplicate_repo(&self) -> eyre::Result<Self> {
let repo_dir = tempfile::tempdir()?;
copy_dir_all(&self.repo_dir, &repo_dir)?;
let git = Git {
repo_path: repo_dir.path().to_path_buf(),
..self.git.clone()
};
Ok(Self { repo_dir, git })
}
}
pub fn make_git() -> eyre::Result<GitWrapper> {
let repo_dir = tempfile::tempdir()?;
let path_to_git = get_path_to_git()?;
let git_exec_path = get_git_exec_path()?;
let git = Git::new(path_to_git, repo_dir.path().to_path_buf(), git_exec_path);
Ok(GitWrapper { repo_dir, git })
}
pub struct GitWrapperWithRemoteRepo {
pub temp_dir: TempDir,
pub original_repo: Git,
pub cloned_repo: Git,
}
pub fn make_git_with_remote_repo() -> eyre::Result<GitWrapperWithRemoteRepo> {
let path_to_git = get_path_to_git()?;
let git_exec_path = get_git_exec_path()?;
let temp_dir = tempfile::tempdir()?;
let original_repo_path = temp_dir.path().join("original");
std::fs::create_dir_all(&original_repo_path)?;
let original_repo = Git::new(
path_to_git.clone(),
original_repo_path,
git_exec_path.clone(),
);
let cloned_repo_path = temp_dir.path().join("cloned");
let cloned_repo = Git::new(path_to_git, cloned_repo_path, git_exec_path);
Ok(GitWrapperWithRemoteRepo {
temp_dir,
original_repo,
cloned_repo,
})
}