summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-17 11:59:32 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-17 15:18:25 -0700
commit9153983310a169a340bd1023dccafd80b70b05bc (patch)
tree42e14e263a3e5ff3897cdba623d1d46d59e8c88a /revision.h
parentdb89665fbf86d4e0166b2f252a939ed8bf6782fe (diff)
downloadgit-9153983310a169a340bd1023dccafd80b70b05bc.tar.gz
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 'revision.h')
-rw-r--r--revision.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/revision.h b/revision.h
index 74dc5ef179..05f658a214 100644
--- a/revision.h
+++ b/revision.h
@@ -10,6 +10,7 @@
#define ADDED (1u<<6) /* Parents already parsed and added? */
struct rev_info;
+struct log_info;
typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
@@ -51,12 +52,11 @@ struct rev_info {
always_show_header:1;
/* Format info */
- unsigned int abbrev_commit:1;
+ unsigned int shown_one:1,
+ abbrev_commit:1;
unsigned int abbrev;
enum cmit_fmt commit_format;
- const char *header_prefix;
- const char *header;
- const char *use_precomputed_header;
+ struct log_info *loginfo;
/* special limits */
int max_count;