From 5cbc3972644a321442b9640cfcc50f7ef014a6c9 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 22 Aug 2020 20:42:55 +0200
Subject: Execute `git diff` to output diffs

I want to enable colour diff output. At first, I thought about doing
this by getting the diff colours from the Git config, then outputting
the ANSI escape codes manually with the text.

However, I then thought it would be nice to enable other diff features
like `--word-diff`, and it would be too much trouble to re-implement
that manually, and then I'd have to take word diff colouring into
account.

Decided that the optimal way to get both colours and extra diff
features like word diffing would be to use `git diff` directly under the
hood.

We shell out to `git diff`, and give it the original file as a base, and
a new blob object that we create in the repository on the right side.
This allows us to compare the file using a command in the following
format:

    $ git diff <BASE>:src/server.rs <TEMPORARY_HASH>

Ostensibly, the temporary blob object I create for the right side
version should be freed automatically by `git2`.

Add a new `sugdiff` command to output diffs. This will replace
`sugpatch`. Since we're working with diffs, I think a name with "diff"
sounds more logical. The previous version, "patch" sounds too much like
what "apply" does, because of the Unix `patch` command.
---
 src/bin/git-sugdiff.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/bin/git-sugdiff.rs

(limited to 'src')

diff --git a/src/bin/git-sugdiff.rs b/src/bin/git-sugdiff.rs
new file mode 100644
index 0000000..c8ecf40
--- /dev/null
+++ b/src/bin/git-sugdiff.rs
@@ -0,0 +1,48 @@
+// Copyright (c) 2020  Teddy Wing
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+
+use std::env;
+use std::process;
+
+use exitcode;
+
+use github_suggestion_cli::{gseprintln, for_suggestion};
+use github_suggestion_cli::config::Config;
+
+
+fn main() {
+    let args: Vec<_> = env::args().collect();
+
+    let config = match Config::get(
+        &args,
+        "usage: git sugpatch [options] <suggestion>...",
+    ) {
+        Ok(c) => c,
+        Err(e) => {
+            gseprintln!(e);
+
+            process::exit(exitcode::CONFIG);
+        },
+    };
+
+    for_suggestion(
+        &config,
+        |suggestion| {
+            // TODO: Needs to work for multiple suggestions at once
+            suggestion.diff_command().unwrap();
+        },
+    );
+}
-- 
cgit v1.2.3