auto-detect changed prefix and/or changed build flags
[git/spearce.git] / log-tree.c
blobebb49f29701b2435d66eb92fc2a5c382299e8ee8
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
4 #include "log-tree.h"
6 static void show_parents(struct commit *commit, int abbrev)
8 struct commit_list *p;
9 for (p = commit->parents; p ; p = p->next) {
10 struct commit *parent = p->item;
11 printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
15 static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
17 int signoff_len = strlen(signoff);
18 static const char signed_off_by[] = "Signed-off-by: ";
19 char *cp = buf;
21 /* Do we have enough space to add it? */
22 if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
23 return at;
25 /* First see if we already have the sign-off by the signer */
26 while (1) {
27 cp = strstr(cp, signed_off_by);
28 if (!cp)
29 break;
30 cp += strlen(signed_off_by);
31 if ((cp + signoff_len < buf + at) &&
32 !strncmp(cp, signoff, signoff_len) &&
33 isspace(cp[signoff_len]))
34 return at; /* we already have him */
37 strcpy(buf + at, signed_off_by);
38 at += strlen(signed_off_by);
39 strcpy(buf + at, signoff);
40 at += signoff_len;
41 buf[at++] = '\n';
42 buf[at] = 0;
43 return at;
46 void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
48 static char this_header[16384];
49 struct commit *commit = log->commit, *parent = log->parent;
50 int abbrev = opt->diffopt.abbrev;
51 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
52 const char *extra;
53 int len;
54 const char *subject = NULL, *extra_headers = opt->extra_headers;
56 opt->loginfo = NULL;
57 if (!opt->verbose_header) {
58 fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
59 if (opt->parents)
60 show_parents(commit, abbrev_commit);
61 putchar('\n');
62 return;
66 * The "oneline" format has several special cases:
67 * - The pretty-printed commit lacks a newline at the end
68 * of the buffer, but we do want to make sure that we
69 * have a newline there. If the separator isn't already
70 * a newline, add an extra one.
71 * - unlike other log messages, the one-line format does
72 * not have an empty line between entries.
74 extra = "";
75 if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
76 extra = "\n";
77 if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
78 putchar('\n');
79 opt->shown_one = 1;
82 * Print header line of header..
85 if (opt->commit_format == CMIT_FMT_EMAIL) {
86 char *sha1 = sha1_to_hex(commit->object.sha1);
87 if (opt->total > 0) {
88 static char buffer[64];
89 snprintf(buffer, sizeof(buffer),
90 "Subject: [PATCH %d/%d] ",
91 opt->nr, opt->total);
92 subject = buffer;
93 } else if (opt->total == 0)
94 subject = "Subject: [PATCH] ";
95 else
96 subject = "Subject: ";
98 printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
99 if (opt->mime_boundary) {
100 static char subject_buffer[1024];
101 static char buffer[1024];
102 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
103 "%s"
104 "MIME-Version: 1.0\n"
105 "Content-Type: multipart/mixed;\n"
106 " boundary=\"%s%s\"\n"
107 "\n"
108 "This is a multi-part message in MIME "
109 "format.\n"
110 "--%s%s\n"
111 "Content-Type: text/plain; "
112 "charset=UTF-8; format=fixed\n"
113 "Content-Transfer-Encoding: 8bit\n\n",
114 extra_headers ? extra_headers : "",
115 mime_boundary_leader, opt->mime_boundary,
116 mime_boundary_leader, opt->mime_boundary);
117 extra_headers = subject_buffer;
119 snprintf(buffer, sizeof(buffer) - 1,
120 "--%s%s\n"
121 "Content-Type: text/x-patch;\n"
122 " name=\"%s.diff\"\n"
123 "Content-Transfer-Encoding: 8bit\n"
124 "Content-Disposition: inline;\n"
125 " filename=\"%s.diff\"\n\n",
126 mime_boundary_leader, opt->mime_boundary,
127 sha1, sha1);
128 opt->diffopt.stat_sep = buffer;
130 } else {
131 printf("%s%s",
132 opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
133 diff_unique_abbrev(commit->object.sha1, abbrev_commit));
134 if (opt->parents)
135 show_parents(commit, abbrev_commit);
136 if (parent)
137 printf(" (from %s)",
138 diff_unique_abbrev(parent->object.sha1,
139 abbrev_commit));
140 putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
144 * And then the pretty-printed message itself
146 len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev, subject, extra_headers);
148 if (opt->add_signoff)
149 len = append_signoff(this_header, sizeof(this_header), len,
150 opt->add_signoff);
151 printf("%s%s%s", this_header, extra, sep);
154 int log_tree_diff_flush(struct rev_info *opt)
156 diffcore_std(&opt->diffopt);
158 if (diff_queue_is_empty()) {
159 int saved_fmt = opt->diffopt.output_format;
160 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
161 diff_flush(&opt->diffopt);
162 opt->diffopt.output_format = saved_fmt;
163 return 0;
166 if (opt->loginfo && !opt->no_commit_id)
167 show_log(opt, opt->loginfo, opt->diffopt.with_stat ? "---\n" : "\n");
168 diff_flush(&opt->diffopt);
169 return 1;
172 static int diff_root_tree(struct rev_info *opt,
173 const unsigned char *new, const char *base)
175 int retval;
176 void *tree;
177 struct tree_desc empty, real;
179 tree = read_object_with_reference(new, tree_type, &real.size, NULL);
180 if (!tree)
181 die("unable to read root tree (%s)", sha1_to_hex(new));
182 real.buf = tree;
184 empty.buf = "";
185 empty.size = 0;
186 retval = diff_tree(&empty, &real, base, &opt->diffopt);
187 free(tree);
188 log_tree_diff_flush(opt);
189 return retval;
192 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
194 unsigned const char *sha1 = commit->object.sha1;
196 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
197 return !opt->loginfo;
201 * Show the diff of a commit.
203 * Return true if we printed any log info messages
205 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
207 int showed_log;
208 struct commit_list *parents;
209 unsigned const char *sha1 = commit->object.sha1;
211 if (!opt->diff)
212 return 0;
214 /* Root commit? */
215 parents = commit->parents;
216 if (!parents) {
217 if (opt->show_root_diff)
218 diff_root_tree(opt, sha1, "");
219 return !opt->loginfo;
222 /* More than one parent? */
223 if (parents && parents->next) {
224 if (opt->ignore_merges)
225 return 0;
226 else if (opt->combine_merges)
227 return do_diff_combined(opt, commit);
229 /* If we show individual diffs, show the parent info */
230 log->parent = parents->item;
233 showed_log = 0;
234 for (;;) {
235 struct commit *parent = parents->item;
237 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
238 log_tree_diff_flush(opt);
240 showed_log |= !opt->loginfo;
242 /* Set up the log info for the next parent, if any.. */
243 parents = parents->next;
244 if (!parents)
245 break;
246 log->parent = parents->item;
247 opt->loginfo = log;
249 return showed_log;
252 int log_tree_commit(struct rev_info *opt, struct commit *commit)
254 struct log_info log;
255 int shown;
257 log.commit = commit;
258 log.parent = NULL;
259 opt->loginfo = &log;
261 shown = log_tree_diff(opt, commit, &log);
262 if (!shown && opt->loginfo && opt->always_show_header) {
263 log.parent = NULL;
264 show_log(opt, opt->loginfo, "");
265 shown = 1;
267 opt->loginfo = NULL;
268 return shown;