]>
git.ipfire.org Git - thirdparty/git.git/blob - log-tree.c
6 static void show_parents(struct commit
*commit
, int abbrev
)
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: ";
21 /* Do we have enough space to add it? */
22 if (buf_sz
- at
<= strlen(signed_off_by
) + signoff_len
+ 2)
25 /* First see if we already have the sign-off by the signer */
27 cp
= strstr(cp
, signed_off_by
);
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
);
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;
54 char *subject
= NULL
, *after_subject
= NULL
;
57 if (!opt
->verbose_header
) {
58 fputs(diff_unique_abbrev(commit
->object
.sha1
, abbrev_commit
), stdout
);
60 show_parents(commit
, abbrev_commit
);
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.
75 if (*sep
!= '\n' && opt
->commit_format
== CMIT_FMT_ONELINE
)
77 if (opt
->shown_one
&& opt
->commit_format
!= CMIT_FMT_ONELINE
)
82 * Print header line of header..
85 if (opt
->commit_format
== CMIT_FMT_EMAIL
) {
86 char *sha1
= sha1_to_hex(commit
->object
.sha1
);
88 static char buffer
[64];
89 snprintf(buffer
, sizeof(buffer
),
90 "Subject: [PATCH %d/%d] ",
93 } else if (opt
->total
== 0)
94 subject
= "Subject: [PATCH] ";
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 "MIME-Version: 1.0\n"
104 "Content-Type: multipart/mixed;\n"
105 " boundary=\"%s%s\"\n"
107 "This is a multi-part message in MIME "
110 "Content-Type: text/plain; "
111 "charset=UTF-8; format=fixed\n"
112 "Content-Transfer-Encoding: 8bit\n\n",
113 mime_boundary_leader
, opt
->mime_boundary
,
114 mime_boundary_leader
, opt
->mime_boundary
);
115 after_subject
= subject_buffer
;
117 snprintf(buffer
, sizeof(buffer
) - 1,
119 "Content-Type: text/x-patch;\n"
120 " name=\"%s.diff\"\n"
121 "Content-Transfer-Encoding: 8bit\n"
122 "Content-Disposition: inline;\n"
123 " filename=\"%s.diff\"\n\n",
124 mime_boundary_leader
, opt
->mime_boundary
,
126 opt
->diffopt
.stat_sep
= buffer
;
130 opt
->commit_format
== CMIT_FMT_ONELINE
? "" : "commit ",
131 diff_unique_abbrev(commit
->object
.sha1
, abbrev_commit
));
133 show_parents(commit
, abbrev_commit
);
136 diff_unique_abbrev(parent
->object
.sha1
,
138 putchar(opt
->commit_format
== CMIT_FMT_ONELINE
? ' ' : '\n');
142 * And then the pretty-printed message itself
144 len
= pretty_print_commit(opt
->commit_format
, commit
, ~0u, this_header
, sizeof(this_header
), abbrev
, subject
, after_subject
);
146 if (opt
->add_signoff
)
147 len
= append_signoff(this_header
, sizeof(this_header
), len
,
149 printf("%s%s%s", this_header
, extra
, sep
);
152 int log_tree_diff_flush(struct rev_info
*opt
)
154 diffcore_std(&opt
->diffopt
);
156 if (diff_queue_is_empty()) {
157 int saved_fmt
= opt
->diffopt
.output_format
;
158 opt
->diffopt
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
159 diff_flush(&opt
->diffopt
);
160 opt
->diffopt
.output_format
= saved_fmt
;
164 if (opt
->loginfo
&& !opt
->no_commit_id
)
165 show_log(opt
, opt
->loginfo
, opt
->diffopt
.with_stat
? "---\n" : "\n");
166 diff_flush(&opt
->diffopt
);
170 static int diff_root_tree(struct rev_info
*opt
,
171 const unsigned char *new, const char *base
)
175 struct tree_desc empty
, real
;
177 tree
= read_object_with_reference(new, tree_type
, &real
.size
, NULL
);
179 die("unable to read root tree (%s)", sha1_to_hex(new));
184 retval
= diff_tree(&empty
, &real
, base
, &opt
->diffopt
);
186 log_tree_diff_flush(opt
);
190 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
192 unsigned const char *sha1
= commit
->object
.sha1
;
194 diff_tree_combined_merge(sha1
, opt
->dense_combined_merges
, opt
);
195 return !opt
->loginfo
;
199 * Show the diff of a commit.
201 * Return true if we printed any log info messages
203 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
206 struct commit_list
*parents
;
207 unsigned const char *sha1
= commit
->object
.sha1
;
213 parents
= commit
->parents
;
215 if (opt
->show_root_diff
)
216 diff_root_tree(opt
, sha1
, "");
217 return !opt
->loginfo
;
220 /* More than one parent? */
221 if (parents
&& parents
->next
) {
222 if (opt
->ignore_merges
)
224 else if (opt
->combine_merges
)
225 return do_diff_combined(opt
, commit
);
227 /* If we show individual diffs, show the parent info */
228 log
->parent
= parents
->item
;
233 struct commit
*parent
= parents
->item
;
235 diff_tree_sha1(parent
->object
.sha1
, sha1
, "", &opt
->diffopt
);
236 log_tree_diff_flush(opt
);
238 showed_log
|= !opt
->loginfo
;
240 /* Set up the log info for the next parent, if any.. */
241 parents
= parents
->next
;
244 log
->parent
= parents
->item
;
250 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
259 shown
= log_tree_diff(opt
, commit
, &log
);
260 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
262 show_log(opt
, opt
->loginfo
, "");