[PATCH] git-apply --stat: show new filename for rename/copy patch.

diff --git a/apply.c b/apply.c
index 20c41c51433d18b21b914f0e700501c5244de6e0..53a9bb626ed895620812b7df1a51e070938aba70 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -568,10 +568,13 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
                 */
                if (!memcmp("diff --git ", line, 11)) {
                        int git_hdr_len = parse_git_header(line, len, size, patch);
-                       if (git_hdr_len < 0)
+                       if (git_hdr_len <= len)
                                continue;
-                       if (!patch->old_name && !patch->new_name)
-                               die("git diff header lacks filename information (line %d)", linenr);
+                       if (!patch->old_name && !patch->new_name) {
+                               if (!patch->def_name)
+                                       die("git diff header lacks filename information (line %d)", linenr);
+                               patch->old_name = patch->new_name = patch->def_name;
+                       }
                        *hdrsize = git_hdr_len;
                        return offset;
                }
@@ -720,11 +723,11 @@ const char minuses[]= "---------------------------------------------------------
 
 static void show_stats(struct patch *patch)
 {
-       char *name = patch->old_name;
+       char *name = patch->new_name;
        int len, max, add, del, total;
 
        if (!name)
-               name = patch->new_name;
+               name = patch->old_name;
 
        /*
         * "scale" the filename
@@ -748,9 +751,11 @@ static void show_stats(struct patch *patch)
        del = patch->lines_deleted;
        total = add + del;
 
-       total = (total * max + max_change / 2) / max_change;
-       add = (add * max + max_change / 2) / max_change;
-       del = total - add;
+       if (max_change > 0) {
+               total = (total * max + max_change / 2) / max_change;
+               add = (add * max + max_change / 2) / max_change;
+               del = total - add;
+       }
        printf(" %-*s |%5d %.*s%.*s\n",
                len, name, patch->lines_added + patch->lines_deleted,
                add, pluses, del, minuses);
@@ -989,7 +994,7 @@ static int check_patch(struct patch *patch)
                int changed;
 
                if (lstat(old_name, &st) < 0)
-                       return error("%s: %s\n", strerror(errno));
+                       return error("%s: %s", old_name, strerror(errno));
                if (check_index) {
                        int pos = cache_name_pos(old_name, strlen(old_name));
                        if (pos < 0)
@@ -1000,6 +1005,7 @@ static int check_patch(struct patch *patch)
                }
                if (patch->is_new < 0)
                        patch->is_new = 0;
+               st.st_mode = ntohl(create_ce_mode(st.st_mode));
                if (!patch->old_mode)
                        patch->old_mode = st.st_mode;
                if ((st.st_mode ^ patch->old_mode) & S_IFMT)
@@ -1138,6 +1144,51 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
                die("unable to add cache entry for %s", path);
 }
 
+static void create_subdirectories(const char *path)
+{
+       int len = strlen(path);
+       char *buf = xmalloc(len + 1);
+       const char *slash = path;
+
+       while ((slash = strchr(slash+1, '/')) != NULL) {
+               len = slash - path;
+               memcpy(buf, path, len);
+               buf[len] = 0;
+               if (mkdir(buf, 0755) < 0) {
+                       if (errno != EEXIST)
+                               break;
+               }
+       }
+       free(buf);
+}
+
+/*
+ * We optimistically assume that the directories exist,
+ * which is true 99% of the time anyway. If they don't,
+ * we create them and try again.
+ */
+static int create_regular_file(const char *path, unsigned int mode)
+{
+       int ret = open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);
+
+       if (ret < 0 && errno == ENOENT) {
+               create_subdirectories(path);
+               ret = open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);
+       }
+       return ret;
+}
+
+static int create_symlink(const char *buf, const char *path)
+{
+       int ret = symlink(buf, path);
+
+       if (ret < 0 && errno == ENOENT) {
+               create_subdirectories(path);
+               ret = symlink(buf, path);
+       }
+       return ret;
+}
+
 static void create_file(struct patch *patch)
 {
        const char *path = patch->new_name;
@@ -1150,7 +1201,7 @@ static void create_file(struct patch *patch)
        if (S_ISREG(mode)) {
                int fd;
                mode = (mode & 0100) ? 0777 : 0666;
-               fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);
+               fd = create_regular_file(path, mode);
                if (fd < 0)
                        die("unable to create file %s (%s)", path, strerror(errno));
                if (write(fd, buf, size) != size)
@@ -1163,7 +1214,7 @@ static void create_file(struct patch *patch)
                if (size && buf[size-1] == '\n')
                        size--;
                buf[size] = 0;
-               if (symlink(buf, path) < 0)
+               if (create_symlink(buf, path) < 0)
                        die("unable to write symlink %s", path);
                add_index_file(path, mode, buf, size);
                return;