Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 559 lines (501 sloc) 14.414 kb
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
4 #include "tag.h"
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
5 #include "graph.h"
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
6 #include "log-tree.h"
8860fd42 » dscho
2007-01-11 Teach the revision walker to walk by reflogs with --walk-reflogs
7 #include "reflog-walk.h"
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
8 #include "refs.h"
b079c50e » trast
2009-02-19 format-patch: track several references
9 #include "string-list.h"
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
10
ca135e7a » torvalds
2007-04-16 Add support for "commit name decorations" to log family of commands
11 struct decoration name_decoration = { "object names" };
12
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
13 static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
14 {
15 int plen = strlen(prefix);
16 int nlen = strlen(name);
17 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + plen + nlen);
18 memcpy(res->name, prefix, plen);
19 memcpy(res->name + plen, name, nlen + 1);
20 res->next = add_decoration(&name_decoration, obj, res);
21 }
22
23 static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
24 {
25 struct object *obj = parse_object(sha1);
26 if (!obj)
27 return 0;
33e7018c » Lars Hjemli
2009-08-15 git-log: allow --decorate[=short|full]
28 if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
29 refname = prettify_refname(refname);
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
30 add_name_decoration("", refname, obj);
31 while (obj->type == OBJ_TAG) {
32 obj = ((struct tag *)obj)->tagged;
33 if (!obj)
34 break;
35 add_name_decoration("tag: ", refname, obj);
36 }
37 return 0;
38 }
39
33e7018c » Lars Hjemli
2009-08-15 git-log: allow --decorate[=short|full]
40 void load_ref_decorations(int flags)
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
41 {
42 static int loaded;
43 if (!loaded) {
44 loaded = 1;
33e7018c » Lars Hjemli
2009-08-15 git-log: allow --decorate[=short|full]
45 for_each_ref(add_ref_decoration, &flags);
77abcbdc » trast
2009-10-12 Let --decorate show HEAD position
46 head_ref(add_ref_decoration, &flags);
cab4feb6 » René Scharfe
2008-09-04 move load_ref_decorations() to log-tree.c and export it
47 }
48 }
49
c8c893c6 » Linus Torvalds
2006-05-03 Fix "git-log --parents" breakage post v1.3.0
50 static void show_parents(struct commit *commit, int abbrev)
51 {
52 struct commit_list *p;
53 for (p = commit->parents; p ; p = p->next) {
54 struct commit *parent = p->item;
7fcda920 » trast
2009-02-13 log: do not print ellipses with --abbrev-commit
55 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
c8c893c6 » Linus Torvalds
2006-05-03 Fix "git-log --parents" breakage post v1.3.0
56 }
57 }
58
0f3a290b » torvalds
2008-10-27 Add a 'source' decorator for commits
59 void show_decorations(struct rev_info *opt, struct commit *commit)
ca135e7a » torvalds
2007-04-16 Add support for "commit name decorations" to log family of commands
60 {
61 const char *prefix;
62 struct name_decoration *decoration;
63
0f3a290b » torvalds
2008-10-27 Add a 'source' decorator for commits
64 if (opt->show_source && commit->util)
8c4021ab » torvalds
2008-11-15 Fix machine-parseability of 'git log --source'
65 printf("\t%s", (char *) commit->util);
d467a525 » torvalds
2008-11-03 Make '--decorate' set an explicit 'show_decorations' flag
66 if (!opt->show_decorations)
67 return;
ca135e7a » torvalds
2007-04-16 Add support for "commit name decorations" to log family of commands
68 decoration = lookup_decoration(&name_decoration, &commit->object);
69 if (!decoration)
70 return;
71 prefix = " (";
72 while (decoration) {
73 printf("%s%s", prefix, decoration->name);
74 prefix = ", ";
75 decoration = decoration->next;
76 }
77 putchar(')');
78 }
79
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
80 /*
81 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
82 * Signed-off-by: and Acked-by: lines.
83 */
84 static int detect_any_signoff(char *letter, int size)
85 {
fd13b21f » d0k
2009-03-07 Move local variables to narrower scopes
86 char *cp;
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
87 int seen_colon = 0;
88 int seen_at = 0;
89 int seen_name = 0;
90 int seen_head = 0;
91
92 cp = letter + size;
fd13b21f » d0k
2009-03-07 Move local variables to narrower scopes
93 while (letter <= --cp && *cp == '\n')
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
94 continue;
95
96 while (letter <= cp) {
fd13b21f » d0k
2009-03-07 Move local variables to narrower scopes
97 char ch = *cp--;
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
98 if (ch == '\n')
99 break;
100
101 if (!seen_at) {
102 if (ch == '@')
103 seen_at = 1;
104 continue;
105 }
106 if (!seen_colon) {
107 if (ch == '@')
108 return 0;
109 else if (ch == ':')
110 seen_colon = 1;
111 else
112 seen_name = 1;
113 continue;
114 }
115 if (('A' <= ch && ch <= 'Z') ||
116 ('a' <= ch && ch <= 'z') ||
117 ch == '-') {
118 seen_head = 1;
119 continue;
120 }
121 /* no empty last line doesn't match */
122 return 0;
123 }
124 return seen_head && seen_name;
125 }
126
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
127 static void append_signoff(struct strbuf *sb, const char *signoff)
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
128 {
129 static const char signed_off_by[] = "Signed-off-by: ";
80583c0e » gitster
2007-06-11 Lift 16kB limit of log message output
130 size_t signoff_len = strlen(signoff);
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
131 int has_signoff = 0;
80583c0e » gitster
2007-06-11 Lift 16kB limit of log message output
132 char *cp;
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
133
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
134 cp = sb->buf;
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
135
136 /* First see if we already have the sign-off by the signer */
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
137 while ((cp = strstr(cp, signed_off_by))) {
138
139 has_signoff = 1;
140
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
141 cp += strlen(signed_off_by);
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
142 if (cp + signoff_len >= sb->buf + sb->len)
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
143 break;
144 if (strncmp(cp, signoff, signoff_len))
145 continue;
146 if (!isspace(cp[signoff_len]))
147 continue;
148 /* we already have him */
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
149 return;
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
150 }
151
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
152 if (!has_signoff)
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
153 has_signoff = detect_any_signoff(sb->buf, sb->len);
fc1c75ec » Franck Bui-Huu
2006-08-29 log-tree.c: cleanup a bit append_signoff()
154
155 if (!has_signoff)
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
156 strbuf_addch(sb, '\n');
c35f4c37 » Franck Bui-Huu
2006-08-13 Add a newline before appending "Signed-off-by: " line
157
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
158 strbuf_addstr(sb, signed_off_by);
159 strbuf_add(sb, signoff, signoff_len);
160 strbuf_addch(sb, '\n');
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
161 }
162
e00de24b » dscho
2007-02-09 format-patch -n: make sorting easier by padding number
163 static unsigned int digits_in_number(unsigned int number)
164 {
165 unsigned int i = 10, result = 1;
166 while (i <= number) {
167 i *= 10;
168 result++;
169 }
170 return result;
171 }
172
6fa8e627 » bebarino
2009-03-22 format-patch: move get_patch_filename() into log-tree
173 void get_patch_filename(struct commit *commit, int nr, const char *suffix,
174 struct strbuf *buf)
175 {
176 int suffix_len = strlen(suffix) + 1;
177 int start_len = buf->len;
178
179 strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
180 if (commit) {
b09b868f » chriscool
2009-03-27 log-tree: fix patch filename computation in "git format-patch"
181 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
182 struct pretty_print_context ctx = {0};
183 ctx.date_mode = DATE_NORMAL;
b09b868f » chriscool
2009-03-27 log-tree: fix patch filename computation in "git format-patch"
184
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
185 format_commit_message(commit, "%f", buf, &ctx);
b09b868f » chriscool
2009-03-27 log-tree: fix patch filename computation in "git format-patch"
186 if (max_len < buf->len)
187 strbuf_setlen(buf, max_len);
188 strbuf_addstr(buf, suffix);
6fa8e627 » bebarino
2009-03-22 format-patch: move get_patch_filename() into log-tree
189 }
190 }
191
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
192 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
267123b4 » gitster
2008-03-15 Merge branch 'maint'
193 const char **subject_p,
194 const char **extra_headers_p,
195 int *need_8bit_cte_p)
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
196 {
197 const char *subject = NULL;
198 const char *extra_headers = opt->extra_headers;
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
199 const char *name = sha1_to_hex(commit->object.sha1);
267123b4 » gitster
2008-03-15 Merge branch 'maint'
200
201 *need_8bit_cte_p = 0; /* unknown */
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
202 if (opt->total > 0) {
203 static char buffer[64];
204 snprintf(buffer, sizeof(buffer),
205 "Subject: [%s %0*d/%d] ",
206 opt->subject_prefix,
207 digits_in_number(opt->total),
208 opt->nr, opt->total);
209 subject = buffer;
210 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
211 static char buffer[256];
212 snprintf(buffer, sizeof(buffer),
213 "Subject: [%s] ",
214 opt->subject_prefix);
215 subject = buffer;
216 } else {
217 subject = "Subject: ";
218 }
219
220 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
221 graph_show_oneline(opt->graph);
222 if (opt->message_id) {
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
223 printf("Message-Id: <%s>\n", opt->message_id);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
224 graph_show_oneline(opt->graph);
225 }
b079c50e » trast
2009-02-19 format-patch: track several references
226 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
227 int i, n;
228 n = opt->ref_message_ids->nr;
229 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
230 for (i = 0; i < n; i++)
231 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
232 opt->ref_message_ids->items[i].string);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
233 graph_show_oneline(opt->graph);
234 }
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
235 if (opt->mime_boundary) {
236 static char subject_buffer[1024];
237 static char buffer[1024];
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
238 struct strbuf filename = STRBUF_INIT;
267123b4 » gitster
2008-03-15 Merge branch 'maint'
239 *need_8bit_cte_p = -1; /* NEVER */
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
240 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
241 "%s"
242 "MIME-Version: 1.0\n"
243 "Content-Type: multipart/mixed;"
244 " boundary=\"%s%s\"\n"
245 "\n"
246 "This is a multi-part message in MIME "
247 "format.\n"
248 "--%s%s\n"
249 "Content-Type: text/plain; "
250 "charset=UTF-8; format=fixed\n"
251 "Content-Transfer-Encoding: 8bit\n\n",
252 extra_headers ? extra_headers : "",
253 mime_boundary_leader, opt->mime_boundary,
254 mime_boundary_leader, opt->mime_boundary);
255 extra_headers = subject_buffer;
256
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
257 get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
258 opt->patch_suffix, &filename);
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
259 snprintf(buffer, sizeof(buffer) - 1,
6b2fbaaf » kballard
2008-07-29 format-patch: Produce better output with --inline or --attach
260 "\n--%s%s\n"
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
261 "Content-Type: text/x-patch;"
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
262 " name=\"%s\"\n"
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
263 "Content-Transfer-Encoding: 8bit\n"
264 "Content-Disposition: %s;"
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
265 " filename=\"%s\"\n\n",
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
266 mime_boundary_leader, opt->mime_boundary,
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
267 filename.buf,
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
268 opt->no_inline ? "attachment" : "inline",
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
269 filename.buf);
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
270 opt->diffopt.stat_sep = buffer;
108dab28 » bebarino
2009-03-22 format-patch: --attach/inline uses filename instead of SHA1
271 strbuf_release(&filename);
b02bd65f » Daniel Barkalow
2008-02-18 Export some email and pretty-printing functions
272 }
273 *subject_p = subject;
274 *extra_headers_p = extra_headers;
275 }
276
02865655 » simpkins
2008-04-29 Remove dead code: show_log() sep argument and diff_options.msg_sep
277 void show_log(struct rev_info *opt)
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
278 {
f285a2d7 » Brandon Casey
2008-10-09 Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
279 struct strbuf msgbuf = STRBUF_INIT;
39bc9a6c » tihirvon
2006-06-25 Add msg_sep to diff_options
280 struct log_info *log = opt->loginfo;
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
281 struct commit *commit = log->commit, *parent = log->parent;
282 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
283 const char *extra_headers = opt->extra_headers;
284 struct pretty_print_context ctx = {0};
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
285
286 opt->loginfo = NULL;
66b2ed09 » gitster
2010-01-20 Fix "log" family not to be too agressive about showing notes
287 ctx.show_notes = opt->show_notes;
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
288 if (!opt->verbose_header) {
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
289 graph_show_commit(opt->graph);
290
7528f27d » simpkins
2008-05-25 log --graph --left-right: show left/right information in place of '*'
291 if (!opt->graph) {
292 if (commit->object.flags & BOUNDARY)
293 putchar('-');
294 else if (commit->object.flags & UNINTERESTING)
295 putchar('^');
296 else if (opt->left_right) {
297 if (commit->object.flags & SYMMETRIC_LEFT)
298 putchar('<');
299 else
300 putchar('>');
301 }
74bd9029 » Junio C Hamano
2006-12-16 Teach all of log family --left-right output.
302 }
7fcda920 » trast
2009-02-13 log: do not print ellipses with --abbrev-commit
303 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
885cf808 » simpkins
2008-05-04 revision API: split parent rewriting and parent printing options
304 if (opt->print_parents)
c8c893c6 » Linus Torvalds
2006-05-03 Fix "git-log --parents" breakage post v1.3.0
305 show_parents(commit, abbrev_commit);
0f3a290b » torvalds
2008-10-27 Add a 'source' decorator for commits
306 show_decorations(opt, commit);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
307 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
308 putchar('\n');
309 graph_show_remainder(opt->graph);
310 }
1dcb6922 » pugmajere
2006-08-07 log-tree: show_log() should respect the setting of diffopt->line_term…
311 putchar(opt->diffopt.line_termination);
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
312 return;
313 }
314
315 /*
8715227d » peff
2009-07-01 log-tree: fix confusing comment
316 * If use_terminator is set, we already handled any record termination
317 * at the end of the last record.
02865655 » simpkins
2008-04-29 Remove dead code: show_log() sep argument and diff_options.msg_sep
318 * Otherwise, add a diffopt.line_termination character before all
319 * entries but the first. (IOW, as a separator between entries)
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
320 */
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
321 if (opt->shown_one && !opt->use_terminator) {
322 /*
323 * If entries are separated by a newline, the output
324 * should look human-readable. If the last entry ended
325 * with a newline, print the graph output before this
326 * newline. Otherwise it will end up as a completely blank
327 * line and will look like a gap in the graph.
328 *
329 * If the entry separator is not a newline, the output is
330 * primarily intended for programmatic consumption, and we
331 * never want the extra graph output before the entry
332 * separator.
333 */
334 if (opt->diffopt.line_termination == '\n' &&
335 !opt->missing_newline)
336 graph_show_padding(opt->graph);
abd4e222 » torvalds
2007-02-07 Fix "git log -z" behaviour
337 putchar(opt->diffopt.line_termination);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
338 }
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
339 opt->shown_one = 1;
340
341 /*
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
342 * If the history graph was requested,
343 * print the graph, up to this commit's line
344 */
345 graph_show_commit(opt->graph);
346
347 /*
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
348 * Print header line of header..
349 */
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
350
596524b3 » dscho
2006-05-05 Teach fmt-patch about --numbered
351 if (opt->commit_format == CMIT_FMT_EMAIL) {
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
352 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
353 &ctx.need_8bit_cte);
e52a5de4 » dscho
2007-02-23 pretty-formats: add 'format:<string>'
354 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
8f67f8ae » MadCoder
2007-11-10 Make the diff_options bitfields be an unsigned with explicit masks.
355 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
74bd9029 » Junio C Hamano
2006-12-16 Teach all of log family --left-right output.
356 if (opt->commit_format != CMIT_FMT_ONELINE)
357 fputs("commit ", stdout);
7528f27d » simpkins
2008-05-25 log --graph --left-right: show left/right information in place of '*'
358
359 if (!opt->graph) {
360 if (commit->object.flags & BOUNDARY)
361 putchar('-');
362 else if (commit->object.flags & UNINTERESTING)
363 putchar('^');
364 else if (opt->left_right) {
365 if (commit->object.flags & SYMMETRIC_LEFT)
366 putchar('<');
367 else
368 putchar('>');
369 }
74bd9029 » Junio C Hamano
2006-12-16 Teach all of log family --left-right output.
370 }
7fcda920 » trast
2009-02-13 log: do not print ellipses with --abbrev-commit
371 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
74bd9029 » Junio C Hamano
2006-12-16 Teach all of log family --left-right output.
372 stdout);
885cf808 » simpkins
2008-05-04 revision API: split parent rewriting and parent printing options
373 if (opt->print_parents)
c66b6c06 » Junio C Hamano
2006-05-06 Merge branch 'master' into js/fmt-patch
374 show_parents(commit, abbrev_commit);
73f0a157 » Junio C Hamano
2006-05-24 Merge branch 'js/fmt-patch'
375 if (parent)
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
376 printf(" (from %s)",
7fcda920 » trast
2009-02-13 log: do not print ellipses with --abbrev-commit
377 find_unique_abbrev(parent->object.sha1,
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
378 abbrev_commit));
0f3a290b » torvalds
2008-10-27 Add a 'source' decorator for commits
379 show_decorations(opt, commit);
8f67f8ae » MadCoder
2007-11-10 Make the diff_options bitfields be an unsigned with explicit masks.
380 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
381 if (opt->commit_format == CMIT_FMT_ONELINE) {
382 putchar(' ');
383 } else {
384 putchar('\n');
385 graph_show_oneline(opt->graph);
386 }
903b45fe » Nicolas Pitre
2007-01-27 git-log -g --pretty=oneline should display the reflog message
387 if (opt->reflog_info) {
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
388 /*
389 * setup_revisions() ensures that opt->reflog_info
390 * and opt->graph cannot both be set,
391 * so we don't need to worry about printing the
392 * graph info here.
393 */
4d12a471 » Junio C Hamano
2007-01-20 Fix --walk-reflog with --pretty=oneline
394 show_reflog_message(opt->reflog_info,
4e244cbc » dscho
2007-02-08 log --reflog: honour --relative-date
395 opt->commit_format == CMIT_FMT_ONELINE,
f4ea32f0 » peff
2009-09-24 improve reflog date/number heuristic
396 opt->date_mode_explicit ?
397 opt->date_mode :
398 DATE_NORMAL);
02865655 » simpkins
2008-04-29 Remove dead code: show_log() sep argument and diff_options.msg_sep
399 if (opt->commit_format == CMIT_FMT_ONELINE)
903b45fe » Nicolas Pitre
2007-01-27 git-log -g --pretty=oneline should display the reflog message
400 return;
401 }
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
402 }
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
403
3131b713 » torvalds
2008-02-09 Add "--show-all" revision walker flag for debugging
404 if (!commit->buffer)
405 return;
406
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
407 /*
408 * And then the pretty-printed message itself
409 */
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
410 if (ctx.need_8bit_cte >= 0)
411 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
412 ctx.date_mode = opt->date_mode;
413 ctx.abbrev = opt->diffopt.abbrev;
414 ctx.after_subject = extra_headers;
8f8f5476 » trast
2009-10-19 Introduce new pretty formats %g[sdD] for reflog information
415 ctx.reflog_info = opt->reflog_info;
dd2e794a » trast
2009-10-19 Refactor pretty_print_commit arguments into a struct
416 pretty_print_commit(opt->commit_format, commit, &msgbuf, &ctx);
cf2251b6 » Junio C Hamano
2006-05-31 format-patch --signoff
417
418 if (opt->add_signoff)
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
419 append_signoff(&msgbuf, opt->add_signoff);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
420 if (opt->show_log_size) {
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
421 printf("log size %i\n", (int)msgbuf.len);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
422 graph_show_oneline(opt->graph);
423 }
9fa3465d » mcostalba
2007-07-20 Add --log-size to git log to print message size
424
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
425 /*
426 * Set opt->missing_newline if msgbuf doesn't
427 * end in a newline (including if it is empty)
428 */
429 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
430 opt->missing_newline = 1;
431 else
432 opt->missing_newline = 0;
433
434 if (opt->graph)
435 graph_show_commit_msg(opt->graph, &msgbuf);
436 else
42c8c74c » Govind Salinas
2008-03-21 pretty.c: add %x00 format specifier.
437 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
438 if (opt->use_terminator) {
439 if (!opt->missing_newline)
440 graph_show_padding(opt->graph);
9b58bfe8 » simpkins
2008-04-29 log: print log entry terminator even if the message is empty
441 putchar('\n');
7fefda5c » simpkins
2008-05-04 log and rev-list: add --graph option
442 }
443
674d1727 » MadCoder
2007-09-10 Rework pretty_print_commit to use strbufs instead of custom buffers.
444 strbuf_release(&msgbuf);
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
445 }
446
cd2bdc53 » Linus Torvalds
2006-04-14 Common option parsing for "git log --diff" and friends
447 int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
448 {
449 diffcore_std(&opt->diffopt);
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
450
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
451 if (diff_queue_is_empty()) {
452 int saved_fmt = opt->diffopt.output_format;
453 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
454 diff_flush(&opt->diffopt);
455 opt->diffopt.output_format = saved_fmt;
456 return 0;
457 }
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
458
3969cf7d » Junio C Hamano
2006-06-27 Fix some more diff options changes.
459 if (opt->loginfo && !opt->no_commit_id) {
460 /* When showing a verbose header (i.e. log message),
461 * and not in --pretty=oneline format, we would want
462 * an extra newline between the end of log and the
463 * output for readability.
464 */
02865655 » simpkins
2008-04-29 Remove dead code: show_log() sep argument and diff_options.msg_sep
465 show_log(opt);
304b5af6 » torvalds
2007-10-09 Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
466 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
467 opt->verbose_header &&
3969cf7d » Junio C Hamano
2006-06-27 Fix some more diff options changes.
468 opt->commit_format != CMIT_FMT_ONELINE) {
469 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
470 if ((pch & opt->diffopt.output_format) == pch)
abd4e222 » torvalds
2007-02-07 Fix "git log -z" behaviour
471 printf("---");
472 putchar('\n');
3969cf7d » Junio C Hamano
2006-06-27 Fix some more diff options changes.
473 }
474 }
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
475 diff_flush(&opt->diffopt);
476 return 1;
477 }
478
cd2bdc53 » Linus Torvalds
2006-04-14 Common option parsing for "git log --diff" and friends
479 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
480 {
481 unsigned const char *sha1 = commit->object.sha1;
482
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
483 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
484 return !opt->loginfo;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
485 }
486
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
487 /*
488 * Show the diff of a commit.
489 *
490 * Return true if we printed any log info messages
491 */
492 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
493 {
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
494 int showed_log;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
495 struct commit_list *parents;
496 unsigned const char *sha1 = commit->object.sha1;
497
84102a33 » pmorch
2008-08-11 Teach git log --exit-code to return an appropriate exit code
498 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
499 return 0;
500
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
501 /* Root commit? */
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
502 parents = commit->parents;
503 if (!parents) {
2b60356d » Rene Scharfe
2006-10-26 Make git-cherry handle root trees
504 if (opt->show_root_diff) {
505 diff_root_tree_sha1(sha1, "", &opt->diffopt);
506 log_tree_diff_flush(opt);
507 }
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
508 return !opt->loginfo;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
509 }
510
511 /* More than one parent? */
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
512 if (parents && parents->next) {
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
513 if (opt->ignore_merges)
514 return 0;
515 else if (opt->combine_merges)
516 return do_diff_combined(opt, commit);
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
517
518 /* If we show individual diffs, show the parent info */
519 log->parent = parents->item;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
520 }
521
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
522 showed_log = 0;
523 for (;;) {
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
524 struct commit *parent = parents->item;
525
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
526 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
527 log_tree_diff_flush(opt);
528
529 showed_log |= !opt->loginfo;
530
531 /* Set up the log info for the next parent, if any.. */
532 parents = parents->next;
533 if (!parents)
534 break;
535 log->parent = parents->item;
536 opt->loginfo = log;
537 }
538 return showed_log;
539 }
540
541 int log_tree_commit(struct rev_info *opt, struct commit *commit)
542 {
543 struct log_info log;
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
544 int shown;
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
545
546 log.commit = commit;
547 log.parent = NULL;
548 opt->loginfo = &log;
549
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
550 shown = log_tree_diff(opt, commit, &log);
551 if (!shown && opt->loginfo && opt->always_show_header) {
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
552 log.parent = NULL;
02865655 » simpkins
2008-04-29 Remove dead code: show_log() sep argument and diff_options.msg_sep
553 show_log(opt);
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
554 shown = 1;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
555 }
91539833 » Linus Torvalds
2006-04-17 Log message printout cleanups
556 opt->loginfo = NULL;
06f59e9f » tytso
2007-06-29 Don't fflush(stdout) when it's not helpful
557 maybe_flush_or_die(stdout, "stdout");
3eefc189 » Junio C Hamano
2006-04-18 Tentative built-in format-patch.
558 return shown;
5f1c3f07 » Junio C Hamano
2006-04-09 log-tree: separate major part of diff-tree.
559 }
Something went wrong with that request. Please try again.