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
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
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, should_use_separate_command_binary, TEST_GIT,
TEST_SEPARATE_COMMAND_BINARIES,
};
use crate::git::{GitRunInfo, GitVersion, NonZeroOid, Repo};
use crate::util::get_sh;
use color_eyre::Help;
use eyre::Context;
use itertools::Itertools;
use lazy_static::lazy_static;
use once_cell::sync::OnceCell;
use regex::{Captures, Regex};
use tempfile::TempDir;
use tracing::{instrument, warn};
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!("{DUMMY_DATE} -{time:0>2}").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()),
(
TEST_SEPARATE_COMMAND_BINARIES,
std::env::var_os(TEST_SEPARATE_COMMAND_BINARIES).unwrap_or_default(),
),
];
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)> {
if let Some(first_arg) = args.first() {
if first_arg.as_ref() == "branchless" {
eyre::bail!(
r#"Refusing to invoke `branchless` via `git.run(&["branchless", ...])`; instead, call `git.branchless(&[...])`"#
);
}
}
self.run_with_options(args, &Default::default())
}
#[instrument]
pub fn smartlog(&self) -> eyre::Result<String> {
let (stdout, _stderr) = self.branchless("smartlog", &[])?;
Ok(stdout)
}
#[instrument]
pub fn branchless(&self, subcommand: &str, args: &[&str]) -> eyre::Result<(String, String)> {
self.branchless_with_options(subcommand, args, &Default::default())
}
#[instrument]
pub fn branchless_with_options(
&self,
subcommand: &str,
args: &[&str],
options: &GitRunOptions,
) -> eyre::Result<(String, String)> {
let mut git_run_args = Vec::new();
if should_use_separate_command_binary(subcommand) {
git_run_args.push(format!("branchless-{subcommand}"));
} else {
git_run_args.push("branchless".to_string());
git_run_args.push(subcommand.to_string());
}
git_run_args.extend(args.iter().map(|arg| arg.to_string()));
let result = self.run_with_options(&git_run_args, options);
if !should_use_separate_command_binary(subcommand) {
result
} else {
result.suggestion(format!(
"\
If you have set the TEST_SEPARATE_COMMAND_BINARIES environment variable, then \
the git-branchless-{subcommand} binary is NOT automatically built or updated when \
running integration tests for other binaries (see \
https://github.com/rust-lang/cargo/issues/4316 for more details).
Make sure that git-branchless-{subcommand} has been built before running \
integration tests. You can build it with: cargo build -p
git-branchless-{subcommand}
If you have not set the TEST_SEPARATE_COMMAND_BINARIES environment variable, \
then you can only run tests in the main `git-branchless` and \
`git-branchless-lib` crates.\
",
))
}
}
#[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.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 remote = format!("file://{}", self.repo_path.to_str().unwrap());
let args = {
let mut args = vec![
"clone",
"-c",
"core.autocrlf=false",
&remote,
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_txt(&self, name: &str, contents: &str) -> eyre::Result<()> {
let name = format!("{name}.txt");
self.write_file(&name, contents)
}
pub fn write_file(&self, name: &str, contents: &str) -> eyre::Result<()> {
let path = self.repo_path.join(name);
if let Some(dir) = path.parent() {
std::fs::create_dir_all(self.repo_path.join(dir))?;
}
std::fs::write(&path, contents)?;
Ok(())
}
pub fn delete_file(&self, name: &str) -> eyre::Result<()> {
let file_path = self.repo_path.join(format!("{name}.txt"));
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!("{name}.txt"));
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_txt(name, contents)?;
self.run(&["add", "."])?;
self.run_with_options(
&["commit", "-m", &format!("create {name}.txt")],
&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!("{name} contents\n"))
}
#[instrument]
pub fn detach_head(&self) -> eyre::Result<()> {
self.run(&["checkout", "--detach"])?;
Ok(())
}
#[instrument]
pub fn get_repo(&self) -> eyre::Result<Repo> {
let repo = Repo::from_dir(&self.repo_path)?;
Ok(repo)
}
#[instrument]
pub fn get_version(&self) -> eyre::Result<GitVersion> {
let (version_str, _stderr) = self.run(&["version"])?;
let version = version_str.parse()?;
Ok(version)
}
#[instrument]
pub fn get_git_run_info(&self) -> GitRunInfo {
GitRunInfo {
path_to_git: self.path_to_git.clone(),
working_directory: self.repo_path.clone(),
env: self.get_base_env(0).into_iter().collect(),
}
}
#[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!("{name}.txt"));
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(())
}
#[instrument]
pub fn clear_event_log(&self) -> eyre::Result<()> {
let event_log_path = self.repo_path.join(".git/branchless/db.sqlite3");
std::fs::remove_file(event_log_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 })
}
}
static COLOR_EYRE_INSTALL: OnceCell<()> = OnceCell::new();
pub fn make_git() -> eyre::Result<GitWrapper> {
COLOR_EYRE_INSTALL.get_or_try_init(color_eyre::install)?;
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,
})
}
pub struct GitWorktreeWrapper {
pub temp_dir: TempDir,
pub worktree: Git,
}
pub fn make_git_worktree(git: &Git, worktree_name: &str) -> eyre::Result<GitWorktreeWrapper> {
let temp_dir = tempfile::tempdir()?;
let worktree_path = temp_dir.path().join(worktree_name);
git.run(&["worktree", "add", worktree_path.to_str().unwrap()])?;
let worktree = Git {
repo_path: worktree_path,
..git.clone()
};
Ok(GitWorktreeWrapper { temp_dir, worktree })
}
pub fn extract_hint_command(stdout: &str) -> Vec<String> {
let hint_command = stdout
.split_once("disable this hint by running: ")
.map(|(_first, second)| second)
.unwrap()
.split('\n')
.next()
.unwrap();
hint_command
.split(' ')
.skip(1) .filter(|s| s != &"--global")
.map(|s| s.to_owned())
.collect_vec()
}
pub fn remove_rebase_lines(output: String) -> String {
output
.lines()
.filter(|line| !line.contains("First, rewinding head") && !line.contains("Applying:"))
.filter(|line| {
!line.contains("Auto-merging")
})
.map(|line| format!("{line}\n"))
.collect()
}
pub fn trim_lines(output: String) -> String {
output
.lines()
.flat_map(|line| vec![line.trim_end(), "\n"].into_iter())
.collect()
}
pub mod pty {
use std::{
sync::{mpsc::channel, Arc, Mutex},
thread,
time::Duration,
};
use eyre::eyre;
use portable_pty::{native_pty_system, CommandBuilder, PtySize};
use super::Git;
pub enum PtyAction<'a> {
Write(&'a str),
WaitUntilContains(&'a str),
}
pub fn run_in_pty(
git: &Git,
branchless_subcommand: &str,
args: &[&str],
inputs: &[PtyAction],
) -> eyre::Result<()> {
let pty_system = native_pty_system();
let pty_size = PtySize::default();
let mut pty = pty_system
.openpty(pty_size)
.map_err(|e| eyre!("Could not open pty: {}", e))?;
let mut cmd = CommandBuilder::new(&git.path_to_git);
cmd.env_clear();
for (k, v) in git.get_base_env(0) {
cmd.env(k, v);
}
cmd.env("TERM", "xterm");
cmd.arg("branchless");
cmd.arg(branchless_subcommand);
cmd.args(args);
cmd.cwd(&git.repo_path);
let mut child = pty
.slave
.spawn_command(cmd)
.map_err(|e| eyre!("Could not spawn child: {}", e))?;
let reader = pty
.master
.try_clone_reader()
.map_err(|e| eyre!("Could not clone reader: {}", e))?;
let reader = Arc::new(Mutex::new(reader));
let parser = vt100::Parser::new(pty_size.rows, pty_size.cols, 0);
let parser = Arc::new(Mutex::new(parser));
for action in inputs {
match action {
PtyAction::WaitUntilContains(value) => {
let (finished_tx, finished_rx) = channel();
let wait_thread = {
let parser = Arc::clone(&parser);
let reader = Arc::clone(&reader);
let value = value.to_string();
thread::spawn(move || -> anyhow::Result<()> {
loop {
{
let parser = parser.lock().unwrap();
if parser.screen().contents().contains(&value) {
break;
}
}
let mut reader = reader.lock().unwrap();
const BUF_SIZE: usize = 4096;
let mut buffer = [0; BUF_SIZE];
let n = reader.read(&mut buffer)?;
assert!(n < BUF_SIZE, "filled up PTY buffer by reading {n} bytes",);
{
let mut parser = parser.lock().unwrap();
parser.process(&buffer[..n]);
}
}
finished_tx.send(()).unwrap();
Ok(())
})
};
if finished_rx.recv_timeout(Duration::from_secs(5)).is_err() {
panic!(
"\
Timed out waiting for virtual terminal to show string: {:?}
Screen contents:
-----
{}
-----
",
value,
parser.lock().unwrap().screen().contents(),
);
}
wait_thread.join().unwrap().unwrap();
}
PtyAction::Write(value) => {
write!(pty.master, "{value}")?;
pty.master.flush()?;
}
}
}
let read_remainder_of_pty_output_thread = thread::spawn({
let reader = Arc::clone(&reader);
move || {
let mut reader = reader.lock().unwrap();
let mut buffer = Vec::new();
reader.read_to_end(&mut buffer).expect("finish reading pty");
String::from_utf8(buffer).unwrap()
}
});
child.wait()?;
let _ = read_remainder_of_pty_output_thread;
Ok(())
}
}