[PATCH] Silent flag for show-diff

[git.git] / show-diff.c

diff --git a/show-diff.c b/show-diff.c
index 55b8576..bc3791a 100644 (file)
--- a/show-diff.c
+++ b/show-diff.c
@@ -5,23 +5,70 @@
  */
 #include "cache.h"
 
-static void show_differences(struct cache_entry *ce, struct stat *cur,
+static void show_differences(char *name, 
        void *old_contents, unsigned long long old_size)
 {
        static char cmd[1000];
        FILE *f;
 
-       snprintf(cmd, sizeof(cmd), "diff -u - %s", ce->name);
+       snprintf(cmd, sizeof(cmd), "diff -L %s -u -N  - %s", name, name);
        f = popen(cmd, "w");
-       fwrite(old_contents, old_size, 1, f);
+       if (old_size)
+               fwrite(old_contents, old_size, 1, f);
        pclose(f);
 }
 
+static void show_diff_empty(struct cache_entry *ce)
+{
+       char *old;
+       unsigned long int size;
+       int lines=0;
+       unsigned char type[20], *p, *end;
+
+       old = read_sha1_file(ce->sha1, type, &size);
+       if (size > 0) {
+               int startline = 1;
+               int c = 0;
+
+               printf("--- %s\n", ce->name);
+               printf("+++ %s\n", ce->name);
+               p = old;
+               end = old + size; 
+               while (p < end)
+                       if (*p++ == '\n')
+                               lines ++;
+               printf("@@ -1,%d +0,0 @@\n", lines);
+               p = old;
+               while (p < end) {
+                       c = *p++;
+                       if (startline) {
+                               putchar('-');
+                               startline = 0;
+                       } 
+                       putchar(c);
+                       if (c == '\n')
+                               startline = 1;
+               }
+               if (c!='\n')
+                       printf("\n");
+               fflush(stdout);
+       }
+}
+
 int main(int argc, char **argv)
 {
+       int silent = 0;
        int entries = read_cache();
        int i;
 
+       while (argc-- > 1) {
+               if (!strcmp(argv[1], "-s")) {
+                       silent = 1;
+                       continue;
+               }
+               usage("show-diff [-s]");
+       }
+
        if (entries < 0) {
                perror("read_cache");
                exit(1);
@@ -36,6 +83,8 @@ int main(int argc, char **argv)
 
                if (stat(ce->name, &st) < 0) {
                        printf("%s: %s\n", ce->name, strerror(errno));
+                       if (errno == ENOENT && !silent)
+                               show_diff_empty(ce);
                        continue;
                }
                changed = cache_match_stat(ce, &st);
@@ -45,8 +94,12 @@ int main(int argc, char **argv)
                for (n = 0; n < 20; n++)
                        printf("%02x", ce->sha1[n]);
                printf("\n");
+               fflush(stdout);
+               if (silent)
+                       continue;
+
                new = read_sha1_file(ce->sha1, type, &size);
-               show_differences(ce, &st, new, size);
+               show_differences(ce->name, new, size);
                free(new);
        }
        return 0;