summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-17 18:59:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-17 22:18:25 (GMT)
commit9153983310a169a340bd1023dccafd80b70b05bc (patch)
tree42e14e263a3e5ff3897cdba623d1d46d59e8c88a /git.c
parentdb89665fbf86d4e0166b2f252a939ed8bf6782fe (diff)
downloadgit-9153983310a169a340bd1023dccafd80b70b05bc.zip
git-9153983310a169a340bd1023dccafd80b70b05bc.tar.gz
git-9153983310a169a340bd1023dccafd80b70b05bc.tar.bz2
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote: > > In the mid-term, I am hoping we can drop the generate_header() > callchain _and_ the custom code that formats commit log in-core, > found in cmd_log_wc(). Ok, this was nastier than expected, just because the dependencies between the different log-printing stuff were absolutely _everywhere_, but here's a patch that does exactly that. The patch is not very easy to read, and the "--patch-with-stat" thing is still broken (it does not call the "show_log()" thing properly for merges). That's not a new bug. In the new world order it _should_ do something like if (rev->logopt) show_log(rev, rev->logopt, "---\n"); but it doesn't. I haven't looked at the --with-stat logic, so I left it alone. That said, this patch removes more lines than it adds, and in particular, the "cmd_log_wc()" loop is now a very clean: while ((commit = get_revision(rev)) != NULL) { log_tree_commit(rev, commit); free(commit->buffer); commit->buffer = NULL; } so it doesn't get much prettier than this. All the complexity is entirely hidden in log-tree.c, and any code that needs to flush the log literally just needs to do the "if (rev->logopt) show_log(...)" incantation. I had to make the combined_diff() logic take a "struct rev_info" instead of just a "struct diff_options", but that part is pretty clean. This does change "git whatchanged" from using "diff-tree" as the commit descriptor to "commit", and I changed one of the tests to reflect that new reality. Otherwise everything still passes, and my other tests look fine too. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.c')
-rw-r--r--git.c57
1 files changed, 2 insertions, 55 deletions
diff --git a/git.c b/git.c
index fc4e429..016fa30 100644
--- a/git.c
+++ b/git.c
@@ -282,75 +282,22 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
struct rev_info *rev)
{
struct commit *commit;
- char *buf = xmalloc(LOGSIZE);
- const char *commit_prefix = "commit ";
- int shown = 0;
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
+ rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD");
if (argc > 1)
die("unrecognized argument: %s", argv[1]);
- if (rev->commit_format == CMIT_FMT_ONELINE)
- commit_prefix = "";
prepare_revision_walk(rev);
setup_pager();
while ((commit = get_revision(rev)) != NULL) {
- unsigned long ofs = 0;
-
- if (shown && rev->diff &&
- rev->commit_format != CMIT_FMT_ONELINE)
- putchar('\n');
-
- ofs = sprintf(buf, "%s", commit_prefix);
- if (rev->abbrev_commit && rev->abbrev)
- ofs += sprintf(buf + ofs, "%s",
- find_unique_abbrev(commit->object.sha1,
- rev->abbrev));
- else
- ofs += sprintf(buf + ofs, "%s",
- sha1_to_hex(commit->object.sha1));
- if (rev->parents) {
- struct commit_list *parents = commit->parents;
- while (parents) {
- struct object *o = &(parents->item->object);
- parents = parents->next;
- if (o->flags & TMP_MARK)
- continue;
- ofs += sprintf(buf + ofs, " %s",
- sha1_to_hex(o->sha1));
- o->flags |= TMP_MARK;
- }
- /* TMP_MARK is a general purpose flag that can
- * be used locally, but the user should clean
- * things up after it is done with them.
- */
- for (parents = commit->parents;
- parents;
- parents = parents->next)
- parents->item->object.flags &= ~TMP_MARK;
- }
- buf[ofs++] =
- (rev->commit_format == CMIT_FMT_ONELINE) ? ' ' : '\n';
- ofs += pretty_print_commit(rev->commit_format, commit, ~0,
- buf + ofs,
- LOGSIZE - ofs - 20,
- rev->abbrev);
-
- if (rev->diff) {
- rev->use_precomputed_header = buf;
- strcpy(buf + ofs, "\n---\n");
- log_tree_commit(rev, commit);
- }
- else
- printf("%s\n", buf);
- shown = 1;
+ log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
- free(buf);
return 0;
}