[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.

It used to be that diff-tree needed helper support to parse its
raw output to generate diffs, but these days git-diff-* family
produces the same output and the helper is not tied to diff-tree
anymore.  Drop "tree" from its name.

This commit is done separately to record just the rename and no
file content changes. The changes in the renamed files are recorded
in the next commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Bundled with the changes in the unrenamed files.

Signed-off-by: Petr Baudis <pasky@ucw.cz>

diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 1a99e85ee58bfc47192e3e3cd409af948c989f80..9e645399752e9b18f097840906fc640a1121d982 100644 (file)
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -45,7 +45,7 @@ with a '-p' option, they do not produce the output described above
 instead they produce a patch file.
 
 The patch generation can be customized at two levels.  This
-customization also applies to "git-diff-tree-helper".
+customization also applies to "git-diff-helper".
 
 1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set,
    these commands internally invoke "diff" like this:

diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
new file mode 100644 (file)
index 0000000..58f2717
--- /dev/null
+++ b/Documentation/git-diff-helper.txt
@@ -0,0 +1,49 @@
+git-diff-tree-helper(1)
+=======================
+v0.1, May 2005
+
+NAME
+----
+git-diff-tree-helper - Generates patch format output for git-diff-*
+
+
+SYNOPSIS
+--------
+'git-diff-tree-helper' [-z] [-R]
+
+DESCRIPTION
+-----------
+Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and
+generates patch format output.
+
+OPTIONS
+-------
+-z::
+       \0 line termination on input
+
+-R::
+       Output diff in reverse.  This is useful for displaying output from
+       "git-diff-cache" which always compares tree with cache or working
+       file.  E.g.
+
+               git-diff-cache <tree> | git-diff-tree-helper -R file.c
++
+would show a diff to bring the working file back to what is in the <tree>.
+
+See Also
+--------
+The section on generating patches in link:git-diff-cache.html[git-diff-cache]
+
+
+Author
+------
+Written by Linus Torvalds <torvalds@osdl.org>
+
+Documentation
+--------------
+Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the link:git.html[git] suite
+

diff --git a/Documentation/git-diff-tree-helper.txt b/Documentation/git-diff-tree-helper.txt
deleted file mode 100644 (file)
index 58f2717..0000000
--- a/Documentation/git-diff-tree-helper.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-git-diff-tree-helper(1)
-=======================
-v0.1, May 2005
-
-NAME
-----
-git-diff-tree-helper - Generates patch format output for git-diff-*
-
-
-SYNOPSIS
---------
-'git-diff-tree-helper' [-z] [-R]
-
-DESCRIPTION
------------
-Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and
-generates patch format output.
-
-OPTIONS
--------
--z::
-       \0 line termination on input
-
--R::
-       Output diff in reverse.  This is useful for displaying output from
-       "git-diff-cache" which always compares tree with cache or working
-       file.  E.g.
-
-               git-diff-cache <tree> | git-diff-tree-helper -R file.c
-+
-would show a diff to bring the working file back to what is in the <tree>.
-
-See Also
---------
-The section on generating patches in link:git-diff-cache.html[git-diff-cache]
-
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
-GIT
----
-Part of the link:git.html[git] suite
-

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98d923db9267dcfd4ac331e1af7c6fc2afee9276..134afffe3f669f5806a03793f1d703895b022e0f 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -149,7 +149,7 @@ link:git-rpull.html[git-rpull]::
 
 Interogators:
 
-link:git-diff-tree-helper.html[git-diff-tree-helper]::
+link:git-diff-helper.html[git-diff-helper]::
        Generates patch format output for git-diff-*
 
 link:git-rpush.html[git-rpush]::

diff --git a/Makefile b/Makefile
index 92b7cdf7665d0654b25c65b7ebd17ab0e51fcad1..23129c442190fca832e69fdd032a0ea31c2dfe99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-http-pull git-rpush git-rpull git-rev-list git-mktag \
-       git-diff-tree-helper git-tar-tree git-local-pull git-write-blob \
+       git-diff-helper git-tar-tree git-local-pull git-write-blob \
        git-get-tar-commit-id
 
 all: $(PROG)
@@ -101,7 +101,7 @@ git-rpush: rsh.c
 git-rpull: rsh.c pull.c
 git-rev-list: rev-list.c
 git-mktag: mktag.c
-git-diff-tree-helper: diff-tree-helper.c
+git-diff-helper: diff-helper.c
 git-tar-tree: tar-tree.c
 git-write-blob: write-blob.c
 

diff --git a/diff-helper.c b/diff-helper.c
new file mode 100644 (file)
index 0000000..51bb658
--- /dev/null
+++ b/diff-helper.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2005 Junio C Hamano
+ */
+#include <limits.h>
+#include "cache.h"
+#include "strbuf.h"
+#include "diff.h"
+
+static int matches_pathspec(const char *name, const char **spec, int cnt)
+{
+       int i;
+       int namelen = strlen(name);
+       for (i = 0; i < cnt; i++) {
+               int speclen = strlen(spec[i]);
+               if (! strncmp(spec[i], name, speclen) &&
+                   speclen <= namelen &&
+                   (name[speclen] == 0 ||
+                    name[speclen] == '/'))
+                       return 1;
+       }
+       return 0;
+}
+
+static int parse_oneside_change(const char *cp, struct diff_spec *one,
+                               char *path)
+{
+       int ch;
+
+       one->file_valid = one->sha1_valid = 1;
+       one->mode = 0;
+       while ((ch = *cp) && '0' <= ch && ch <= '7') {
+               one->mode = (one->mode << 3) | (ch - '0');
+               cp++;
+       }
+
+       if (strncmp(cp, "\tblob\t", 6))
+               return -1;
+       cp += 6;
+       if (get_sha1_hex(cp, one->blob_sha1))
+               return -1;
+       cp += 40;
+       if (*cp++ != '\t')
+               return -1;
+       strcpy(path, cp);
+       return 0;
+}
+
+static int parse_diff_tree_output(const char *buf,
+                                 const char **spec, int cnt, int reverse)
+{
+       struct diff_spec old, new;
+       char path[PATH_MAX];
+       const char *cp = buf;
+       int ch;
+
+       switch (*cp++) {
+       case 'U':
+               if (!cnt || matches_pathspec(cp + 1, spec, cnt))
+                       diff_unmerge(cp + 1);
+               return 0;
+       case '+':
+               old.file_valid = 0;
+               parse_oneside_change(cp, &new, path);
+               break;
+       case '-':
+               new.file_valid = 0;
+               parse_oneside_change(cp, &old, path);
+               break;
+       case '*':
+               old.file_valid = old.sha1_valid =
+                       new.file_valid = new.sha1_valid = 1;
+               old.mode = new.mode = 0;
+               while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
+                       old.mode = (old.mode << 3) | (ch - '0');
+                       cp++;
+               }
+               if (strncmp(cp, "->", 2))
+                       return -1;
+               cp += 2;
+               while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
+                       new.mode = (new.mode << 3) | (ch - '0');
+                       cp++;
+               }
+               if (strncmp(cp, "\tblob\t", 6))
+                       return -1;
+               cp += 6;
+               if (get_sha1_hex(cp, old.blob_sha1))
+                       return -1;
+               cp += 40;
+               if (strncmp(cp, "->", 2))
+                       return -1;
+               cp += 2;
+               if (get_sha1_hex(cp, new.blob_sha1))
+                       return -1;
+               cp += 40;
+               if (*cp++ != '\t')
+                       return -1;
+               strcpy(path, cp);
+               break;
+       default:
+               return -1;
+       }
+       if (!cnt || matches_pathspec(path, spec, cnt)) {
+               if (reverse)
+                       run_external_diff(path, &new, &old);
+               else
+                       run_external_diff(path, &old, &new);
+       }
+       return 0;
+}
+
+static const char *diff_tree_helper_usage =
+"diff-tree-helper [-R] [-z] paths...";
+
+int main(int ac, const char **av) {
+       struct strbuf sb;
+       int reverse = 0;
+       int line_termination = '\n';
+
+       strbuf_init(&sb);
+
+       while (1 < ac && av[1][0] == '-') {
+               if (av[1][1] == 'R')
+                       reverse = 1;
+               else if (av[1][1] == 'z')
+                       line_termination = 0;
+               else
+                       usage(diff_tree_helper_usage);
+               ac--; av++;
+       }
+       /* the remaining parameters are paths patterns */
+
+       while (1) {
+               int status;
+               read_line(&sb, stdin, line_termination);
+               if (sb.eof)
+                       break;
+               status = parse_diff_tree_output(sb.buf, av+1, ac-1, reverse);
+               if (status)
+                       fprintf(stderr, "cannot parse %s\n", sb.buf);
+       }
+       return 0;
+}

diff --git a/diff-tree-helper.c b/diff-tree-helper.c
deleted file mode 100644 (file)
index 51bb658..0000000
--- a/diff-tree-helper.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2005 Junio C Hamano
- */
-#include <limits.h>
-#include "cache.h"
-#include "strbuf.h"
-#include "diff.h"
-
-static int matches_pathspec(const char *name, const char **spec, int cnt)
-{
-       int i;
-       int namelen = strlen(name);
-       for (i = 0; i < cnt; i++) {
-               int speclen = strlen(spec[i]);
-               if (! strncmp(spec[i], name, speclen) &&
-                   speclen <= namelen &&
-                   (name[speclen] == 0 ||
-                    name[speclen] == '/'))
-                       return 1;
-       }
-       return 0;
-}
-
-static int parse_oneside_change(const char *cp, struct diff_spec *one,
-                               char *path)
-{
-       int ch;
-
-       one->file_valid = one->sha1_valid = 1;
-       one->mode = 0;
-       while ((ch = *cp) && '0' <= ch && ch <= '7') {
-               one->mode = (one->mode << 3) | (ch - '0');
-               cp++;
-       }
-
-       if (strncmp(cp, "\tblob\t", 6))
-               return -1;
-       cp += 6;
-       if (get_sha1_hex(cp, one->blob_sha1))
-               return -1;
-       cp += 40;
-       if (*cp++ != '\t')
-               return -1;
-       strcpy(path, cp);
-       return 0;
-}
-
-static int parse_diff_tree_output(const char *buf,
-                                 const char **spec, int cnt, int reverse)
-{
-       struct diff_spec old, new;
-       char path[PATH_MAX];
-       const char *cp = buf;
-       int ch;
-
-       switch (*cp++) {
-       case 'U':
-               if (!cnt || matches_pathspec(cp + 1, spec, cnt))
-                       diff_unmerge(cp + 1);
-               return 0;
-       case '+':
-               old.file_valid = 0;
-               parse_oneside_change(cp, &new, path);
-               break;
-       case '-':
-               new.file_valid = 0;
-               parse_oneside_change(cp, &old, path);
-               break;
-       case '*':
-               old.file_valid = old.sha1_valid =
-                       new.file_valid = new.sha1_valid = 1;
-               old.mode = new.mode = 0;
-               while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
-                       old.mode = (old.mode << 3) | (ch - '0');
-                       cp++;
-               }
-               if (strncmp(cp, "->", 2))
-                       return -1;
-               cp += 2;
-               while ((ch = *cp) && ('0' <= ch && ch <= '7')) {
-                       new.mode = (new.mode << 3) | (ch - '0');
-                       cp++;
-               }
-               if (strncmp(cp, "\tblob\t", 6))
-                       return -1;
-               cp += 6;
-               if (get_sha1_hex(cp, old.blob_sha1))
-                       return -1;
-               cp += 40;
-               if (strncmp(cp, "->", 2))
-                       return -1;
-               cp += 2;
-               if (get_sha1_hex(cp, new.blob_sha1))
-                       return -1;
-               cp += 40;
-               if (*cp++ != '\t')
-                       return -1;
-               strcpy(path, cp);
-               break;
-       default:
-               return -1;
-       }
-       if (!cnt || matches_pathspec(path, spec, cnt)) {
-               if (reverse)
-                       run_external_diff(path, &new, &old);
-               else
-                       run_external_diff(path, &old, &new);
-       }
-       return 0;
-}
-
-static const char *diff_tree_helper_usage =
-"diff-tree-helper [-R] [-z] paths...";
-
-int main(int ac, const char **av) {
-       struct strbuf sb;
-       int reverse = 0;
-       int line_termination = '\n';
-
-       strbuf_init(&sb);
-
-       while (1 < ac && av[1][0] == '-') {
-               if (av[1][1] == 'R')
-                       reverse = 1;
-               else if (av[1][1] == 'z')
-                       line_termination = 0;
-               else
-                       usage(diff_tree_helper_usage);
-               ac--; av++;
-       }
-       /* the remaining parameters are paths patterns */
-
-       while (1) {
-               int status;
-               read_line(&sb, stdin, line_termination);
-               if (sb.eof)
-                       break;
-               status = parse_diff_tree_output(sb.buf, av+1, ac-1, reverse);
-               if (status)
-                       fprintf(stderr, "cannot parse %s\n", sb.buf);
-       }
-       return 0;
-}

diff --git a/diff.h b/diff.h
index 0b76cc42816e1f7804df6f313f24ce9be491b6e8..c146d8acf8601f81cb7b7baeaffcf85081e1eb1b 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -17,7 +17,7 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 
 extern void diff_unmerge(const char *path);
 
-/* These are for diff-tree-helper */
+/* These are for diff-helper */
 
 struct diff_spec {
        unsigned char blob_sha1[20];