[PATCH] Trivial tidyups

[git.git] / apply.c

diff --git a/apply.c b/apply.c
index c331f91..c671d9e 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -13,7 +13,7 @@
  * uses the working tree as a "branch" for a 3-way merge.
  */
 #include <ctype.h>
-
+#include <fnmatch.h>
 #include "cache.h"
 
 // We default to the merge behaviour, since that's what most people would
@@ -737,6 +737,7 @@ static const char minuses[]= "--------------------------------------------------
 
 static void show_stats(struct patch *patch)
 {
+       const char *prefix = "";
        char *name = patch->new_name;
        int len, max, add, del, total;
 
@@ -750,8 +751,15 @@ static void show_stats(struct patch *patch)
        max = max_len;
        if (max > 50)
                max = 50;
-       if (len > max)
+       if (len > max) {
+               char *slash;
+               prefix = "...";
+               max -= 3;
                name += len - max;
+               slash = strchr(name, '/');
+               if (slash)
+                       name = slash;
+       }
        len = max;
 
        /*
@@ -770,7 +778,7 @@ static void show_stats(struct patch *patch)
                add = (add * max + max_change / 2) / max_change;
                del = total - add;
        }
-       printf(" %-*s |%5d %.*s%.*s\n",
+       printf(" %s%-*s |%5d %.*s%.*s\n", prefix,
                len, name, patch->lines_added + patch->lines_deleted,
                add, pluses, del, minuses);
 }
@@ -1345,9 +1353,9 @@ static void write_out_one_result(struct patch *patch)
        create_file(patch);
 }
 
-static void write_out_results(struct patch *list)
+static void write_out_results(struct patch *list, int skipped_patch)
 {
-       if (!list)
+       if (!list && !skipped_patch)
                die("No changes");
 
        while (list) {
@@ -1358,12 +1366,30 @@ static void write_out_results(struct patch *list)
 
 static struct cache_file cache_file;
 
+static struct excludes {
+       struct excludes *next;
+       const char *path;
+} *excludes;
+
+static int use_patch(struct patch *p)
+{
+       const char *pathname = p->new_name ? : p->old_name;
+       struct excludes *x = excludes;
+       while (x) {
+               if (fnmatch(x->path, pathname, 0) == 0)
+                       return 0;
+               x = x->next;
+       }
+       return 1;
+}
+
 static int apply_patch(int fd)
 {
        int newfd;
        unsigned long offset, size;
        char *buffer = read_patch_file(fd, &size);
        struct patch *list = NULL, **listp = &list;
+       int skipped_patch = 0;
 
        if (!buffer)
                return -1;
@@ -1377,9 +1403,15 @@ static int apply_patch(int fd)
                nr = parse_chunk(buffer + offset, size, patch);
                if (nr < 0)
                        break;
-               patch_stats(patch);
-               *listp = patch;
-               listp = &patch->next;
+               if (use_patch(patch)) {
+                       patch_stats(patch);
+                       *listp = patch;
+                       listp = &patch->next;
+               } else {
+                       /* perhaps free it a bit better? */
+                       free(patch);
+                       skipped_patch++;
+               }
                offset += nr;
                size -= nr;
        }
@@ -1397,7 +1429,7 @@ static int apply_patch(int fd)
                exit(1);
 
        if (apply)
-               write_out_results(list);
+               write_out_results(list, skipped_patch);
 
        if (write_index) {
                if (write_cache(newfd, active_cache, active_nr) ||
@@ -1432,6 +1464,13 @@ int main(int argc, char **argv)
                        read_stdin = 0;
                        continue;
                }
+               if (!strncmp(arg, "--exclude=", 10)) {
+                       struct excludes *x = xmalloc(sizeof(*x));
+                       x->path = arg + 10;
+                       x->next = excludes;
+                       excludes = x;
+                       continue;
+               }
                /* NEEDSWORK: this does not do anything at this moment. */
                if (!strcmp(arg, "--no-merge")) {
                        merge_patch = 0;