undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log/whatchanged/show - log formatting cleanup.

Browse Source 
This moves the decision to print the log message, while diff
options are in effect, to log-tree.  It gives behaviour closer
to the traditional one.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-16 03:29:10 -07:00
parent d4ed9793fd
commit cb8f64b4e3
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
git.c
View File

@ -288,7 +288,6 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
rev->abbrev = DEFAULT_ABBREV; rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT; rev->commit_format = CMIT_FMT_DEFAULT;
rev->no_commit_id = 1;
argc = setup_revisions(argc, argv, rev, "HEAD"); argc = setup_revisions(argc, argv, rev, "HEAD");
if (argc > 1) if (argc > 1)
@ -299,16 +298,20 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
prepare_revision_walk(rev); prepare_revision_walk(rev);
setup_pager(); setup_pager();
while ((commit = get_revision(rev)) != NULL) { while ((commit = get_revision(rev)) != NULL) {
unsigned long ofs = 0;
if (shown && rev->diff && if (shown && rev->diff &&
rev->commit_format != CMIT_FMT_ONELINE) rev->commit_format != CMIT_FMT_ONELINE)
putchar('\n'); putchar('\n');
fputs(commit_prefix, stdout);
ofs = sprintf(buf, "%s", commit_prefix);
if (rev->abbrev_commit && rev->abbrev) if (rev->abbrev_commit && rev->abbrev)
fputs(find_unique_abbrev(commit->object.sha1, ofs += sprintf(buf + ofs, "%s",
rev->abbrev), find_unique_abbrev(commit->object.sha1,
stdout); rev->abbrev));
else else
fputs(sha1_to_hex(commit->object.sha1), stdout); ofs += sprintf(buf + ofs, "%s",
sha1_to_hex(commit->object.sha1));
if (rev->parents) { if (rev->parents) {
struct commit_list *parents = commit->parents; struct commit_list *parents = commit->parents;
while (parents) { while (parents) {
@ -316,7 +319,8 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
parents = parents->next; parents = parents->next;
if (o->flags & TMP_MARK) if (o->flags & TMP_MARK)
continue; continue;
printf(" %s", sha1_to_hex(o->sha1)); ofs += sprintf(buf + ofs, " %s",
sha1_to_hex(o->sha1));
o->flags |= TMP_MARK; o->flags |= TMP_MARK;
} }
/* TMP_MARK is a general purpose flag that can /* TMP_MARK is a general purpose flag that can
@ -328,17 +332,20 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
parents = parents->next) parents = parents->next)
parents->item->object.flags &= ~TMP_MARK; parents->item->object.flags &= ~TMP_MARK;
} }
if (rev->commit_format == CMIT_FMT_ONELINE) buf[ofs++] =
putchar(' '); (rev->commit_format == CMIT_FMT_ONELINE) ? ' ' : '\n';
else ofs += pretty_print_commit(rev->commit_format, commit, ~0,
putchar('\n'); buf + ofs,
pretty_print_commit(rev->commit_format, commit, ~0, buf, LOGSIZE - ofs - 20,
LOGSIZE, rev->abbrev); rev->abbrev);
printf("%s\n", buf);
if (rev->diff) { if (rev->diff) {
printf("---\n"); rev->use_precomputed_header = buf;
strcpy(buf + ofs, "\n---\n");
log_tree_commit(rev, commit); log_tree_commit(rev, commit);
} }
else
printf("%s\n", buf);
shown = 1; shown = 1;
free(commit->buffer); free(commit->buffer);
commit->buffer = NULL; commit->buffer = NULL;
@ -376,6 +383,10 @@ static int cmd_log(int argc, const char **argv, char **envp)
struct rev_info rev; struct rev_info rev;
init_revisions(&rev); init_revisions(&rev);
rev.always_show_header = 1;
rev.diffopt.recursive = 1;
rev.combine_merges = 1;
rev.ignore_merges = 0;
return cmd_log_wc(argc, argv, envp, &rev); return cmd_log_wc(argc, argv, envp, &rev);
} }

3
log-tree.c
View File

@ -54,6 +54,9 @@ static const char *generate_header(struct rev_info *opt,
int abbrev = opt->diffopt.abbrev; int abbrev = opt->diffopt.abbrev;
const char *msg = commit->buffer; const char *msg = commit->buffer;
if (opt->use_precomputed_header)
return opt->use_precomputed_header;
if (!opt->verbose_header) if (!opt->verbose_header)
return sha1_to_hex(commit_sha1); return sha1_to_hex(commit_sha1);

1
revision.h
View File

@ -56,6 +56,7 @@ struct rev_info {
enum cmit_fmt commit_format; enum cmit_fmt commit_format;
const char *header_prefix; const char *header_prefix;
const char *header; const char *header;
const char *use_precomputed_header;
/* special limits */ /* special limits */
int max_count; int max_count;