6 void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
8 static char this_header[16384];
9 struct commit *commit = log->commit, *parent = log->parent;
10 int abbrev = opt->diffopt.abbrev;
11 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
16 if (!opt->verbose_header) {
17 puts(sha1_to_hex(commit->object.sha1));
22 * The "oneline" format has several special cases:
23 * - The pretty-printed commit lacks a newline at the end
24 * of the buffer, but we do want to make sure that we
25 * have a newline there. If the separator isn't already
26 * a newline, add an extra one.
27 * - unlike other log messages, the one-line format does
28 * not have an empty line between entries.
31 if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
33 if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
38 * Print header line of header..
41 if (opt->commit_format == CMIT_FMT_EMAIL)
42 printf("From %s Thu Apr 7 15:13:13 2005\n",
43 sha1_to_hex(commit->object.sha1));
46 opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
47 diff_unique_abbrev(commit->object.sha1, abbrev_commit));
50 diff_unique_abbrev(parent->object.sha1,
52 putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
56 * And then the pretty-printed message itself
58 len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev);
59 printf("%s%s%s", this_header, extra, sep);
62 int log_tree_diff_flush(struct rev_info *opt)
64 diffcore_std(&opt->diffopt);
66 if (diff_queue_is_empty()) {
67 int saved_fmt = opt->diffopt.output_format;
68 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
69 diff_flush(&opt->diffopt);
70 opt->diffopt.output_format = saved_fmt;
74 if (opt->loginfo && !opt->no_commit_id)
75 show_log(opt, opt->loginfo, opt->diffopt.with_stat ? "---\n" : "\n");
76 diff_flush(&opt->diffopt);
80 static int diff_root_tree(struct rev_info *opt,
81 const unsigned char *new, const char *base)
85 struct tree_desc empty, real;
87 tree = read_object_with_reference(new, tree_type, &real.size, NULL);
89 die("unable to read root tree (%s)", sha1_to_hex(new));
94 retval = diff_tree(&empty, &real, base, &opt->diffopt);
96 log_tree_diff_flush(opt);
100 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
102 unsigned const char *sha1 = commit->object.sha1;
104 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
105 return !opt->loginfo;
109 * Show the diff of a commit.
111 * Return true if we printed any log info messages
113 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
116 struct commit_list *parents;
117 unsigned const char *sha1 = commit->object.sha1;
123 parents = commit->parents;
125 if (opt->show_root_diff)
126 diff_root_tree(opt, sha1, "");
127 return !opt->loginfo;
130 /* More than one parent? */
131 if (parents && parents->next) {
132 if (opt->ignore_merges)
134 else if (opt->combine_merges)
135 return do_diff_combined(opt, commit);
137 /* If we show individual diffs, show the parent info */
138 log->parent = parents->item;
143 struct commit *parent = parents->item;
145 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
146 log_tree_diff_flush(opt);
148 showed_log |= !opt->loginfo;
150 /* Set up the log info for the next parent, if any.. */
151 parents = parents->next;
154 log->parent = parents->item;
160 int log_tree_commit(struct rev_info *opt, struct commit *commit)
169 shown = log_tree_diff(opt, commit, &log);
170 if (!shown && opt->loginfo && opt->always_show_header) {
172 show_log(opt, opt->loginfo, "");