mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame.c: whitespace and formatting clean-up.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-10-05 14:00:55 -07:00
parent 51a7c66a73
commit 506e49ff9f
1 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
blame.c
View File

@ -20,7 +20,8 @@
#define DEBUG 0 #define DEBUG 0
static const char blame_usage[] = "git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n" static const char blame_usage[] =
"git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n" " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
" -l, --long Show long commit SHA1 (Default: off)\n" " -l, --long Show long commit SHA1 (Default: off)\n"
" -t, --time Show raw timestamp (Default: off)\n" " -t, --time Show raw timestamp (Default: off)\n"
@ -160,7 +161,6 @@ static const char* blame_file;
static int get_blob_sha1(struct tree *t, const char *pathname, static int get_blob_sha1(struct tree *t, const char *pathname,
unsigned char *sha1) unsigned char *sha1)
{ {
int i;
const char *pathspec[2]; const char *pathspec[2];
blame_file = pathname; blame_file = pathname;
pathspec[0] = pathname; pathspec[0] = pathname;
@ -168,12 +168,7 @@ static int get_blob_sha1(struct tree *t, const char *pathname,
hashclr(blob_sha1); hashclr(blob_sha1);
read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal); read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal);
for (i = 0; i < 20; i++) { if (is_null_sha1(blob_sha1))
if (blob_sha1[i] != 0)
break;
}
if (i == 20)
return -1; return -1;
hashcpy(sha1, blob_sha1); hashcpy(sha1, blob_sha1);
@ -239,7 +234,8 @@ static void print_map(struct commit *cmit, struct commit *other)
if (i < util->num_lines) { if (i < util->num_lines) {
num = util->line_map[i]; num = util->line_map[i];
printf("%d\t", num); printf("%d\t", num);
} else }
else
printf("\t"); printf("\t");
if (i < util2->num_lines) { if (i < util2->num_lines) {
@ -247,7 +243,8 @@ static void print_map(struct commit *cmit, struct commit *other)
printf("%d\t", num2); printf("%d\t", num2);
if (num != -1 && num2 != num) if (num != -1 && num2 != num)
printf("---"); printf("---");
} else }
else
printf("\t"); printf("\t");
printf("\n"); printf("\n");
@ -266,12 +263,12 @@ static void fill_line_map(struct commit *commit, struct commit *other,
int cur_chunk = 0; int cur_chunk = 0;
int i1, i2; int i1, i2;
if (p->num && DEBUG) if (DEBUG) {
if (p->num)
print_patch(p); print_patch(p);
if (DEBUG)
printf("num lines 1: %d num lines 2: %d\n", util->num_lines, printf("num lines 1: %d num lines 2: %d\n", util->num_lines,
util2->num_lines); util2->num_lines);
}
for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) { for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {
struct chunk *chunk = NULL; struct chunk *chunk = NULL;
@ -293,7 +290,8 @@ static void fill_line_map(struct commit *commit, struct commit *other,
i2 += chunk->len2; i2 += chunk->len2;
cur_chunk++; cur_chunk++;
} else { }
else {
if (i2 >= util2->num_lines) if (i2 >= util2->num_lines)
break; break;
@ -395,7 +393,6 @@ static void init_first_commit(struct commit* commit, const char* filename)
util->line_map[i] = i; util->line_map[i] = i;
} }
static void process_commits(struct rev_info *rev, const char *path, static void process_commits(struct rev_info *rev, const char *path,
struct commit **initial) struct commit **initial)
{ {
@ -503,7 +500,6 @@ static void process_commits(struct rev_info *rev, const char *path,
} while ((commit = get_revision(rev)) != NULL); } while ((commit = get_revision(rev)) != NULL);
} }
static int compare_tree_path(struct rev_info *revs, static int compare_tree_path(struct rev_info *revs,
struct commit *c1, struct commit *c2) struct commit *c1, struct commit *c2)
{ {
@ -520,7 +516,6 @@ static int compare_tree_path(struct rev_info* revs,
return ret; return ret;
} }
static int same_tree_as_empty_path(struct rev_info *revs, struct tree *t1, static int same_tree_as_empty_path(struct rev_info *revs, struct tree *t1,
const char *path) const char *path)
{ {
@ -564,9 +559,11 @@ static const char* find_rename(struct commit* commit, struct commit* parent)
for (i = 0; i < diff_queued_diff.nr; i++) { for (i = 0; i < diff_queued_diff.nr; i++) {
struct diff_filepair *p = diff_queued_diff.queue[i]; struct diff_filepair *p = diff_queued_diff.queue[i];
if (p->status == 'R' && !strcmp(p->one->path, cutil->pathname)) { if (p->status == 'R' &&
!strcmp(p->one->path, cutil->pathname)) {
if (DEBUG) if (DEBUG)
printf("rename %s -> %s\n", p->one->path, p->two->path); printf("rename %s -> %s\n",
p->one->path, p->two->path);
return p->two->path; return p->two->path;
} }
} }
@ -608,7 +605,6 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
case REV_TREE_NEW: case REV_TREE_NEW:
{ {
struct util_info *util = commit->util; struct util_info *util = commit->util;
if (revs->remove_empty_trees && if (revs->remove_empty_trees &&
same_tree_as_empty_path(revs, p->tree, same_tree_as_empty_path(revs, p->tree,
@ -618,7 +614,8 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
struct util_info *putil = get_util(p); struct util_info *putil = get_util(p);
if (!putil->pathname) if (!putil->pathname)
putil->pathname = xstrdup(new_name); putil->pathname = xstrdup(new_name);
} else { }
else {
*pp = parent->next; *pp = parent->next;
continue; continue;
} }
@ -639,7 +636,6 @@ static void simplify_commit(struct rev_info *revs, struct commit *commit)
commit->object.flags |= TREECHANGE; commit->object.flags |= TREECHANGE;
} }
struct commit_info struct commit_info
{ {
char *author; char *author;
@ -766,19 +762,22 @@ int main(int argc, const char **argv)
if (!strcmp(argv[i], "-h") || if (!strcmp(argv[i], "-h") ||
!strcmp(argv[i], "--help")) !strcmp(argv[i], "--help"))
usage(blame_usage); usage(blame_usage);
else if(!strcmp(argv[i], "-l") || if (!strcmp(argv[i], "-l") ||
!strcmp(argv[i], "--long")) { !strcmp(argv[i], "--long")) {
sha1_len = 40; sha1_len = 40;
continue; continue;
} else if(!strcmp(argv[i], "-c") || }
if (!strcmp(argv[i], "-c") ||
!strcmp(argv[i], "--compatibility")) { !strcmp(argv[i], "--compatibility")) {
compatibility = 1; compatibility = 1;
continue; continue;
} else if(!strcmp(argv[i], "-t") || }
if (!strcmp(argv[i], "-t") ||
!strcmp(argv[i], "--time")) { !strcmp(argv[i], "--time")) {
show_raw_time = 1; show_raw_time = 1;
continue; continue;
} else if(!strcmp(argv[i], "-S")) { }
if (!strcmp(argv[i], "-S")) {
if (i + 1 < argc && if (i + 1 < argc &&
!read_ancestry(argv[i + 1], &sha1_p)) { !read_ancestry(argv[i + 1], &sha1_p)) {
compatibility = 1; compatibility = 1;
@ -786,12 +785,13 @@ int main(int argc, const char **argv)
continue; continue;
} }
usage(blame_usage); usage(blame_usage);
} else if(!strcmp(argv[i], "--")) { }
if (!strcmp(argv[i], "--")) {
options = 0; options = 0;
continue; continue;
} else if(argv[i][0] == '-') }
if (argv[i][0] == '-')
usage(blame_usage); usage(blame_usage);
else
options = 0; options = 0;
} }
@ -830,7 +830,6 @@ int main(int argc, const char **argv)
return 1; return 1;
} }
init_revisions(&rev, setup_git_directory()); init_revisions(&rev, setup_git_directory());
rev.remove_empty_trees = 1; rev.remove_empty_trees = 1;
rev.topo_order = 1; rev.topo_order = 1;
@ -874,11 +873,10 @@ int main(int argc, const char **argv)
for (i = 0; i < num_blame_lines; i++) { for (i = 0; i < num_blame_lines; i++) {
struct commit *c = blame_lines[i]; struct commit *c = blame_lines[i];
struct util_info *u; struct util_info *u;
if (!c) if (!c)
c = initial; c = initial;
u = c->util; u = c->util;
get_commit_info(c, &ci); get_commit_info(c, &ci);
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout); fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
if (compatibility) { if (compatibility) {
@ -886,7 +884,8 @@ int main(int argc, const char **argv)
format_time(ci.author_time, ci.author_tz, format_time(ci.author_time, ci.author_tz,
show_raw_time), show_raw_time),
i+1); i+1);
} else { }
else {
if (found_rename) if (found_rename)
printf(" %-*.*s", longest_file, longest_file, printf(" %-*.*s", longest_file, longest_file,
u->pathname); u->pathname);
@ -902,7 +901,8 @@ int main(int argc, const char **argv)
1, stdout); 1, stdout);
if (blame_contents[blame_len-1] != '\n') if (blame_contents[blame_len-1] != '\n')
putc('\n', stdout); putc('\n', stdout);
} else { }
else {
char *next_buf = strchr(buf, '\n') + 1; char *next_buf = strchr(buf, '\n') + 1;
fwrite(buf, next_buf - buf, 1, stdout); fwrite(buf, next_buf - buf, 1, stdout);
buf = next_buf; buf = next_buf;