hunkpick 0.8.0

Non-interactive git add -p alternative — pick and split unified-diff hunks by index, range, or content id
Documentation 
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

//! Test-only helpers for the throwaway git repositories the unit tests apply diffs in.
//!
//! Several modules check their output by feeding it to `git apply --check` against a seeded
//! working tree. Keeping the repository setup here means the tests state what they assert, not
//! how a temporary repository is built, and the isolation from the developer's own git
//! configuration is applied in one place.

use std::io::Write;
use std::path::Path;
use std::process::{Command, Stdio};

/// A `git` invocation in `dir`, insulated from the ambient git configuration.
///
/// The global and system configuration files are pointed at paths that do not exist (git reads
/// a missing file as empty), and the repository-locating variables are dropped, so a developer's
/// own settings cannot change what a test sees.
fn git(dir: &Path) -> Command {
    let mut cmd = Command::new("git");
    cmd.current_dir(dir);
    cmd.env("GIT_CONFIG_GLOBAL", dir.join("absent-global-gitconfig"));
    cmd.env("GIT_CONFIG_SYSTEM", dir.join("absent-system-gitconfig"));
    crate::gitenv::insulate_repo_location(&mut cmd);
    cmd
}

/// A fresh git repository whose working tree holds a single file `f` with `content`.
pub(crate) fn repo_with_file(content: &str) -> tempfile::TempDir {
    let dir = tempfile::tempdir().unwrap();
    std::fs::write(dir.path().join("f"), content).unwrap();
    let status = git(dir.path()).arg("init").arg("-q").status().unwrap();
    assert!(status.success(), "git init failed in {:?}", dir.path());
    dir
}

/// True if `diff_bytes` applies to the working tree in `dir` (`git apply --check`).
///
/// Feeds stdin from a separate thread, as [`crate::validate::validate_with_git`] does: writing
/// the whole diff before waiting deadlocks once git fills its stderr pipe, and a rejected diff
/// is precisely what this helper is asked about.
pub(crate) fn apply_check(diff_bytes: &[u8], dir: &Path) -> bool {
    let mut child = git(dir)
        .arg("apply")
        .arg("--check")
        .stdin(Stdio::piped())
        .stdout(Stdio::null())
        .stderr(Stdio::piped())
        .spawn()
        .unwrap();
    let mut stdin = child.stdin.take().expect("stdin was configured as piped");
    std::thread::scope(|scope| {
        scope.spawn(move || stdin.write_all(diff_bytes));
        child.wait_with_output().unwrap()
    })
    .status
    .success()
}

/// True if `diff_bytes` applies to a file `f` seeded with `content` in a fresh repository.
pub(crate) fn applies_to_file(diff_bytes: &[u8], content: &str) -> bool {
    let dir = repo_with_file(content);
    apply_check(diff_bytes, dir.path())
}