Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.

diff --git a/blame.c b/blame.c
index 99ceea81df7b7c69bc263cf170cbb23d88420613..7c0b62cf3f5ff78f95cf96c2582f693b5d124752 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -20,9 +20,11 @@
 
 #define DEBUG 0
 
-static const char blame_usage[] = "[-c] [-l] [--] file [commit]\n"
+static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
        "  -c, --compability Use the same output mode as git-annotate (Default: off)\n"
        "  -l, --long        Show long commit SHA1 (Default: off)\n"
+       "  -t, --time        Show raw timestamp (Default: off)\n"
+       "  -S, --revs-file   Use revisions from revs-file instead of calling git-rev-list\n"
        "  -h, --help        This message";
 
 static struct commit **blame_lines;
@@ -108,8 +110,8 @@ static struct patch *get_patch(struct commit *commit, struct commit *other)
        xdemitconf_t xecfg;
        mmfile_t file_c, file_o;
        xdemitcb_t ecb;
-       struct util_info *info_c = (struct util_info *)commit->object.util;
-       struct util_info *info_o = (struct util_info *)other->object.util;
+       struct util_info *info_c = (struct util_info *)commit->util;
+       struct util_info *info_o = (struct util_info *)other->util;
        struct timeval tv_start, tv_end;
 
        get_blob(commit);
@@ -149,7 +151,7 @@ static void free_patch(struct patch *p)
        free(p);
 }
 
-static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
+static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
                                  int baselen, const char *pathname,
                                  unsigned mode, int stage);
 
@@ -178,7 +180,7 @@ static int get_blob_sha1(struct tree *t, const char *pathname,
        return 0;
 }
 
-static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
+static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
                                  int baselen, const char *pathname,
                                  unsigned mode, int stage)
 {
@@ -195,7 +197,7 @@ static int get_blob_sha1_internal(unsigned char *sha1, const char *base,
 
 static void get_blob(struct commit *commit)
 {
-       struct util_info *info = commit->object.util;
+       struct util_info *info = commit->util;
        char type[20];
 
        if (info->buf)
@@ -221,8 +223,8 @@ static void print_patch(struct patch *p)
 /* For debugging only */
 static void print_map(struct commit *cmit, struct commit *other)
 {
-       struct util_info *util = cmit->object.util;
-       struct util_info *util2 = other->object.util;
+       struct util_info *util = cmit->util;
+       struct util_info *util2 = other->util;
 
        int i;
        int max =
@@ -257,8 +259,8 @@ static void print_map(struct commit *cmit, struct commit *other)
 static void fill_line_map(struct commit *commit, struct commit *other,
                          struct patch *p)
 {
-       struct util_info *util = commit->object.util;
-       struct util_info *util2 = other->object.util;
+       struct util_info *util = commit->util;
+       struct util_info *util2 = other->util;
        int *map = util->line_map;
        int *map2 = util2->line_map;
        int cur_chunk = 0;
@@ -320,14 +322,14 @@ static void fill_line_map(struct commit *commit, struct commit *other,
 
 static int map_line(struct commit *commit, int line)
 {
-       struct util_info *info = commit->object.util;
+       struct util_info *info = commit->util;
        assert(line >= 0 && line < info->num_lines);
        return info->line_map[line];
 }
 
 static struct util_info* get_util(struct commit *commit)
 {
-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;
 
        if (util)
                return util;
@@ -338,13 +340,13 @@ static struct util_info* get_util(struct commit *commit)
        util->line_map = NULL;
        util->num_lines = -1;
        util->pathname = NULL;
-       commit->object.util = util;
+       commit->util = util;
        return util;
 }
 
 static int fill_util_info(struct commit *commit)
 {
-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;
 
        assert(util);
        assert(util->pathname);
@@ -357,7 +359,7 @@ static int fill_util_info(struct commit *commit)
 
 static void alloc_line_map(struct commit *commit)
 {
-       struct util_info *util = commit->object.util;
+       struct util_info *util = commit->util;
        int i;
 
        if (util->line_map)
@@ -381,7 +383,7 @@ static void alloc_line_map(struct commit *commit)
 
 static void init_first_commit(struct commit* commit, const char* filename)
 {
-       struct util_info* util = commit->object.util;
+       struct util_info* util = commit->util;
        int i;
 
        util->pathname = filename;
@@ -390,7 +392,7 @@ static void init_first_commit(struct commit* commit, const char* filename)
 
        alloc_line_map(commit);
 
-       util = commit->object.util;
+       util = commit->util;
 
        for (i = 0; i < util->num_lines; i++)
                util->line_map[i] = i;
@@ -411,7 +413,7 @@ static void process_commits(struct rev_info *rev, const char *path,
        assert(commit);
        init_first_commit(commit, path);
 
-       util = commit->object.util;
+       util = commit->util;
        num_blame_lines = util->num_lines;
        blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
        blame_contents = util->buf;
@@ -450,7 +452,7 @@ static void process_commits(struct rev_info *rev, const char *path,
                        continue;
 
                alloc_line_map(commit);
-               util = commit->object.util;
+               util = commit->util;
 
                for (parents = commit->parents;
                     parents != NULL; parents = parents->next) {
@@ -510,7 +512,7 @@ static int compare_tree_path(struct rev_info* revs,
 {
        int ret;
        const char* paths[2];
-       struct util_info* util = c2->object.util;
+       struct util_info* util = c2->util;
        paths[0] = util->pathname;
        paths[1] = NULL;
 
@@ -539,7 +541,7 @@ static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,
 
 static const char* find_rename(struct commit* commit, struct commit* parent)
 {
-       struct util_info* cutil = commit->object.util;
+       struct util_info* cutil = commit->util;
        struct diff_options diff_opts;
        const char *paths[1];
        int i;
@@ -583,7 +585,7 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
                return;
 
        if (!commit->parents) {
-               struct util_info* util = commit->object.util;
+               struct util_info* util = commit->util;
                if (!same_tree_as_empty_path(revs, commit->tree,
                                             util->pathname))
                        commit->object.flags |= TREECHANGE;
@@ -610,7 +612,7 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
                case REV_TREE_NEW:
                {
 
-                       struct util_info* util = commit->object.util;
+                       struct util_info* util = commit->util;
                        if (revs->remove_empty_trees &&
                            same_tree_as_empty_path(revs, p->tree,
                                                    util->pathname)) {
@@ -680,13 +682,19 @@ static void get_commit_info(struct commit* commit, struct commit_info* ret)
        *tmp = 0;
 }
 
-static const char* format_time(unsigned long time, const char* tz_str)
+static const char* format_time(unsigned long time, const char* tz_str,
+                              int show_raw_time)
 {
        static char time_buf[128];
        time_t t = time;
        int minutes, tz;
        struct tm *tm;
 
+       if (show_raw_time) {
+               sprintf(time_buf, "%lu %s", time, tz_str);
+               return time_buf;
+       }
+
        tz = atoi(tz_str);
        minutes = tz < 0 ? -tz : tz;
        minutes = (minutes / 100)*60 + (minutes % 100);
@@ -701,13 +709,13 @@ static const char* format_time(unsigned long time, const char* tz_str)
 
 static void topo_setter(struct commit* c, void* data)
 {
-       struct util_info* util = c->object.util;
+       struct util_info* util = c->util;
        util->topo_data = data;
 }
 
 static void* topo_getter(struct commit* c)
 {
-       struct util_info* util = c->object.util;
+       struct util_info* util = c->util;
        return util->topo_data;
 }
 
@@ -740,6 +748,7 @@ int main(int argc, const char **argv)
        char filename_buf[256];
        int sha1_len = 8;
        int compability = 0;
+       int show_raw_time = 0;
        int options = 1;
        struct commit* start_commit;
 
@@ -768,6 +777,10 @@ int main(int argc, const char **argv)
                                  !strcmp(argv[i], "--compability")) {
                                compability = 1;
                                continue;
+                       } else if(!strcmp(argv[i], "-t") ||
+                                 !strcmp(argv[i], "--time")) {
+                               show_raw_time = 1;
+                               continue;
                        } else if(!strcmp(argv[i], "-S")) {
                                if (i + 1 < argc &&
                                    !read_ancestry(argv[i + 1], &sha1_p)) {
@@ -850,7 +863,7 @@ int main(int argc, const char **argv)
                struct util_info* u;
                if (!c)
                        c = initial;
-               u = c->object.util;
+               u = c->util;
 
                if (!found_rename && strcmp(filename, u->pathname))
                        found_rename = 1;
@@ -868,19 +881,22 @@ int main(int argc, const char **argv)
                if (!c)
                        c = initial;
 
-               u = c->object.util;
+               u = c->util;
                get_commit_info(c, &ci);
                fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
                if(compability) {
                        printf("\t(%10s\t%10s\t%d)", ci.author,
-                              format_time(ci.author_time, ci.author_tz), i+1);
+                              format_time(ci.author_time, ci.author_tz,
+                                          show_raw_time),
+                              i+1);
                } else {
                        if (found_rename)
                                printf(" %-*.*s", longest_file, longest_file,
                                       u->pathname);
                        printf(" (%-*.*s %10s %*d) ",
                               longest_author, longest_author, ci.author,
-                              format_time(ci.author_time, ci.author_tz),
+                              format_time(ci.author_time, ci.author_tz,
+                                          show_raw_time),
                               max_digits, i+1);
                }