| 1 | package gitrepo |
| 2 | |
| 3 | import ( |
| 4 | "context" |
| 5 | "os" |
| 6 | "os/exec" |
| 7 | "path/filepath" |
| 8 | "strings" |
| 9 | "testing" |
| 10 | ) |
| 11 | |
| 12 | func TestParsePatchKinds(t *testing.T) { |
| 13 | raw := "" + |
| 14 | "diff --git a/keep.go b/keep.go\n" + |
| 15 | "index 111..222 100644\n" + |
| 16 | "--- a/keep.go\n" + |
| 17 | "+++ b/keep.go\n" + |
| 18 | "@@ -1,2 +1,3 @@\n" + |
| 19 | " package p\n" + |
| 20 | "-func old() {}\n" + |
| 21 | "+func extra() {}\n" + |
| 22 | " \n" + |
| 23 | "diff --git a/gone.txt b/gone.txt\n" + |
| 24 | "deleted file mode 100644\n" + |
| 25 | "--- a/gone.txt\n" + |
| 26 | "+++ /dev/null\n" + |
| 27 | "@@ -1 +0,0 @@\n" + |
| 28 | "-weg\n" + |
| 29 | "diff --git \"a/oude naam.txt\" \"b/nieuwe naam.txt\"\n" + |
| 30 | "similarity index 90%\n" + |
| 31 | "rename from oude naam.txt\n" + |
| 32 | "rename to nieuwe naam.txt\n" + |
| 33 | "--- \"a/oude naam.txt\"\n" + |
| 34 | "+++ \"b/nieuwe naam.txt\"\n" + |
| 35 | "@@ -1 +1 @@\n" + |
| 36 | "-oud\n" + |
| 37 | "+nieuw\n" + |
| 38 | "diff --git a/plaatje.bin b/plaatje.bin\n" + |
| 39 | "new file mode 100644\n" + |
| 40 | "index 0000000..abc\n" + |
| 41 | "Binary files /dev/null and b/plaatje.bin differ\n" |
| 42 | files := ParsePatch(raw) |
| 43 | if len(files) != 4 { |
| 44 | t.Fatalf("bestanden: %+v", files) |
| 45 | } |
| 46 | if files[0].Status != "modified" || files[0].Added != 1 || files[0].Deleted != 1 || files[0].Path != "keep.go" { |
| 47 | t.Fatalf("wijziging: %+v", files[0]) |
| 48 | } |
| 49 | if files[0].Lines[2].Kind != "del" || files[0].Lines[2].Old != 2 || files[0].Lines[3].Kind != "add" || files[0].Lines[3].New != 2 { |
| 50 | t.Fatalf("regelnummers: %+v", files[0].Lines) |
| 51 | } |
| 52 | if files[1].Status != "deleted" || files[1].Path != "gone.txt" || files[1].Deleted != 1 { |
| 53 | t.Fatalf("verwijderd: %+v", files[1]) |
| 54 | } |
| 55 | if files[2].Status != "renamed" || files[2].OldPath != "oude naam.txt" || files[2].Path != "nieuwe naam.txt" { |
| 56 | t.Fatalf("hernoemd: %+v", files[2]) |
| 57 | } |
| 58 | if !files[3].Binary || files[3].Status != "added" || len(files[3].Lines) != 0 || files[3].Path != "plaatje.bin" { |
| 59 | t.Fatalf("binair: %+v", files[3]) |
| 60 | } |
| 61 | } |
| 62 | |
| 63 | func TestCommitPatchHistory(t *testing.T) { |
| 64 | if _, err := exec.LookPath("git"); err != nil { |
| 65 | t.Skip("git ontbreekt") |
| 66 | } |
| 67 | dir := t.TempDir() |
| 68 | git := func(args ...string) { |
| 69 | t.Helper() |
| 70 | cmd := exec.Command("git", append([]string{"-C", dir}, args...)...) |
| 71 | cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com") |
| 72 | if out, err := cmd.CombinedOutput(); err != nil { |
| 73 | t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out) |
| 74 | } |
| 75 | } |
| 76 | git("init", "-b", "master") |
| 77 | git("config", "commit.gpgsign", "false") |
| 78 | write := func(name, body string) { |
| 79 | t.Helper() |
| 80 | path := filepath.Join(dir, filepath.FromSlash(name)) |
| 81 | if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { |
| 82 | t.Fatal(err) |
| 83 | } |
| 84 | if err := os.WriteFile(path, []byte(body), 0o644); err != nil { |
| 85 | t.Fatal(err) |
| 86 | } |
| 87 | } |
| 88 | write("a.txt", "alpha\n") |
| 89 | write("b.txt", "beta\n") |
| 90 | write("keep.go", "package p\n\nfunc keep() {}\n") |
| 91 | git("add", ".") |
| 92 | git("commit", "-m", "begin") |
| 93 | root := rev(t, dir) |
| 94 | |
| 95 | ctx := context.Background() |
| 96 | parents, files, err := CommitPatch(ctx, "git", dir, root) |
| 97 | if err != nil { |
| 98 | t.Fatal(err) |
| 99 | } |
| 100 | if len(parents) != 0 || len(files) != 3 { |
| 101 | t.Fatalf("root parents=%v files=%d", parents, len(files)) |
| 102 | } |
| 103 | for _, f := range files { |
| 104 | if f.Status != "added" { |
| 105 | t.Fatalf("rootbestand: %+v", f) |
| 106 | } |
| 107 | } |
| 108 | |
| 109 | write("keep.go", "package p\n\nfunc keep() {}\nfunc extra() {}\n") |
| 110 | if err := os.Remove(filepath.Join(dir, "b.txt")); err != nil { |
| 111 | t.Fatal(err) |
| 112 | } |
| 113 | write("c.txt", strings.Repeat("x", 180)+"\n") |
| 114 | write("note file.txt", "spatie\n") |
| 115 | var huge strings.Builder |
| 116 | for i := 0; i < 220; i++ { |
| 117 | huge.WriteString("regel\n") |
| 118 | } |
| 119 | write("huge.txt", huge.String()) |
| 120 | write("bin.dat", "a\x00b\n") |
| 121 | git("add", "-A") |
| 122 | git("mv", "a.txt", "a2.txt") |
| 123 | git("commit", "-m", "wijzig bestanden", "-m", "tweede alinea") |
| 124 | mixed := rev(t, dir) |
| 125 | |
| 126 | parents, files, err = CommitPatch(ctx, "git", dir, mixed) |
| 127 | if err != nil { |
| 128 | t.Fatal(err) |
| 129 | } |
| 130 | if len(parents) != 1 || parents[0] != root { |
| 131 | t.Fatalf("parents: %v", parents) |
| 132 | } |
| 133 | byPath := map[string]PatchFile{} |
| 134 | for _, f := range files { |
| 135 | byPath[f.Path] = f |
| 136 | } |
| 137 | if byPath["a2.txt"].Status != "renamed" || byPath["a2.txt"].OldPath != "a.txt" { |
| 138 | t.Fatalf("rename: %+v", byPath["a2.txt"]) |
| 139 | } |
| 140 | if byPath["b.txt"].Status != "deleted" || byPath["b.txt"].Deleted != 1 { |
| 141 | t.Fatalf("delete: %+v", byPath["b.txt"]) |
| 142 | } |
| 143 | if byPath["c.txt"].Status != "added" || byPath["c.txt"].Added != 1 { |
| 144 | t.Fatalf("add: %+v", byPath["c.txt"]) |
| 145 | } |
| 146 | if byPath["note file.txt"].Status != "added" { |
| 147 | t.Fatalf("spatie: %+v", byPath["note file.txt"]) |
| 148 | } |
| 149 | if !byPath["bin.dat"].Binary || len(byPath["bin.dat"].Lines) != 0 { |
| 150 | t.Fatalf("binair: %+v", byPath["bin.dat"]) |
| 151 | } |
| 152 | if byPath["huge.txt"].Added != 220 { |
| 153 | t.Fatalf("groot: %+v", byPath["huge.txt"]) |
| 154 | } |
| 155 | if byPath["keep.go"].Status != "modified" || byPath["keep.go"].Added < 1 { |
| 156 | t.Fatalf("go: %+v", byPath["keep.go"]) |
| 157 | } |
| 158 | |
| 159 | git("checkout", "-b", "side") |
| 160 | write("side.txt", "zijtak\n") |
| 161 | git("add", "side.txt") |
| 162 | git("commit", "-m", "zijtak") |
| 163 | git("checkout", "master") |
| 164 | git("merge", "--no-ff", "side", "-m", "voeg zijtak samen") |
| 165 | merge := rev(t, dir) |
| 166 | parents, files, err = CommitPatch(ctx, "git", dir, merge) |
| 167 | if err != nil { |
| 168 | t.Fatal(err) |
| 169 | } |
| 170 | if len(parents) != 2 || parents[0] != mixed { |
| 171 | t.Fatalf("merge-parents: %v mixed=%s", parents, mixed) |
| 172 | } |
| 173 | if len(files) != 1 || files[0].Path != "side.txt" || files[0].Status != "added" { |
| 174 | t.Fatalf("merge-diff: %+v", files) |
| 175 | } |
| 176 | } |
| 177 | |
| 178 | func rev(t *testing.T, dir string) string { |
| 179 | t.Helper() |
| 180 | cmd := exec.Command("git", "-C", dir, "rev-parse", "HEAD") |
| 181 | out, err := cmd.Output() |
| 182 | if err != nil { |
| 183 | t.Fatal(err) |
| 184 | } |
| 185 | return strings.TrimSpace(string(out)) |
| 186 | } |