Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 3 | #include "utf8.h" |
| 4 | #include "diff.h" |
| 5 | #include "revision.h" |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 6 | #include "string-list.h" |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 7 | #include "mailmap.h" |
René Scharfe | 3b3d443 | 2008-09-04 23:40:03 +0200 | [diff] [blame] | 8 | #include "log-tree.h" |
Johannes Schindelin | a97a746 | 2009-10-09 12:21:57 +0200 | [diff] [blame] | 9 | #include "notes.h" |
Jeff King | c002922 | 2009-01-17 10:38:46 -0500 | [diff] [blame] | 10 | #include "color.h" |
Thomas Rast | 8f8f547 | 2009-10-19 17:48:10 +0200 | [diff] [blame] | 11 | #include "reflog-walk.h" |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 12 | #include "gpg-interface.h" |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 13 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 14 | static char *user_format; |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 15 | static struct cmt_fmt_map { |
| 16 | const char *name; |
| 17 | enum cmit_fmt format; |
| 18 | int is_tformat; |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 19 | int expand_tabs_in_log; |
Will Palmer | 2d7671e | 2010-05-02 12:00:43 +0100 | [diff] [blame] | 20 | int is_alias; |
| 21 | const char *user_format; |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 22 | } *commit_formats; |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 23 | static size_t builtin_formats_len; |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 24 | static size_t commit_formats_len; |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 25 | static size_t commit_formats_alloc; |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 26 | static struct cmt_fmt_map *find_commit_format(const char *sought); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 27 | |
Jeff King | b9c7d6e | 2014-07-29 13:56:48 -0400 | [diff] [blame] | 28 | int commit_format_is_empty(enum cmit_fmt fmt) |
| 29 | { |
| 30 | return fmt == CMIT_FMT_USERFORMAT && !*user_format; |
| 31 | } |
| 32 | |
Nanako Shiraishi | 3640754 | 2009-02-24 18:59:15 +0900 | [diff] [blame] | 33 | static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat) |
| 34 | { |
| 35 | free(user_format); |
| 36 | user_format = xstrdup(cp); |
| 37 | if (is_tformat) |
| 38 | rev->use_terminator = 1; |
| 39 | rev->commit_format = CMIT_FMT_USERFORMAT; |
| 40 | } |
| 41 | |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 42 | static int git_pretty_formats_config(const char *var, const char *value, void *cb) |
| 43 | { |
| 44 | struct cmt_fmt_map *commit_format = NULL; |
| 45 | const char *name; |
| 46 | const char *fmt; |
| 47 | int i; |
| 48 | |
Jeff King | 95b567c | 2014-06-18 15:48:29 -0400 | [diff] [blame] | 49 | if (!skip_prefix(var, "pretty.", &name)) |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 50 | return 0; |
| 51 | |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 52 | for (i = 0; i < builtin_formats_len; i++) { |
| 53 | if (!strcmp(commit_formats[i].name, name)) |
| 54 | return 0; |
| 55 | } |
| 56 | |
| 57 | for (i = builtin_formats_len; i < commit_formats_len; i++) { |
| 58 | if (!strcmp(commit_formats[i].name, name)) { |
| 59 | commit_format = &commit_formats[i]; |
| 60 | break; |
| 61 | } |
| 62 | } |
| 63 | |
| 64 | if (!commit_format) { |
| 65 | ALLOC_GROW(commit_formats, commit_formats_len+1, |
| 66 | commit_formats_alloc); |
| 67 | commit_format = &commit_formats[commit_formats_len]; |
Jonathan Nieder | 95a2618 | 2010-05-08 16:07:39 -0500 | [diff] [blame] | 68 | memset(commit_format, 0, sizeof(*commit_format)); |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 69 | commit_formats_len++; |
| 70 | } |
| 71 | |
| 72 | commit_format->name = xstrdup(name); |
| 73 | commit_format->format = CMIT_FMT_USERFORMAT; |
Tanay Abhra | a26bc61 | 2014-08-04 07:41:15 -0700 | [diff] [blame] | 74 | if (git_config_string(&fmt, var, value)) |
| 75 | return -1; |
| 76 | |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 77 | if (skip_prefix(fmt, "format:", &fmt)) |
| 78 | commit_format->is_tformat = 0; |
| 79 | else if (skip_prefix(fmt, "tformat:", &fmt) || strchr(fmt, '%')) |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 80 | commit_format->is_tformat = 1; |
| 81 | else |
| 82 | commit_format->is_alias = 1; |
| 83 | commit_format->user_format = fmt; |
| 84 | |
| 85 | return 0; |
| 86 | } |
| 87 | |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 88 | static void setup_commit_formats(void) |
| 89 | { |
| 90 | struct cmt_fmt_map builtin_formats[] = { |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 91 | { "raw", CMIT_FMT_RAW, 0, 0 }, |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 92 | { "medium", CMIT_FMT_MEDIUM, 0, 8 }, |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 93 | { "short", CMIT_FMT_SHORT, 0, 0 }, |
| 94 | { "email", CMIT_FMT_EMAIL, 0, 0 }, |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 95 | { "mboxrd", CMIT_FMT_MBOXRD, 0, 0 }, |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 96 | { "fuller", CMIT_FMT_FULLER, 0, 8 }, |
| 97 | { "full", CMIT_FMT_FULL, 0, 8 }, |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 98 | { "oneline", CMIT_FMT_ONELINE, 1, 0 } |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 99 | }; |
| 100 | commit_formats_len = ARRAY_SIZE(builtin_formats); |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 101 | builtin_formats_len = commit_formats_len; |
| 102 | ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc); |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 103 | memcpy(commit_formats, builtin_formats, |
| 104 | sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats)); |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 105 | |
| 106 | git_config(git_pretty_formats_config, NULL); |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 107 | } |
| 108 | |
Will Palmer | 2d7671e | 2010-05-02 12:00:43 +0100 | [diff] [blame] | 109 | static struct cmt_fmt_map *find_commit_format_recursive(const char *sought, |
| 110 | const char *original, |
| 111 | int num_redirections) |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 112 | { |
| 113 | struct cmt_fmt_map *found = NULL; |
| 114 | size_t found_match_len = 0; |
| 115 | int i; |
| 116 | |
Will Palmer | 2d7671e | 2010-05-02 12:00:43 +0100 | [diff] [blame] | 117 | if (num_redirections >= commit_formats_len) |
| 118 | die("invalid --pretty format: " |
| 119 | "'%s' references an alias which points to itself", |
| 120 | original); |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 121 | |
| 122 | for (i = 0; i < commit_formats_len; i++) { |
| 123 | size_t match_len; |
| 124 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 125 | if (!starts_with(commit_formats[i].name, sought)) |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 126 | continue; |
| 127 | |
| 128 | match_len = strlen(commit_formats[i].name); |
| 129 | if (found == NULL || found_match_len > match_len) { |
| 130 | found = &commit_formats[i]; |
| 131 | found_match_len = match_len; |
| 132 | } |
| 133 | } |
Will Palmer | 2d7671e | 2010-05-02 12:00:43 +0100 | [diff] [blame] | 134 | |
| 135 | if (found && found->is_alias) { |
| 136 | found = find_commit_format_recursive(found->user_format, |
| 137 | original, |
| 138 | num_redirections+1); |
| 139 | } |
| 140 | |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 141 | return found; |
| 142 | } |
| 143 | |
Will Palmer | 2d7671e | 2010-05-02 12:00:43 +0100 | [diff] [blame] | 144 | static struct cmt_fmt_map *find_commit_format(const char *sought) |
| 145 | { |
| 146 | if (!commit_formats) |
| 147 | setup_commit_formats(); |
| 148 | |
| 149 | return find_commit_format_recursive(sought, sought, 0); |
| 150 | } |
| 151 | |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 152 | void get_commit_format(const char *arg, struct rev_info *rev) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 153 | { |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 154 | struct cmt_fmt_map *commit_format; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 155 | |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 156 | rev->use_terminator = 0; |
Jeff King | c75e7ad | 2014-07-29 13:54:46 -0400 | [diff] [blame] | 157 | if (!arg) { |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 158 | rev->commit_format = CMIT_FMT_DEFAULT; |
| 159 | return; |
| 160 | } |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 161 | if (skip_prefix(arg, "format:", &arg)) { |
| 162 | save_user_format(rev, arg, 0); |
Junio C Hamano | 4da45be | 2008-04-07 17:11:34 -0700 | [diff] [blame] | 163 | return; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 164 | } |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 165 | |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 166 | if (!*arg || skip_prefix(arg, "tformat:", &arg) || strchr(arg, '%')) { |
Nanako Shiraishi | 3640754 | 2009-02-24 18:59:15 +0900 | [diff] [blame] | 167 | save_user_format(rev, arg, 1); |
| 168 | return; |
| 169 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 170 | |
Will Palmer | 4095789 | 2010-05-02 12:00:42 +0100 | [diff] [blame] | 171 | commit_format = find_commit_format(arg); |
| 172 | if (!commit_format) |
| 173 | die("invalid --pretty format: %s", arg); |
| 174 | |
| 175 | rev->commit_format = commit_format->format; |
| 176 | rev->use_terminator = commit_format->is_tformat; |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 177 | rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log; |
Will Palmer | 8028184 | 2010-05-02 12:00:44 +0100 | [diff] [blame] | 178 | if (commit_format->format == CMIT_FMT_USERFORMAT) { |
| 179 | save_user_format(rev, commit_format->user_format, |
| 180 | commit_format->is_tformat); |
| 181 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 182 | } |
| 183 | |
| 184 | /* |
| 185 | * Generic support for pretty-printing the header |
| 186 | */ |
| 187 | static int get_one_line(const char *msg) |
| 188 | { |
| 189 | int ret = 0; |
| 190 | |
| 191 | for (;;) { |
| 192 | char c = *msg++; |
| 193 | if (!c) |
| 194 | break; |
| 195 | ret++; |
| 196 | if (c == '\n') |
| 197 | break; |
| 198 | } |
| 199 | return ret; |
| 200 | } |
| 201 | |
| 202 | /* High bit set, or ISO-2022-INT */ |
Junio C Hamano | cc57114 | 2010-01-11 22:23:35 -0800 | [diff] [blame] | 203 | static int non_ascii(int ch) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 204 | { |
René Scharfe | c2e9364 | 2009-03-07 14:06:49 +0100 | [diff] [blame] | 205 | return !isascii(ch) || ch == '\033'; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 206 | } |
| 207 | |
Johannes Schindelin | 28e9cf6 | 2009-08-10 18:22:18 +0200 | [diff] [blame] | 208 | int has_non_ascii(const char *s) |
| 209 | { |
| 210 | int ch; |
| 211 | if (!s) |
| 212 | return 0; |
| 213 | while ((ch = *s++) != '\0') { |
| 214 | if (non_ascii(ch)) |
| 215 | return 1; |
| 216 | } |
| 217 | return 0; |
| 218 | } |
| 219 | |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 220 | static int is_rfc822_special(char ch) |
| 221 | { |
| 222 | switch (ch) { |
| 223 | case '(': |
| 224 | case ')': |
| 225 | case '<': |
| 226 | case '>': |
| 227 | case '[': |
| 228 | case ']': |
| 229 | case ':': |
| 230 | case ';': |
| 231 | case '@': |
| 232 | case ',': |
| 233 | case '.': |
| 234 | case '"': |
| 235 | case '\\': |
| 236 | return 1; |
| 237 | default: |
| 238 | return 0; |
| 239 | } |
| 240 | } |
| 241 | |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 242 | static int needs_rfc822_quoting(const char *s, int len) |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 243 | { |
| 244 | int i; |
| 245 | for (i = 0; i < len; i++) |
| 246 | if (is_rfc822_special(s[i])) |
| 247 | return 1; |
| 248 | return 0; |
| 249 | } |
| 250 | |
Jan H. Schönherr | f9b7204 | 2012-10-18 16:43:31 +0200 | [diff] [blame] | 251 | static int last_line_length(struct strbuf *sb) |
| 252 | { |
| 253 | int i; |
| 254 | |
| 255 | /* How many bytes are already used on the last line? */ |
| 256 | for (i = sb->len - 1; i >= 0; i--) |
| 257 | if (sb->buf[i] == '\n') |
| 258 | break; |
| 259 | return sb->len - (i + 1); |
| 260 | } |
| 261 | |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 262 | static void add_rfc822_quoted(struct strbuf *out, const char *s, int len) |
| 263 | { |
| 264 | int i; |
| 265 | |
| 266 | /* just a guess, we may have to also backslash-quote */ |
| 267 | strbuf_grow(out, len + 2); |
| 268 | |
| 269 | strbuf_addch(out, '"'); |
| 270 | for (i = 0; i < len; i++) { |
| 271 | switch (s[i]) { |
| 272 | case '"': |
| 273 | case '\\': |
| 274 | strbuf_addch(out, '\\'); |
| 275 | /* fall through */ |
| 276 | default: |
| 277 | strbuf_addch(out, s[i]); |
| 278 | } |
| 279 | } |
| 280 | strbuf_addch(out, '"'); |
| 281 | } |
| 282 | |
Jan H. Schönherr | 0fcec2c | 2012-10-18 16:43:32 +0200 | [diff] [blame] | 283 | enum rfc2047_type { |
| 284 | RFC2047_SUBJECT, |
Ronnie Sahlberg | 7827352 | 2014-07-02 11:24:05 -0700 | [diff] [blame] | 285 | RFC2047_ADDRESS |
Jan H. Schönherr | 0fcec2c | 2012-10-18 16:43:32 +0200 | [diff] [blame] | 286 | }; |
| 287 | |
| 288 | static int is_rfc2047_special(char ch, enum rfc2047_type type) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 289 | { |
Jan H. Schönherr | 0fcec2c | 2012-10-18 16:43:32 +0200 | [diff] [blame] | 290 | /* |
| 291 | * rfc2047, section 4.2: |
| 292 | * |
| 293 | * 8-bit values which correspond to printable ASCII characters other |
| 294 | * than "=", "?", and "_" (underscore), MAY be represented as those |
| 295 | * characters. (But see section 5 for restrictions.) In |
| 296 | * particular, SPACE and TAB MUST NOT be represented as themselves |
| 297 | * within encoded words. |
| 298 | */ |
| 299 | |
| 300 | /* |
| 301 | * rule out non-ASCII characters and non-printable characters (the |
| 302 | * non-ASCII check should be redundant as isprint() is not localized |
| 303 | * and only knows about ASCII, but be defensive about that) |
| 304 | */ |
| 305 | if (non_ascii(ch) || !isprint(ch)) |
Jan H. Schönherr | 94f6cdf | 2012-10-18 16:43:30 +0200 | [diff] [blame] | 306 | return 1; |
| 307 | |
Jan H. Schönherr | 0fcec2c | 2012-10-18 16:43:32 +0200 | [diff] [blame] | 308 | /* |
| 309 | * rule out special printable characters (' ' should be the only |
| 310 | * whitespace character considered printable, but be defensive and use |
| 311 | * isspace()) |
| 312 | */ |
| 313 | if (isspace(ch) || ch == '=' || ch == '?' || ch == '_') |
| 314 | return 1; |
| 315 | |
| 316 | /* |
| 317 | * rfc2047, section 5.3: |
| 318 | * |
| 319 | * As a replacement for a 'word' entity within a 'phrase', for example, |
| 320 | * one that precedes an address in a From, To, or Cc header. The ABNF |
| 321 | * definition for 'phrase' from RFC 822 thus becomes: |
| 322 | * |
| 323 | * phrase = 1*( encoded-word / word ) |
| 324 | * |
| 325 | * In this case the set of characters that may be used in a "Q"-encoded |
| 326 | * 'encoded-word' is restricted to: <upper and lower case ASCII |
| 327 | * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_" |
| 328 | * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a |
| 329 | * 'phrase' MUST be separated from any adjacent 'word', 'text' or |
| 330 | * 'special' by 'linear-white-space'. |
| 331 | */ |
| 332 | |
| 333 | if (type != RFC2047_ADDRESS) |
| 334 | return 0; |
| 335 | |
| 336 | /* '=' and '_' are special cases and have been checked above */ |
| 337 | return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/'); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 338 | } |
| 339 | |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 340 | static int needs_rfc2047_encoding(const char *line, int len, |
| 341 | enum rfc2047_type type) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 342 | { |
Jeff King | a1f6baa | 2011-02-23 04:58:41 -0500 | [diff] [blame] | 343 | int i; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 344 | |
| 345 | for (i = 0; i < len; i++) { |
| 346 | int ch = line[i]; |
Jeff King | c22e7de | 2011-02-23 04:59:18 -0500 | [diff] [blame] | 347 | if (non_ascii(ch) || ch == '\n') |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 348 | return 1; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 349 | if ((i + 1 < len) && (ch == '=' && line[i+1] == '?')) |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 350 | return 1; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 351 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 352 | |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 353 | return 0; |
| 354 | } |
| 355 | |
Kirill Smelkov | 6cd3c05 | 2013-03-07 14:55:07 +0400 | [diff] [blame] | 356 | static void add_rfc2047(struct strbuf *sb, const char *line, size_t len, |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 357 | const char *encoding, enum rfc2047_type type) |
| 358 | { |
| 359 | static const int max_encoded_length = 76; /* per rfc2047 */ |
| 360 | int i; |
| 361 | int line_len = last_line_length(sb); |
| 362 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 363 | strbuf_grow(sb, len * 3 + strlen(encoding) + 100); |
| 364 | strbuf_addf(sb, "=?%s?q?", encoding); |
Jeff King | a1f6baa | 2011-02-23 04:58:41 -0500 | [diff] [blame] | 365 | line_len += strlen(encoding) + 5; /* 5 for =??q? */ |
Kirill Smelkov | 6cd3c05 | 2013-03-07 14:55:07 +0400 | [diff] [blame] | 366 | |
| 367 | while (len) { |
| 368 | /* |
| 369 | * RFC 2047, section 5 (3): |
| 370 | * |
| 371 | * Each 'encoded-word' MUST represent an integral number of |
| 372 | * characters. A multi-octet character may not be split across |
| 373 | * adjacent 'encoded- word's. |
| 374 | */ |
| 375 | const unsigned char *p = (const unsigned char *)line; |
| 376 | int chrlen = mbs_chrlen(&line, &len, encoding); |
| 377 | int is_special = (chrlen > 1) || is_rfc2047_special(*p, type); |
| 378 | |
| 379 | /* "=%02X" * chrlen, or the byte itself */ |
| 380 | const char *encoded_fmt = is_special ? "=%02X" : "%c"; |
| 381 | int encoded_len = is_special ? 3 * chrlen : 1; |
Jeff King | a1f6baa | 2011-02-23 04:58:41 -0500 | [diff] [blame] | 382 | |
Jan H. Schönherr | 94f6cdf | 2012-10-18 16:43:30 +0200 | [diff] [blame] | 383 | /* |
| 384 | * According to RFC 2047, we could encode the special character |
| 385 | * ' ' (space) with '_' (underscore) for readability. But many |
| 386 | * programs do not understand this and just leave the |
| 387 | * underscore in place. Thus, we do nothing special here, which |
| 388 | * causes ' ' to be encoded as '=20', avoiding this problem. |
| 389 | */ |
| 390 | |
Kirill Smelkov | 6cd3c05 | 2013-03-07 14:55:07 +0400 | [diff] [blame] | 391 | if (line_len + encoded_len + 2 > max_encoded_length) { |
| 392 | /* It won't fit with trailing "?=" --- break the line */ |
Jeff King | a1f6baa | 2011-02-23 04:58:41 -0500 | [diff] [blame] | 393 | strbuf_addf(sb, "?=\n =?%s?q?", encoding); |
| 394 | line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */ |
| 395 | } |
| 396 | |
Kirill Smelkov | 6cd3c05 | 2013-03-07 14:55:07 +0400 | [diff] [blame] | 397 | for (i = 0; i < chrlen; i++) |
| 398 | strbuf_addf(sb, encoded_fmt, p[i]); |
| 399 | line_len += encoded_len; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 400 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 401 | strbuf_addstr(sb, "?="); |
| 402 | } |
| 403 | |
Jeff King | d105324 | 2014-05-01 21:07:22 -0400 | [diff] [blame] | 404 | const char *show_ident_date(const struct ident_split *ident, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 405 | const struct date_mode *mode) |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 406 | { |
| 407 | unsigned long date = 0; |
Jeff King | 3f419d4 | 2014-03-07 12:15:01 -0500 | [diff] [blame] | 408 | long tz = 0; |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 409 | |
| 410 | if (ident->date_begin && ident->date_end) |
| 411 | date = strtoul(ident->date_begin, NULL, 10); |
Jeff King | 1dca155 | 2014-02-24 02:46:37 -0500 | [diff] [blame] | 412 | if (date_overflows(date)) |
| 413 | date = 0; |
| 414 | else { |
| 415 | if (ident->tz_begin && ident->tz_end) |
| 416 | tz = strtol(ident->tz_begin, NULL, 10); |
Jeff King | 3f419d4 | 2014-03-07 12:15:01 -0500 | [diff] [blame] | 417 | if (tz >= INT_MAX || tz <= INT_MIN) |
Jeff King | 1dca155 | 2014-02-24 02:46:37 -0500 | [diff] [blame] | 418 | tz = 0; |
| 419 | } |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 420 | return show_date(date, tz, mode); |
| 421 | } |
| 422 | |
Jeff King | 10f2fbf | 2013-07-03 03:07:48 -0400 | [diff] [blame] | 423 | void pp_user_info(struct pretty_print_context *pp, |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 424 | const char *what, struct strbuf *sb, |
| 425 | const char *line, const char *encoding) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 426 | { |
Antoine Pelisse | 3c020bd | 2013-01-05 22:26:38 +0100 | [diff] [blame] | 427 | struct ident_split ident; |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 428 | char *line_end; |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 429 | const char *mailbuf, *namebuf; |
| 430 | size_t namelen, maillen; |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 431 | int max_length = 78; /* per rfc2822 */ |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 432 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 433 | if (pp->fmt == CMIT_FMT_ONELINE) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 434 | return; |
Antoine Pelisse | 3c020bd | 2013-01-05 22:26:38 +0100 | [diff] [blame] | 435 | |
René Scharfe | 30e77bc | 2013-04-25 21:40:25 +0200 | [diff] [blame] | 436 | line_end = strchrnul(line, '\n'); |
| 437 | if (split_ident_line(&ident, line, line_end - line)) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 438 | return; |
Antoine Pelisse | 3c020bd | 2013-01-05 22:26:38 +0100 | [diff] [blame] | 439 | |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 440 | mailbuf = ident.mail_begin; |
| 441 | maillen = ident.mail_end - ident.mail_begin; |
| 442 | namebuf = ident.name_begin; |
| 443 | namelen = ident.name_end - ident.name_begin; |
| 444 | |
| 445 | if (pp->mailmap) |
| 446 | map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); |
| 447 | |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 448 | if (cmit_fmt_is_mail(pp->fmt)) { |
Jeff King | 662cc30 | 2013-09-20 06:16:28 -0400 | [diff] [blame] | 449 | if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) { |
Jeff King | a908047 | 2013-07-03 03:08:22 -0400 | [diff] [blame] | 450 | struct strbuf buf = STRBUF_INIT; |
| 451 | |
| 452 | strbuf_addstr(&buf, "From: "); |
| 453 | strbuf_add(&buf, namebuf, namelen); |
| 454 | strbuf_addstr(&buf, " <"); |
| 455 | strbuf_add(&buf, mailbuf, maillen); |
| 456 | strbuf_addstr(&buf, ">\n"); |
| 457 | string_list_append(&pp->in_body_headers, |
| 458 | strbuf_detach(&buf, NULL)); |
| 459 | |
| 460 | mailbuf = pp->from_ident->mail_begin; |
| 461 | maillen = pp->from_ident->mail_end - mailbuf; |
| 462 | namebuf = pp->from_ident->name_begin; |
| 463 | namelen = pp->from_ident->name_end - namebuf; |
| 464 | } |
| 465 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 466 | strbuf_addstr(sb, "From: "); |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 467 | if (needs_rfc2047_encoding(namebuf, namelen, RFC2047_ADDRESS)) { |
| 468 | add_rfc2047(sb, namebuf, namelen, |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 469 | encoding, RFC2047_ADDRESS); |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 470 | max_length = 76; /* per rfc2047 */ |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 471 | } else if (needs_rfc822_quoting(namebuf, namelen)) { |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 472 | struct strbuf quoted = STRBUF_INIT; |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 473 | add_rfc822_quoted("ed, namebuf, namelen); |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 474 | strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len, |
| 475 | -6, 1, max_length); |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 476 | strbuf_release("ed); |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 477 | } else { |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 478 | strbuf_add_wrapped_bytes(sb, namebuf, namelen, |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 479 | -6, 1, max_length); |
Jeff King | 4d03c18 | 2011-04-08 18:40:36 -0400 | [diff] [blame] | 480 | } |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 481 | |
René Scharfe | 97a17e7 | 2013-04-25 21:41:57 +0200 | [diff] [blame] | 482 | if (max_length < |
| 483 | last_line_length(sb) + strlen(" <") + maillen + strlen(">")) |
Jeff King | 990f6e3 | 2011-04-14 18:18:09 -0400 | [diff] [blame] | 484 | strbuf_addch(sb, '\n'); |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 485 | strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 486 | } else { |
René Scharfe | a0511b3 | 2013-04-25 21:43:56 +0200 | [diff] [blame] | 487 | strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what, |
| 488 | (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, " ", |
| 489 | (int)namelen, namebuf, (int)maillen, mailbuf); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 490 | } |
Antoine Pelisse | dffd325 | 2013-01-05 22:26:42 +0100 | [diff] [blame] | 491 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 492 | switch (pp->fmt) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 493 | case CMIT_FMT_MEDIUM: |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 494 | strbuf_addf(sb, "Date: %s\n", |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 495 | show_ident_date(&ident, &pp->date_mode)); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 496 | break; |
| 497 | case CMIT_FMT_EMAIL: |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 498 | case CMIT_FMT_MBOXRD: |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 499 | strbuf_addf(sb, "Date: %s\n", |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 500 | show_ident_date(&ident, DATE_MODE(RFC2822))); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 501 | break; |
| 502 | case CMIT_FMT_FULLER: |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 503 | strbuf_addf(sb, "%sDate: %s\n", what, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 504 | show_ident_date(&ident, &pp->date_mode)); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 505 | break; |
| 506 | default: |
| 507 | /* notin' */ |
| 508 | break; |
| 509 | } |
| 510 | } |
| 511 | |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 512 | static int is_blank_line(const char *line, int *len_p) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 513 | { |
| 514 | int len = *len_p; |
Felipe Contreras | 35b2fa5 | 2013-10-31 03:25:42 -0600 | [diff] [blame] | 515 | while (len && isspace(line[len - 1])) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 516 | len--; |
| 517 | *len_p = len; |
| 518 | return !len; |
| 519 | } |
| 520 | |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 521 | const char *skip_blank_lines(const char *msg) |
René Scharfe | a010966 | 2008-12-27 01:32:49 +0100 | [diff] [blame] | 522 | { |
| 523 | for (;;) { |
| 524 | int linelen = get_one_line(msg); |
| 525 | int ll = linelen; |
| 526 | if (!linelen) |
| 527 | break; |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 528 | if (!is_blank_line(msg, &ll)) |
René Scharfe | a010966 | 2008-12-27 01:32:49 +0100 | [diff] [blame] | 529 | break; |
| 530 | msg += linelen; |
| 531 | } |
| 532 | return msg; |
| 533 | } |
| 534 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 535 | static void add_merge_info(const struct pretty_print_context *pp, |
| 536 | struct strbuf *sb, const struct commit *commit) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 537 | { |
| 538 | struct commit_list *parent = commit->parents; |
| 539 | |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 540 | if ((pp->fmt == CMIT_FMT_ONELINE) || (cmit_fmt_is_mail(pp->fmt)) || |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 541 | !parent || !parent->next) |
| 542 | return; |
| 543 | |
| 544 | strbuf_addstr(sb, "Merge:"); |
| 545 | |
| 546 | while (parent) { |
| 547 | struct commit *p = parent->item; |
| 548 | const char *hex = NULL; |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 549 | if (pp->abbrev) |
brian m. carlson | ed1c997 | 2015-11-10 02:22:29 +0000 | [diff] [blame] | 550 | hex = find_unique_abbrev(p->object.oid.hash, pp->abbrev); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 551 | if (!hex) |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 552 | hex = oid_to_hex(&p->object.oid); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 553 | parent = parent->next; |
| 554 | |
Thomas Rast | 7fcda92 | 2009-02-13 23:10:41 +0100 | [diff] [blame] | 555 | strbuf_addf(sb, " %s", hex); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 556 | } |
| 557 | strbuf_addch(sb, '\n'); |
| 558 | } |
| 559 | |
Jeff King | fe6eb7f | 2014-08-27 03:56:01 -0400 | [diff] [blame] | 560 | static char *get_header(const char *msg, const char *key) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 561 | { |
Jeff King | fe6eb7f | 2014-08-27 03:56:01 -0400 | [diff] [blame] | 562 | size_t len; |
| 563 | const char *v = find_commit_header(msg, key, &len); |
| 564 | return v ? xmemdupz(v, len) : NULL; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 565 | } |
| 566 | |
| 567 | static char *replace_encoding_header(char *buf, const char *encoding) |
| 568 | { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 569 | struct strbuf tmp = STRBUF_INIT; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 570 | size_t start, len; |
| 571 | char *cp = buf; |
| 572 | |
| 573 | /* guess if there is an encoding header before a \n\n */ |
René Scharfe | 68d6d6e | 2015-02-21 20:53:09 +0100 | [diff] [blame] | 574 | while (!starts_with(cp, "encoding ")) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 575 | cp = strchr(cp, '\n'); |
| 576 | if (!cp || *++cp == '\n') |
| 577 | return buf; |
| 578 | } |
| 579 | start = cp - buf; |
| 580 | cp = strchr(cp, '\n'); |
| 581 | if (!cp) |
| 582 | return buf; /* should not happen but be defensive */ |
| 583 | len = cp + 1 - (buf + start); |
| 584 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 585 | strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1); |
| 586 | if (is_encoding_utf8(encoding)) { |
| 587 | /* we have re-coded to UTF-8; drop the header */ |
| 588 | strbuf_remove(&tmp, start, len); |
| 589 | } else { |
| 590 | /* just replaces XXXX in 'encoding XXXX\n' */ |
| 591 | strbuf_splice(&tmp, start + strlen("encoding "), |
| 592 | len - strlen("encoding \n"), |
| 593 | encoding, strlen(encoding)); |
| 594 | } |
| 595 | return strbuf_detach(&tmp, NULL); |
| 596 | } |
| 597 | |
Jeff King | b000c59 | 2014-06-10 17:39:30 -0400 | [diff] [blame] | 598 | const char *logmsg_reencode(const struct commit *commit, |
| 599 | char **commit_encoding, |
| 600 | const char *output_encoding) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 601 | { |
Brandon Casey | 330db18 | 2009-05-18 18:44:39 -0500 | [diff] [blame] | 602 | static const char *utf8 = "UTF-8"; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 603 | const char *use_encoding; |
| 604 | char *encoding; |
Jeff King | 8597ea3 | 2014-06-10 17:44:13 -0400 | [diff] [blame] | 605 | const char *msg = get_commit_buffer(commit, NULL); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 606 | char *out; |
| 607 | |
Nguyễn Thái Ngọc Duy | 5a10d23 | 2013-04-19 09:08:40 +1000 | [diff] [blame] | 608 | if (!output_encoding || !*output_encoding) { |
| 609 | if (commit_encoding) |
Jeff King | fe6eb7f | 2014-08-27 03:56:01 -0400 | [diff] [blame] | 610 | *commit_encoding = get_header(msg, "encoding"); |
Jeff King | dd0d388 | 2013-01-26 04:44:06 -0500 | [diff] [blame] | 611 | return msg; |
Nguyễn Thái Ngọc Duy | 5a10d23 | 2013-04-19 09:08:40 +1000 | [diff] [blame] | 612 | } |
Jeff King | fe6eb7f | 2014-08-27 03:56:01 -0400 | [diff] [blame] | 613 | encoding = get_header(msg, "encoding"); |
Nguyễn Thái Ngọc Duy | 5a10d23 | 2013-04-19 09:08:40 +1000 | [diff] [blame] | 614 | if (commit_encoding) |
| 615 | *commit_encoding = encoding; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 616 | use_encoding = encoding ? encoding : utf8; |
Jeff King | be5c9fb | 2013-01-26 04:44:28 -0500 | [diff] [blame] | 617 | if (same_encoding(use_encoding, output_encoding)) { |
| 618 | /* |
| 619 | * No encoding work to be done. If we have no encoding header |
| 620 | * at all, then there's nothing to do, and we can return the |
| 621 | * message verbatim (whether newly allocated or not). |
| 622 | */ |
| 623 | if (!encoding) |
| 624 | return msg; |
| 625 | |
| 626 | /* |
| 627 | * Otherwise, we still want to munge the encoding header in the |
| 628 | * result, which will be done by modifying the buffer. If we |
| 629 | * are using a fresh copy, we can reuse it. But if we are using |
Jeff King | b66103c | 2014-06-10 17:41:39 -0400 | [diff] [blame] | 630 | * the cached copy from get_commit_buffer, we need to duplicate it |
| 631 | * to avoid munging the cached copy. |
Jeff King | be5c9fb | 2013-01-26 04:44:28 -0500 | [diff] [blame] | 632 | */ |
Jeff King | 8597ea3 | 2014-06-10 17:44:13 -0400 | [diff] [blame] | 633 | if (msg == get_cached_commit_buffer(commit, NULL)) |
Jeff King | b66103c | 2014-06-10 17:41:39 -0400 | [diff] [blame] | 634 | out = xstrdup(msg); |
| 635 | else |
| 636 | out = (char *)msg; |
Jeff King | be5c9fb | 2013-01-26 04:44:28 -0500 | [diff] [blame] | 637 | } |
| 638 | else { |
| 639 | /* |
| 640 | * There's actual encoding work to do. Do the reencoding, which |
| 641 | * still leaves the header to be replaced in the next step. At |
| 642 | * this point, we are done with msg. If we allocated a fresh |
| 643 | * copy, we can free it. |
| 644 | */ |
| 645 | out = reencode_string(msg, output_encoding, use_encoding); |
Jeff King | b66103c | 2014-06-10 17:41:39 -0400 | [diff] [blame] | 646 | if (out) |
| 647 | unuse_commit_buffer(commit, msg); |
Jeff King | be5c9fb | 2013-01-26 04:44:28 -0500 | [diff] [blame] | 648 | } |
| 649 | |
| 650 | /* |
| 651 | * This replacement actually consumes the buffer we hand it, so we do |
| 652 | * not have to worry about freeing the old "out" here. |
| 653 | */ |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 654 | if (out) |
| 655 | out = replace_encoding_header(out, output_encoding); |
| 656 | |
Nguyễn Thái Ngọc Duy | 5a10d23 | 2013-04-19 09:08:40 +1000 | [diff] [blame] | 657 | if (!commit_encoding) |
| 658 | free(encoding); |
Jeff King | dd0d388 | 2013-01-26 04:44:06 -0500 | [diff] [blame] | 659 | /* |
| 660 | * If the re-encoding failed, out might be NULL here; in that |
| 661 | * case we just return the commit message verbatim. |
| 662 | */ |
| 663 | return out ? out : msg; |
| 664 | } |
| 665 | |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 666 | static int mailmap_name(const char **email, size_t *email_len, |
| 667 | const char **name, size_t *name_len) |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 668 | { |
Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 669 | static struct string_list *mail_map; |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 670 | if (!mail_map) { |
| 671 | mail_map = xcalloc(1, sizeof(*mail_map)); |
Marius Storm-Olsen | d551a48 | 2009-02-08 15:34:27 +0100 | [diff] [blame] | 672 | read_mailmap(mail_map, NULL); |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 673 | } |
Marius Storm-Olsen | d20d654 | 2009-02-08 15:34:30 +0100 | [diff] [blame] | 674 | return mail_map->nr && map_user(mail_map, email, email_len, name, name_len); |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 675 | } |
| 676 | |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 677 | static size_t format_person_part(struct strbuf *sb, char part, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 678 | const char *msg, int len, |
| 679 | const struct date_mode *dmode) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 680 | { |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 681 | /* currently all placeholders have same length */ |
| 682 | const int placeholder_len = 2; |
Junio C Hamano | 4b340cf | 2012-03-11 01:25:43 -0800 | [diff] [blame] | 683 | struct ident_split s; |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 684 | const char *name, *mail; |
| 685 | size_t maillen, namelen; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 686 | |
Junio C Hamano | 4b340cf | 2012-03-11 01:25:43 -0800 | [diff] [blame] | 687 | if (split_ident_line(&s, msg, len) < 0) |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 688 | goto skip; |
| 689 | |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 690 | name = s.name_begin; |
| 691 | namelen = s.name_end - s.name_begin; |
| 692 | mail = s.mail_begin; |
| 693 | maillen = s.mail_end - s.mail_begin; |
Marius Storm-Olsen | d20d654 | 2009-02-08 15:34:30 +0100 | [diff] [blame] | 694 | |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 695 | if (part == 'N' || part == 'E') /* mailmap lookup */ |
| 696 | mailmap_name(&mail, &maillen, &name, &namelen); |
Johannes Schindelin | e0cbc39 | 2008-07-12 00:28:18 +0100 | [diff] [blame] | 697 | if (part == 'n' || part == 'N') { /* name */ |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 698 | strbuf_add(sb, name, namelen); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 699 | return placeholder_len; |
| 700 | } |
Marius Storm-Olsen | d20d654 | 2009-02-08 15:34:30 +0100 | [diff] [blame] | 701 | if (part == 'e' || part == 'E') { /* email */ |
Antoine Pelisse | ea02ffa | 2013-01-05 22:26:40 +0100 | [diff] [blame] | 702 | strbuf_add(sb, mail, maillen); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 703 | return placeholder_len; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 704 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 705 | |
Junio C Hamano | 4b340cf | 2012-03-11 01:25:43 -0800 | [diff] [blame] | 706 | if (!s.date_begin) |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 707 | goto skip; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 708 | |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 709 | if (part == 't') { /* date, UNIX timestamp */ |
Junio C Hamano | 4b340cf | 2012-03-11 01:25:43 -0800 | [diff] [blame] | 710 | strbuf_add(sb, s.date_begin, s.date_end - s.date_begin); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 711 | return placeholder_len; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 712 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 713 | |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 714 | switch (part) { |
| 715 | case 'd': /* date */ |
René Scharfe | 9dbe7c3 | 2013-04-17 20:33:35 +0200 | [diff] [blame] | 716 | strbuf_addstr(sb, show_ident_date(&s, dmode)); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 717 | return placeholder_len; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 718 | case 'D': /* date, RFC2822 style */ |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 719 | strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(RFC2822))); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 720 | return placeholder_len; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 721 | case 'r': /* date, relative */ |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 722 | strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(RELATIVE))); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 723 | return placeholder_len; |
Beat Bolli | 466fb67 | 2014-08-29 18:58:42 +0200 | [diff] [blame] | 724 | case 'i': /* date, ISO 8601-like */ |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 725 | strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601))); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 726 | return placeholder_len; |
Beat Bolli | 466fb67 | 2014-08-29 18:58:42 +0200 | [diff] [blame] | 727 | case 'I': /* date, ISO 8601 strict */ |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 728 | strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT))); |
Beat Bolli | 466fb67 | 2014-08-29 18:58:42 +0200 | [diff] [blame] | 729 | return placeholder_len; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 730 | } |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 731 | |
| 732 | skip: |
| 733 | /* |
Junio C Hamano | 4b340cf | 2012-03-11 01:25:43 -0800 | [diff] [blame] | 734 | * reading from either a bogus commit, or a reflog entry with |
| 735 | * %gn, %ge, etc.; 'sb' cannot be updated, but we still need |
| 736 | * to compute a valid return value. |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 737 | */ |
| 738 | if (part == 'n' || part == 'e' || part == 't' || part == 'd' |
| 739 | || part == 'D' || part == 'r' || part == 'i') |
| 740 | return placeholder_len; |
| 741 | |
| 742 | return 0; /* unknown placeholder */ |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 743 | } |
| 744 | |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 745 | struct chunk { |
| 746 | size_t off; |
| 747 | size_t len; |
| 748 | }; |
| 749 | |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 750 | enum flush_type { |
| 751 | no_flush, |
| 752 | flush_right, |
| 753 | flush_left, |
Nguyễn Thái Ngọc Duy | 1640632 | 2013-04-19 09:08:52 +1000 | [diff] [blame] | 754 | flush_left_and_steal, |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 755 | flush_both |
| 756 | }; |
| 757 | |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 758 | enum trunc_type { |
| 759 | trunc_none, |
| 760 | trunc_left, |
| 761 | trunc_middle, |
| 762 | trunc_right |
| 763 | }; |
| 764 | |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 765 | struct format_commit_context { |
| 766 | const struct commit *commit; |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 767 | const struct pretty_print_context *pretty_ctx; |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 768 | unsigned commit_header_parsed:1; |
| 769 | unsigned commit_message_parsed:1; |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 770 | struct signature_check signature_check; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 771 | enum flush_type flush_type; |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 772 | enum trunc_type truncate; |
Jeff King | b000c59 | 2014-06-10 17:39:30 -0400 | [diff] [blame] | 773 | const char *message; |
Nguyễn Thái Ngọc Duy | 0940a76 | 2013-04-19 09:08:41 +1000 | [diff] [blame] | 774 | char *commit_encoding; |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 775 | size_t width, indent1, indent2; |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 776 | int auto_color; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 777 | int padding; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 778 | |
| 779 | /* These offsets are relative to the start of the commit message. */ |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 780 | struct chunk author; |
| 781 | struct chunk committer; |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 782 | size_t message_off; |
| 783 | size_t subject_off; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 784 | size_t body_off; |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 785 | |
| 786 | /* The following ones are relative to the result struct strbuf. */ |
| 787 | struct chunk abbrev_commit_hash; |
| 788 | struct chunk abbrev_tree_hash; |
| 789 | struct chunk abbrev_parent_hashes; |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 790 | size_t wrap_start; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 791 | }; |
| 792 | |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 793 | static int add_again(struct strbuf *sb, struct chunk *chunk) |
| 794 | { |
| 795 | if (chunk->len) { |
| 796 | strbuf_adddup(sb, chunk->off, chunk->len); |
| 797 | return 1; |
| 798 | } |
| 799 | |
| 800 | /* |
| 801 | * We haven't seen this chunk before. Our caller is surely |
| 802 | * going to add it the hard way now. Remember the most likely |
| 803 | * start of the to-be-added chunk: the current end of the |
| 804 | * struct strbuf. |
| 805 | */ |
| 806 | chunk->off = sb->len; |
| 807 | return 0; |
| 808 | } |
| 809 | |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 810 | static void parse_commit_header(struct format_commit_context *context) |
| 811 | { |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 812 | const char *msg = context->message; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 813 | int i; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 814 | |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 815 | for (i = 0; msg[i]; i++) { |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 816 | const char *name; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 817 | int eol; |
| 818 | for (eol = i; msg[eol] && msg[eol] != '\n'; eol++) |
| 819 | ; /* do nothing */ |
| 820 | |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 821 | if (i == eol) { |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 822 | break; |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 823 | } else if (skip_prefix(msg + i, "author ", &name)) { |
| 824 | context->author.off = name - msg; |
| 825 | context->author.len = msg + eol - name; |
| 826 | } else if (skip_prefix(msg + i, "committer ", &name)) { |
| 827 | context->committer.off = name - msg; |
| 828 | context->committer.len = msg + eol - name; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 829 | } |
| 830 | i = eol; |
| 831 | } |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 832 | context->message_off = i; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 833 | context->commit_header_parsed = 1; |
| 834 | } |
| 835 | |
Stephen Boyd | 46d164b | 2009-03-22 19:14:01 -0700 | [diff] [blame] | 836 | static int istitlechar(char c) |
| 837 | { |
| 838 | return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || |
| 839 | (c >= '0' && c <= '9') || c == '.' || c == '_'; |
| 840 | } |
| 841 | |
| 842 | static void format_sanitized_subject(struct strbuf *sb, const char *msg) |
| 843 | { |
| 844 | size_t trimlen; |
Stephen Boyd | 871d21d | 2009-03-31 16:24:38 -0700 | [diff] [blame] | 845 | size_t start_len = sb->len; |
Stephen Boyd | 46d164b | 2009-03-22 19:14:01 -0700 | [diff] [blame] | 846 | int space = 2; |
| 847 | |
| 848 | for (; *msg && *msg != '\n'; msg++) { |
| 849 | if (istitlechar(*msg)) { |
| 850 | if (space == 1) |
| 851 | strbuf_addch(sb, '-'); |
| 852 | space = 0; |
| 853 | strbuf_addch(sb, *msg); |
| 854 | if (*msg == '.') |
| 855 | while (*(msg+1) == '.') |
| 856 | msg++; |
| 857 | } else |
| 858 | space |= 1; |
| 859 | } |
| 860 | |
| 861 | /* trim any trailing '.' or '-' characters */ |
| 862 | trimlen = 0; |
Stephen Boyd | 871d21d | 2009-03-31 16:24:38 -0700 | [diff] [blame] | 863 | while (sb->len - trimlen > start_len && |
| 864 | (sb->buf[sb->len - 1 - trimlen] == '.' |
| 865 | || sb->buf[sb->len - 1 - trimlen] == '-')) |
Stephen Boyd | 46d164b | 2009-03-22 19:14:01 -0700 | [diff] [blame] | 866 | trimlen++; |
| 867 | strbuf_remove(sb, sb->len - trimlen, trimlen); |
| 868 | } |
| 869 | |
René Scharfe | cec0871 | 2009-01-06 21:41:06 +0100 | [diff] [blame] | 870 | const char *format_subject(struct strbuf *sb, const char *msg, |
| 871 | const char *line_separator) |
René Scharfe | 88c4473 | 2008-12-27 01:39:35 +0100 | [diff] [blame] | 872 | { |
| 873 | int first = 1; |
| 874 | |
| 875 | for (;;) { |
| 876 | const char *line = msg; |
| 877 | int linelen = get_one_line(line); |
| 878 | |
| 879 | msg += linelen; |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 880 | if (!linelen || is_blank_line(line, &linelen)) |
René Scharfe | 88c4473 | 2008-12-27 01:39:35 +0100 | [diff] [blame] | 881 | break; |
| 882 | |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 883 | if (!sb) |
| 884 | continue; |
René Scharfe | 88c4473 | 2008-12-27 01:39:35 +0100 | [diff] [blame] | 885 | strbuf_grow(sb, linelen + 2); |
| 886 | if (!first) |
| 887 | strbuf_addstr(sb, line_separator); |
| 888 | strbuf_add(sb, line, linelen); |
| 889 | first = 0; |
| 890 | } |
| 891 | return msg; |
| 892 | } |
| 893 | |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 894 | static void parse_commit_message(struct format_commit_context *c) |
| 895 | { |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 896 | const char *msg = c->message + c->message_off; |
| 897 | const char *start = c->message; |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 898 | |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 899 | msg = skip_blank_lines(msg); |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 900 | c->subject_off = msg - start; |
| 901 | |
| 902 | msg = format_subject(NULL, msg, NULL); |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 903 | msg = skip_blank_lines(msg); |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 904 | c->body_off = msg - start; |
| 905 | |
| 906 | c->commit_message_parsed = 1; |
| 907 | } |
| 908 | |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 909 | static void strbuf_wrap(struct strbuf *sb, size_t pos, |
| 910 | size_t width, size_t indent1, size_t indent2) |
| 911 | { |
| 912 | struct strbuf tmp = STRBUF_INIT; |
| 913 | |
| 914 | if (pos) |
| 915 | strbuf_add(&tmp, sb->buf, pos); |
| 916 | strbuf_add_wrapped_text(&tmp, sb->buf + pos, |
| 917 | (int) indent1, (int) indent2, (int) width); |
| 918 | strbuf_swap(&tmp, sb); |
| 919 | strbuf_release(&tmp); |
| 920 | } |
| 921 | |
| 922 | static void rewrap_message_tail(struct strbuf *sb, |
| 923 | struct format_commit_context *c, |
| 924 | size_t new_width, size_t new_indent1, |
| 925 | size_t new_indent2) |
| 926 | { |
| 927 | if (c->width == new_width && c->indent1 == new_indent1 && |
| 928 | c->indent2 == new_indent2) |
| 929 | return; |
René Scharfe | 32ca424 | 2009-11-08 02:04:21 +0100 | [diff] [blame] | 930 | if (c->wrap_start < sb->len) |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 931 | strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2); |
| 932 | c->wrap_start = sb->len; |
| 933 | c->width = new_width; |
| 934 | c->indent1 = new_indent1; |
| 935 | c->indent2 = new_indent2; |
| 936 | } |
| 937 | |
Jeff King | cd1957f | 2011-12-16 06:40:24 -0500 | [diff] [blame] | 938 | static int format_reflog_person(struct strbuf *sb, |
| 939 | char part, |
| 940 | struct reflog_walk_info *log, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 941 | const struct date_mode *dmode) |
Jeff King | cd1957f | 2011-12-16 06:40:24 -0500 | [diff] [blame] | 942 | { |
| 943 | const char *ident; |
| 944 | |
| 945 | if (!log) |
| 946 | return 2; |
| 947 | |
| 948 | ident = get_reflog_ident(log); |
| 949 | if (!ident) |
| 950 | return 2; |
| 951 | |
| 952 | return format_person_part(sb, part, ident, strlen(ident), dmode); |
| 953 | } |
| 954 | |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 955 | static size_t parse_color(struct strbuf *sb, /* in UTF-8 */ |
| 956 | const char *placeholder, |
| 957 | struct format_commit_context *c) |
| 958 | { |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 959 | const char *rest = placeholder; |
| 960 | |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 961 | if (placeholder[1] == '(') { |
| 962 | const char *begin = placeholder + 2; |
| 963 | const char *end = strchr(begin, ')'); |
| 964 | char color[COLOR_MAXLEN]; |
| 965 | |
| 966 | if (!end) |
| 967 | return 0; |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 968 | if (skip_prefix(begin, "auto,", &begin)) { |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 969 | if (!want_color(c->pretty_ctx->color)) |
| 970 | return end - placeholder + 1; |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 971 | } |
Jeff King | f6c5a29 | 2014-10-07 15:33:09 -0400 | [diff] [blame] | 972 | if (color_parse_mem(begin, end - begin, color) < 0) |
| 973 | die(_("unable to parse --pretty format")); |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 974 | strbuf_addstr(sb, color); |
| 975 | return end - placeholder + 1; |
| 976 | } |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 977 | if (skip_prefix(placeholder + 1, "red", &rest)) |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 978 | strbuf_addstr(sb, GIT_COLOR_RED); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 979 | else if (skip_prefix(placeholder + 1, "green", &rest)) |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 980 | strbuf_addstr(sb, GIT_COLOR_GREEN); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 981 | else if (skip_prefix(placeholder + 1, "blue", &rest)) |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 982 | strbuf_addstr(sb, GIT_COLOR_BLUE); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 983 | else if (skip_prefix(placeholder + 1, "reset", &rest)) |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 984 | strbuf_addstr(sb, GIT_COLOR_RESET); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 985 | return rest - placeholder; |
Nguyễn Thái Ngọc Duy | fcabc2d | 2013-04-19 09:08:48 +1000 | [diff] [blame] | 986 | } |
| 987 | |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 988 | static size_t parse_padding_placeholder(struct strbuf *sb, |
| 989 | const char *placeholder, |
| 990 | struct format_commit_context *c) |
| 991 | { |
| 992 | const char *ch = placeholder; |
| 993 | enum flush_type flush_type; |
| 994 | int to_column = 0; |
| 995 | |
| 996 | switch (*ch++) { |
| 997 | case '<': |
| 998 | flush_type = flush_right; |
| 999 | break; |
| 1000 | case '>': |
| 1001 | if (*ch == '<') { |
| 1002 | flush_type = flush_both; |
| 1003 | ch++; |
Nguyễn Thái Ngọc Duy | 1640632 | 2013-04-19 09:08:52 +1000 | [diff] [blame] | 1004 | } else if (*ch == '>') { |
| 1005 | flush_type = flush_left_and_steal; |
| 1006 | ch++; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1007 | } else |
| 1008 | flush_type = flush_left; |
| 1009 | break; |
| 1010 | default: |
| 1011 | return 0; |
| 1012 | } |
| 1013 | |
| 1014 | /* the next value means "wide enough to that column" */ |
| 1015 | if (*ch == '|') { |
| 1016 | to_column = 1; |
| 1017 | ch++; |
| 1018 | } |
| 1019 | |
| 1020 | if (*ch == '(') { |
| 1021 | const char *start = ch + 1; |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1022 | const char *end = start + strcspn(start, ",)"); |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1023 | char *next; |
| 1024 | int width; |
| 1025 | if (!end || end == start) |
| 1026 | return 0; |
Nguyễn Thái Ngọc Duy | 066790d | 2016-06-16 20:18:38 +0700 | [diff] [blame] | 1027 | width = strtol(start, &next, 10); |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1028 | if (next == start || width == 0) |
| 1029 | return 0; |
Nguyễn Thái Ngọc Duy | 066790d | 2016-06-16 20:18:38 +0700 | [diff] [blame] | 1030 | if (width < 0) { |
| 1031 | if (to_column) |
| 1032 | width += term_columns(); |
| 1033 | if (width < 0) |
| 1034 | return 0; |
| 1035 | } |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1036 | c->padding = to_column ? -width : width; |
| 1037 | c->flush_type = flush_type; |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1038 | |
| 1039 | if (*end == ',') { |
| 1040 | start = end + 1; |
| 1041 | end = strchr(start, ')'); |
| 1042 | if (!end || end == start) |
| 1043 | return 0; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1044 | if (starts_with(start, "trunc)")) |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1045 | c->truncate = trunc_right; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1046 | else if (starts_with(start, "ltrunc)")) |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1047 | c->truncate = trunc_left; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1048 | else if (starts_with(start, "mtrunc)")) |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1049 | c->truncate = trunc_middle; |
| 1050 | else |
| 1051 | return 0; |
| 1052 | } else |
| 1053 | c->truncate = trunc_none; |
| 1054 | |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1055 | return end - placeholder + 1; |
| 1056 | } |
| 1057 | return 0; |
| 1058 | } |
| 1059 | |
Nguyễn Thái Ngọc Duy | 7e77df3 | 2013-04-19 09:08:47 +1000 | [diff] [blame] | 1060 | static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ |
| 1061 | const char *placeholder, |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1062 | void *context) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1063 | { |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1064 | struct format_commit_context *c = context; |
| 1065 | const struct commit *commit = c->commit; |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 1066 | const char *msg = c->message; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1067 | struct commit_list *p; |
René Scharfe | d233097 | 2016-09-03 17:59:20 +0200 | [diff] [blame] | 1068 | int ch; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1069 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1070 | /* these are independent of the commit */ |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1071 | switch (placeholder[0]) { |
| 1072 | case 'C': |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1073 | if (starts_with(placeholder + 1, "(auto)")) { |
Edward Thomson | b15a3e0 | 2016-05-26 22:46:10 -0500 | [diff] [blame] | 1074 | c->auto_color = want_color(c->pretty_ctx->color); |
René Scharfe | c99ad27 | 2016-09-17 20:25:24 +0200 | [diff] [blame] | 1075 | if (c->auto_color) |
| 1076 | strbuf_addstr(sb, GIT_COLOR_RESET); |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1077 | return 7; /* consumed 7 bytes, "C(auto)" */ |
| 1078 | } else { |
| 1079 | int ret = parse_color(sb, placeholder, c); |
| 1080 | if (ret) |
| 1081 | c->auto_color = 0; |
| 1082 | /* |
| 1083 | * Otherwise, we decided to treat %C<unknown> |
| 1084 | * as a literal string, and the previous |
| 1085 | * %C(auto) is still valid. |
| 1086 | */ |
| 1087 | return ret; |
Jeff King | c002922 | 2009-01-17 10:38:46 -0500 | [diff] [blame] | 1088 | } |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1089 | case 'n': /* newline */ |
| 1090 | strbuf_addch(sb, '\n'); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1091 | return 1; |
Govind Salinas | 42c8c74 | 2008-03-21 10:05:06 -0500 | [diff] [blame] | 1092 | case 'x': |
| 1093 | /* %x00 == NUL, %x0a == LF, etc. */ |
René Scharfe | d233097 | 2016-09-03 17:59:20 +0200 | [diff] [blame] | 1094 | ch = hex2chr(placeholder + 1); |
| 1095 | if (ch < 0) |
Govind Salinas | 42c8c74 | 2008-03-21 10:05:06 -0500 | [diff] [blame] | 1096 | return 0; |
René Scharfe | d233097 | 2016-09-03 17:59:20 +0200 | [diff] [blame] | 1097 | strbuf_addch(sb, ch); |
| 1098 | return 3; |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 1099 | case 'w': |
| 1100 | if (placeholder[1] == '(') { |
| 1101 | unsigned long width = 0, indent1 = 0, indent2 = 0; |
| 1102 | char *next; |
| 1103 | const char *start = placeholder + 2; |
| 1104 | const char *end = strchr(start, ')'); |
| 1105 | if (!end) |
| 1106 | return 0; |
| 1107 | if (end > start) { |
| 1108 | width = strtoul(start, &next, 10); |
| 1109 | if (*next == ',') { |
| 1110 | indent1 = strtoul(next + 1, &next, 10); |
| 1111 | if (*next == ',') { |
| 1112 | indent2 = strtoul(next + 1, |
| 1113 | &next, 10); |
| 1114 | } |
| 1115 | } |
| 1116 | if (*next != ')') |
| 1117 | return 0; |
| 1118 | } |
| 1119 | rewrap_message_tail(sb, c, width, indent1, indent2); |
| 1120 | return end - placeholder + 1; |
| 1121 | } else |
| 1122 | return 0; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1123 | |
| 1124 | case '<': |
| 1125 | case '>': |
| 1126 | return parse_padding_placeholder(sb, placeholder, c); |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1127 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1128 | |
| 1129 | /* these depend on the commit */ |
| 1130 | if (!commit->object.parsed) |
brian m. carlson | ed1c997 | 2015-11-10 02:22:29 +0000 | [diff] [blame] | 1131 | parse_object(commit->object.oid.hash); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1132 | |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1133 | switch (placeholder[0]) { |
| 1134 | case 'H': /* commit hash */ |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1135 | strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT)); |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1136 | strbuf_addstr(sb, oid_to_hex(&commit->object.oid)); |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1137 | strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET)); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1138 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1139 | case 'h': /* abbreviated commit hash */ |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1140 | strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_COMMIT)); |
| 1141 | if (add_again(sb, &c->abbrev_commit_hash)) { |
| 1142 | strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET)); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1143 | return 1; |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1144 | } |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 1145 | strbuf_add_unique_abbrev(sb, commit->object.oid.hash, |
| 1146 | c->pretty_ctx->abbrev); |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1147 | strbuf_addstr(sb, diff_get_color(c->auto_color, DIFF_RESET)); |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 1148 | c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off; |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1149 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1150 | case 'T': /* tree hash */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1151 | strbuf_addstr(sb, oid_to_hex(&commit->tree->object.oid)); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1152 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1153 | case 't': /* abbreviated tree hash */ |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 1154 | if (add_again(sb, &c->abbrev_tree_hash)) |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1155 | return 1; |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 1156 | strbuf_add_unique_abbrev(sb, commit->tree->object.oid.hash, |
| 1157 | c->pretty_ctx->abbrev); |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 1158 | c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off; |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1159 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1160 | case 'P': /* parent hashes */ |
| 1161 | for (p = commit->parents; p; p = p->next) { |
| 1162 | if (p != commit->parents) |
| 1163 | strbuf_addch(sb, ' '); |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 1164 | strbuf_addstr(sb, oid_to_hex(&p->item->object.oid)); |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1165 | } |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1166 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1167 | case 'p': /* abbreviated parent hashes */ |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 1168 | if (add_again(sb, &c->abbrev_parent_hashes)) |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1169 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1170 | for (p = commit->parents; p; p = p->next) { |
| 1171 | if (p != commit->parents) |
| 1172 | strbuf_addch(sb, ' '); |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 1173 | strbuf_add_unique_abbrev(sb, p->item->object.oid.hash, |
| 1174 | c->pretty_ctx->abbrev); |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1175 | } |
René Scharfe | b9c6232 | 2007-11-10 12:18:26 +0100 | [diff] [blame] | 1176 | c->abbrev_parent_hashes.len = sb->len - |
| 1177 | c->abbrev_parent_hashes.off; |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1178 | return 1; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1179 | case 'm': /* left/right/bottom */ |
Michael J Gruber | 1df2d65 | 2011-03-07 13:31:39 +0100 | [diff] [blame] | 1180 | strbuf_addstr(sb, get_revision_mark(NULL, commit)); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1181 | return 1; |
René Scharfe | 3b3d443 | 2008-09-04 23:40:03 +0200 | [diff] [blame] | 1182 | case 'd': |
Nguyễn Thái Ngọc Duy | 9d3f002 | 2013-04-19 09:08:43 +1000 | [diff] [blame] | 1183 | load_ref_decorations(DECORATE_SHORT_REFS); |
Nguyễn Thái Ngọc Duy | a95f067 | 2013-04-19 09:08:49 +1000 | [diff] [blame] | 1184 | format_decorations(sb, commit, c->auto_color); |
René Scharfe | 3b3d443 | 2008-09-04 23:40:03 +0200 | [diff] [blame] | 1185 | return 1; |
Harry Jeffery | 9271095 | 2014-09-18 21:53:53 +0100 | [diff] [blame] | 1186 | case 'D': |
| 1187 | load_ref_decorations(DECORATE_SHORT_REFS); |
| 1188 | format_decorations_extended(sb, commit, c->auto_color, "", ", ", ""); |
| 1189 | return 1; |
Thomas Rast | 8f8f547 | 2009-10-19 17:48:10 +0200 | [diff] [blame] | 1190 | case 'g': /* reflog info */ |
| 1191 | switch(placeholder[1]) { |
| 1192 | case 'd': /* reflog selector */ |
| 1193 | case 'D': |
| 1194 | if (c->pretty_ctx->reflog_info) |
| 1195 | get_reflog_selector(sb, |
| 1196 | c->pretty_ctx->reflog_info, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 1197 | &c->pretty_ctx->date_mode, |
Junio C Hamano | 55ccf85 | 2012-05-07 14:11:32 -0700 | [diff] [blame] | 1198 | c->pretty_ctx->date_mode_explicit, |
Thomas Rast | 8f8f547 | 2009-10-19 17:48:10 +0200 | [diff] [blame] | 1199 | (placeholder[1] == 'd')); |
| 1200 | return 2; |
| 1201 | case 's': /* reflog message */ |
| 1202 | if (c->pretty_ctx->reflog_info) |
| 1203 | get_reflog_message(sb, c->pretty_ctx->reflog_info); |
| 1204 | return 2; |
Jeff King | cd1957f | 2011-12-16 06:40:24 -0500 | [diff] [blame] | 1205 | case 'n': |
| 1206 | case 'N': |
| 1207 | case 'e': |
| 1208 | case 'E': |
| 1209 | return format_reflog_person(sb, |
| 1210 | placeholder[1], |
| 1211 | c->pretty_ctx->reflog_info, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 1212 | &c->pretty_ctx->date_mode); |
Thomas Rast | 8f8f547 | 2009-10-19 17:48:10 +0200 | [diff] [blame] | 1213 | } |
| 1214 | return 0; /* unknown %g placeholder */ |
Johannes Schindelin | 8b208f0 | 2009-10-09 12:22:05 +0200 | [diff] [blame] | 1215 | case 'N': |
Junio C Hamano | ddf333f | 2012-10-17 18:51:47 -0700 | [diff] [blame] | 1216 | if (c->pretty_ctx->notes_message) { |
| 1217 | strbuf_addstr(sb, c->pretty_ctx->notes_message); |
Johannes Gilger | 5b16360 | 2010-04-13 22:31:12 +0200 | [diff] [blame] | 1218 | return 1; |
| 1219 | } |
| 1220 | return 0; |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1221 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1222 | |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1223 | if (placeholder[0] == 'G') { |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1224 | if (!c->signature_check.result) |
| 1225 | check_commit_signature(c->commit, &(c->signature_check)); |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1226 | switch (placeholder[1]) { |
| 1227 | case 'G': |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1228 | if (c->signature_check.gpg_output) |
| 1229 | strbuf_addstr(sb, c->signature_check.gpg_output); |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1230 | break; |
| 1231 | case '?': |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1232 | switch (c->signature_check.result) { |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1233 | case 'G': |
| 1234 | case 'B': |
Sebastian Götte | e290c4b | 2013-03-31 18:03:22 +0200 | [diff] [blame] | 1235 | case 'U': |
| 1236 | case 'N': |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1237 | strbuf_addch(sb, c->signature_check.result); |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1238 | } |
| 1239 | break; |
| 1240 | case 'S': |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1241 | if (c->signature_check.signer) |
| 1242 | strbuf_addstr(sb, c->signature_check.signer); |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1243 | break; |
Michael J Gruber | 0174eea | 2013-02-14 17:04:46 +0100 | [diff] [blame] | 1244 | case 'K': |
Sebastian Götte | ffb6d7d | 2013-03-31 18:00:14 +0200 | [diff] [blame] | 1245 | if (c->signature_check.key) |
| 1246 | strbuf_addstr(sb, c->signature_check.key); |
Michael J Gruber | 0174eea | 2013-02-14 17:04:46 +0100 | [diff] [blame] | 1247 | break; |
Jeff King | aa4b78d | 2014-06-16 20:07:07 -0400 | [diff] [blame] | 1248 | default: |
| 1249 | return 0; |
Junio C Hamano | f6667c5 | 2011-10-21 21:06:02 -0700 | [diff] [blame] | 1250 | } |
| 1251 | return 2; |
| 1252 | } |
| 1253 | |
| 1254 | |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1255 | /* For the rest we have to parse the commit header. */ |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1256 | if (!c->commit_header_parsed) |
| 1257 | parse_commit_header(c); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1258 | |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1259 | switch (placeholder[0]) { |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1260 | case 'a': /* author ... */ |
| 1261 | return format_person_part(sb, placeholder[1], |
Jeff King | d36f867 | 2008-08-28 20:54:59 -0400 | [diff] [blame] | 1262 | msg + c->author.off, c->author.len, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 1263 | &c->pretty_ctx->date_mode); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1264 | case 'c': /* committer ... */ |
| 1265 | return format_person_part(sb, placeholder[1], |
Jeff King | d36f867 | 2008-08-28 20:54:59 -0400 | [diff] [blame] | 1266 | msg + c->committer.off, c->committer.len, |
Jeff King | a5481a6 | 2015-06-25 12:55:02 -0400 | [diff] [blame] | 1267 | &c->pretty_ctx->date_mode); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1268 | case 'e': /* encoding */ |
Nguyễn Thái Ngọc Duy | 0940a76 | 2013-04-19 09:08:41 +1000 | [diff] [blame] | 1269 | if (c->commit_encoding) |
| 1270 | strbuf_addstr(sb, c->commit_encoding); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1271 | return 1; |
Eli Barzilay | 1367b12 | 2010-03-24 22:51:52 -0400 | [diff] [blame] | 1272 | case 'B': /* raw body */ |
| 1273 | /* message_off is always left at the initial newline */ |
| 1274 | strbuf_addstr(sb, msg + c->message_off + 1); |
| 1275 | return 1; |
René Scharfe | f53bd74 | 2008-12-27 01:49:21 +0100 | [diff] [blame] | 1276 | } |
| 1277 | |
| 1278 | /* Now we need to parse the commit message. */ |
| 1279 | if (!c->commit_message_parsed) |
| 1280 | parse_commit_message(c); |
| 1281 | |
| 1282 | switch (placeholder[0]) { |
| 1283 | case 's': /* subject */ |
| 1284 | format_subject(sb, msg + c->subject_off, " "); |
| 1285 | return 1; |
Stephen Boyd | 46d164b | 2009-03-22 19:14:01 -0700 | [diff] [blame] | 1286 | case 'f': /* sanitized subject */ |
| 1287 | format_sanitized_subject(sb, msg + c->subject_off); |
| 1288 | return 1; |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1289 | case 'b': /* body */ |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1290 | strbuf_addstr(sb, msg + c->body_off); |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1291 | return 1; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1292 | } |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1293 | return 0; /* unknown placeholder */ |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1294 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1295 | |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1296 | static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */ |
| 1297 | const char *placeholder, |
| 1298 | struct format_commit_context *c) |
| 1299 | { |
| 1300 | struct strbuf local_sb = STRBUF_INIT; |
| 1301 | int total_consumed = 0, len, padding = c->padding; |
| 1302 | if (padding < 0) { |
| 1303 | const char *start = strrchr(sb->buf, '\n'); |
| 1304 | int occupied; |
| 1305 | if (!start) |
| 1306 | start = sb->buf; |
| 1307 | occupied = utf8_strnwidth(start, -1, 1); |
Josef Kufner | 3ad87c8 | 2016-06-16 20:18:37 +0700 | [diff] [blame] | 1308 | occupied += c->pretty_ctx->graph_width; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1309 | padding = (-padding) - occupied; |
| 1310 | } |
| 1311 | while (1) { |
| 1312 | int modifier = *placeholder == 'C'; |
| 1313 | int consumed = format_commit_one(&local_sb, placeholder, c); |
| 1314 | total_consumed += consumed; |
| 1315 | |
| 1316 | if (!modifier) |
| 1317 | break; |
| 1318 | |
| 1319 | placeholder += consumed; |
| 1320 | if (*placeholder != '%') |
| 1321 | break; |
| 1322 | placeholder++; |
| 1323 | total_consumed++; |
| 1324 | } |
| 1325 | len = utf8_strnwidth(local_sb.buf, -1, 1); |
Nguyễn Thái Ngọc Duy | 1640632 | 2013-04-19 09:08:52 +1000 | [diff] [blame] | 1326 | |
| 1327 | if (c->flush_type == flush_left_and_steal) { |
| 1328 | const char *ch = sb->buf + sb->len - 1; |
| 1329 | while (len > padding && ch > sb->buf) { |
| 1330 | const char *p; |
| 1331 | if (*ch == ' ') { |
| 1332 | ch--; |
| 1333 | padding++; |
| 1334 | continue; |
| 1335 | } |
| 1336 | /* check for trailing ansi sequences */ |
| 1337 | if (*ch != 'm') |
| 1338 | break; |
| 1339 | p = ch - 1; |
| 1340 | while (ch - p < 10 && *p != '\033') |
| 1341 | p--; |
| 1342 | if (*p != '\033' || |
| 1343 | ch + 1 - p != display_mode_esc_sequence_len(p)) |
| 1344 | break; |
| 1345 | /* |
| 1346 | * got a good ansi sequence, put it back to |
| 1347 | * local_sb as we're cutting sb |
| 1348 | */ |
| 1349 | strbuf_insert(&local_sb, 0, p, ch + 1 - p); |
| 1350 | ch = p - 1; |
| 1351 | } |
| 1352 | strbuf_setlen(sb, ch + 1 - sb->buf); |
| 1353 | c->flush_type = flush_left; |
| 1354 | } |
| 1355 | |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1356 | if (len > padding) { |
| 1357 | switch (c->truncate) { |
| 1358 | case trunc_left: |
| 1359 | strbuf_utf8_replace(&local_sb, |
| 1360 | 0, len - (padding - 2), |
| 1361 | ".."); |
| 1362 | break; |
| 1363 | case trunc_middle: |
| 1364 | strbuf_utf8_replace(&local_sb, |
| 1365 | padding / 2 - 1, |
| 1366 | len - (padding - 2), |
| 1367 | ".."); |
| 1368 | break; |
| 1369 | case trunc_right: |
| 1370 | strbuf_utf8_replace(&local_sb, |
| 1371 | padding - 2, len - (padding - 2), |
| 1372 | ".."); |
| 1373 | break; |
| 1374 | case trunc_none: |
| 1375 | break; |
| 1376 | } |
René Scharfe | e992d1e | 2014-07-10 10:52:21 +0200 | [diff] [blame] | 1377 | strbuf_addbuf(sb, &local_sb); |
Nguyễn Thái Ngọc Duy | a7f01c6 | 2013-04-19 09:08:51 +1000 | [diff] [blame] | 1378 | } else { |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1379 | int sb_len = sb->len, offset = 0; |
| 1380 | if (c->flush_type == flush_left) |
| 1381 | offset = padding - len; |
| 1382 | else if (c->flush_type == flush_both) |
| 1383 | offset = (padding - len) / 2; |
| 1384 | /* |
| 1385 | * we calculate padding in columns, now |
| 1386 | * convert it back to chars |
| 1387 | */ |
| 1388 | padding = padding - len + local_sb.len; |
René Scharfe | 415792e | 2014-09-07 09:06:42 +0200 | [diff] [blame] | 1389 | strbuf_addchars(sb, ' ', padding); |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1390 | memcpy(sb->buf + sb_len + offset, local_sb.buf, |
| 1391 | local_sb.len); |
| 1392 | } |
| 1393 | strbuf_release(&local_sb); |
| 1394 | c->flush_type = no_flush; |
| 1395 | return total_consumed; |
| 1396 | } |
| 1397 | |
Nguyễn Thái Ngọc Duy | 7e77df3 | 2013-04-19 09:08:47 +1000 | [diff] [blame] | 1398 | static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */ |
| 1399 | const char *placeholder, |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1400 | void *context) |
| 1401 | { |
| 1402 | int consumed; |
| 1403 | size_t orig_len; |
| 1404 | enum { |
| 1405 | NO_MAGIC, |
| 1406 | ADD_LF_BEFORE_NON_EMPTY, |
| 1407 | DEL_LF_BEFORE_EMPTY, |
Junio C Hamano | 223a923 | 2010-06-22 09:45:22 -0700 | [diff] [blame] | 1408 | ADD_SP_BEFORE_NON_EMPTY |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1409 | } magic = NO_MAGIC; |
| 1410 | |
| 1411 | switch (placeholder[0]) { |
| 1412 | case '-': |
| 1413 | magic = DEL_LF_BEFORE_EMPTY; |
| 1414 | break; |
| 1415 | case '+': |
| 1416 | magic = ADD_LF_BEFORE_NON_EMPTY; |
| 1417 | break; |
Michael J Gruber | 7b88176 | 2010-06-14 18:12:29 +0200 | [diff] [blame] | 1418 | case ' ': |
| 1419 | magic = ADD_SP_BEFORE_NON_EMPTY; |
| 1420 | break; |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1421 | default: |
| 1422 | break; |
| 1423 | } |
| 1424 | if (magic != NO_MAGIC) |
| 1425 | placeholder++; |
| 1426 | |
| 1427 | orig_len = sb->len; |
Nguyễn Thái Ngọc Duy | a575234 | 2013-04-19 09:08:50 +1000 | [diff] [blame] | 1428 | if (((struct format_commit_context *)context)->flush_type != no_flush) |
| 1429 | consumed = format_and_pad_commit(sb, placeholder, context); |
| 1430 | else |
| 1431 | consumed = format_commit_one(sb, placeholder, context); |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1432 | if (magic == NO_MAGIC) |
| 1433 | return consumed; |
| 1434 | |
| 1435 | if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) { |
| 1436 | while (sb->len && sb->buf[sb->len - 1] == '\n') |
| 1437 | strbuf_setlen(sb, sb->len - 1); |
Michael J Gruber | 7b88176 | 2010-06-14 18:12:29 +0200 | [diff] [blame] | 1438 | } else if (orig_len != sb->len) { |
| 1439 | if (magic == ADD_LF_BEFORE_NON_EMPTY) |
| 1440 | strbuf_insert(sb, orig_len, "\n", 1); |
| 1441 | else if (magic == ADD_SP_BEFORE_NON_EMPTY) |
| 1442 | strbuf_insert(sb, orig_len, " ", 1); |
Junio C Hamano | 9fa708d | 2009-10-04 23:43:32 -0700 | [diff] [blame] | 1443 | } |
| 1444 | return consumed + 1; |
| 1445 | } |
| 1446 | |
Johannes Gilger | 5b16360 | 2010-04-13 22:31:12 +0200 | [diff] [blame] | 1447 | static size_t userformat_want_item(struct strbuf *sb, const char *placeholder, |
| 1448 | void *context) |
| 1449 | { |
| 1450 | struct userformat_want *w = context; |
| 1451 | |
Michael J Gruber | 7b88176 | 2010-06-14 18:12:29 +0200 | [diff] [blame] | 1452 | if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ') |
Johannes Gilger | 5b16360 | 2010-04-13 22:31:12 +0200 | [diff] [blame] | 1453 | placeholder++; |
| 1454 | |
| 1455 | switch (*placeholder) { |
| 1456 | case 'N': |
| 1457 | w->notes = 1; |
| 1458 | break; |
| 1459 | } |
| 1460 | return 0; |
| 1461 | } |
| 1462 | |
| 1463 | void userformat_find_requirements(const char *fmt, struct userformat_want *w) |
| 1464 | { |
| 1465 | struct strbuf dummy = STRBUF_INIT; |
| 1466 | |
| 1467 | if (!fmt) { |
| 1468 | if (!user_format) |
| 1469 | return; |
| 1470 | fmt = user_format; |
| 1471 | } |
Junio C Hamano | a6253d1 | 2011-05-25 12:23:44 -0700 | [diff] [blame] | 1472 | strbuf_expand(&dummy, fmt, userformat_want_item, w); |
Johannes Gilger | 5b16360 | 2010-04-13 22:31:12 +0200 | [diff] [blame] | 1473 | strbuf_release(&dummy); |
| 1474 | } |
| 1475 | |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1476 | void format_commit_message(const struct commit *commit, |
Junio C Hamano | 7f98ebc | 2009-10-15 22:59:41 -0700 | [diff] [blame] | 1477 | const char *format, struct strbuf *sb, |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 1478 | const struct pretty_print_context *pretty_ctx) |
René Scharfe | cde75e5 | 2007-11-09 01:49:42 +0100 | [diff] [blame] | 1479 | { |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1480 | struct format_commit_context context; |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 1481 | const char *output_enc = pretty_ctx->output_encoding; |
Nguyễn Thái Ngọc Duy | 7e77df3 | 2013-04-19 09:08:47 +1000 | [diff] [blame] | 1482 | const char *utf8 = "UTF-8"; |
René Scharfe | f29d595 | 2007-11-10 12:14:20 +0100 | [diff] [blame] | 1483 | |
| 1484 | memset(&context, 0, sizeof(context)); |
| 1485 | context.commit = commit; |
Thomas Rast | dd2e794 | 2009-10-19 17:48:08 +0200 | [diff] [blame] | 1486 | context.pretty_ctx = pretty_ctx; |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 1487 | context.wrap_start = sb->len; |
Alexey Shumkin | 7d50987 | 2014-05-21 17:20:07 +0400 | [diff] [blame] | 1488 | /* |
| 1489 | * convert a commit message to UTF-8 first |
| 1490 | * as far as 'format_commit_item' assumes it in UTF-8 |
| 1491 | */ |
Nguyễn Thái Ngọc Duy | 0940a76 | 2013-04-19 09:08:41 +1000 | [diff] [blame] | 1492 | context.message = logmsg_reencode(commit, |
| 1493 | &context.commit_encoding, |
Alexey Shumkin | 7d50987 | 2014-05-21 17:20:07 +0400 | [diff] [blame] | 1494 | utf8); |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 1495 | |
Marco Costalba | c3a670d | 2008-02-09 15:40:19 +0100 | [diff] [blame] | 1496 | strbuf_expand(sb, format, format_commit_item, &context); |
René Scharfe | 02edd56 | 2009-10-17 23:04:19 +0200 | [diff] [blame] | 1497 | rewrap_message_tail(sb, &context, 0, 0, 0); |
Pat Notz | 177b29d | 2010-11-02 13:59:08 -0600 | [diff] [blame] | 1498 | |
Alexey Shumkin | 7d50987 | 2014-05-21 17:20:07 +0400 | [diff] [blame] | 1499 | /* then convert a commit message to an actual output encoding */ |
Nguyễn Thái Ngọc Duy | 7e77df3 | 2013-04-19 09:08:47 +1000 | [diff] [blame] | 1500 | if (output_enc) { |
| 1501 | if (same_encoding(utf8, output_enc)) |
| 1502 | output_enc = NULL; |
| 1503 | } else { |
| 1504 | if (context.commit_encoding && |
| 1505 | !same_encoding(context.commit_encoding, utf8)) |
| 1506 | output_enc = context.commit_encoding; |
| 1507 | } |
| 1508 | |
| 1509 | if (output_enc) { |
| 1510 | int outsz; |
| 1511 | char *out = reencode_string_len(sb->buf, sb->len, |
| 1512 | output_enc, utf8, &outsz); |
| 1513 | if (out) |
| 1514 | strbuf_attach(sb, out, outsz, outsz + 1); |
| 1515 | } |
| 1516 | |
Nguyễn Thái Ngọc Duy | 0940a76 | 2013-04-19 09:08:41 +1000 | [diff] [blame] | 1517 | free(context.commit_encoding); |
Jeff King | b66103c | 2014-06-10 17:41:39 -0400 | [diff] [blame] | 1518 | unuse_commit_buffer(commit, context.message); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1519 | } |
| 1520 | |
Jeff King | 10f2fbf | 2013-07-03 03:07:48 -0400 | [diff] [blame] | 1521 | static void pp_header(struct pretty_print_context *pp, |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1522 | const char *encoding, |
| 1523 | const struct commit *commit, |
| 1524 | const char **msg_p, |
| 1525 | struct strbuf *sb) |
| 1526 | { |
| 1527 | int parents_shown = 0; |
| 1528 | |
| 1529 | for (;;) { |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 1530 | const char *name, *line = *msg_p; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1531 | int linelen = get_one_line(*msg_p); |
| 1532 | |
| 1533 | if (!linelen) |
| 1534 | return; |
| 1535 | *msg_p += linelen; |
| 1536 | |
| 1537 | if (linelen == 1) |
| 1538 | /* End of header */ |
| 1539 | return; |
| 1540 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1541 | if (pp->fmt == CMIT_FMT_RAW) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1542 | strbuf_add(sb, line, linelen); |
| 1543 | continue; |
| 1544 | } |
| 1545 | |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1546 | if (starts_with(line, "parent ")) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1547 | if (linelen != 48) |
| 1548 | die("bad parent line in commit"); |
| 1549 | continue; |
| 1550 | } |
| 1551 | |
| 1552 | if (!parents_shown) { |
René Scharfe | 4bbaa1e | 2014-07-17 01:52:09 +0200 | [diff] [blame] | 1553 | unsigned num = commit_list_count(commit->parents); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1554 | /* with enough slop */ |
| 1555 | strbuf_grow(sb, num * 50 + 20); |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1556 | add_merge_info(pp, sb, commit); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1557 | parents_shown = 1; |
| 1558 | } |
| 1559 | |
| 1560 | /* |
| 1561 | * MEDIUM == DEFAULT shows only author with dates. |
| 1562 | * FULL shows both authors but not dates. |
| 1563 | * FULLER shows both authors and dates. |
| 1564 | */ |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 1565 | if (skip_prefix(line, "author ", &name)) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1566 | strbuf_grow(sb, linelen + 80); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 1567 | pp_user_info(pp, "Author", sb, name, encoding); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1568 | } |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 1569 | if (skip_prefix(line, "committer ", &name) && |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1570 | (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1571 | strbuf_grow(sb, linelen + 80); |
René Scharfe | e3f1da9 | 2014-10-04 20:54:50 +0200 | [diff] [blame] | 1572 | pp_user_info(pp, "Commit", sb, name, encoding); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1573 | } |
| 1574 | } |
| 1575 | } |
| 1576 | |
Jeff King | 10f2fbf | 2013-07-03 03:07:48 -0400 | [diff] [blame] | 1577 | void pp_title_line(struct pretty_print_context *pp, |
Daniel Barkalow | b02bd65 | 2008-02-18 22:56:08 -0500 | [diff] [blame] | 1578 | const char **msg_p, |
| 1579 | struct strbuf *sb, |
Daniel Barkalow | b02bd65 | 2008-02-18 22:56:08 -0500 | [diff] [blame] | 1580 | const char *encoding, |
Junio C Hamano | 267123b | 2008-03-15 00:09:20 -0700 | [diff] [blame] | 1581 | int need_8bit_cte) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1582 | { |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 1583 | static const int max_length = 78; /* per rfc2047 */ |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1584 | struct strbuf title; |
| 1585 | |
| 1586 | strbuf_init(&title, 80); |
Jeff King | 9553d2b | 2011-05-26 18:28:17 -0400 | [diff] [blame] | 1587 | *msg_p = format_subject(&title, *msg_p, |
| 1588 | pp->preserve_subject ? "\n" : " "); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1589 | |
| 1590 | strbuf_grow(sb, title.len + 1024); |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1591 | if (pp->subject) { |
| 1592 | strbuf_addstr(sb, pp->subject); |
Jan H. Schönherr | 41dd00b | 2012-10-18 16:43:33 +0200 | [diff] [blame] | 1593 | if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT)) |
| 1594 | add_rfc2047(sb, title.buf, title.len, |
| 1595 | encoding, RFC2047_SUBJECT); |
| 1596 | else |
| 1597 | strbuf_add_wrapped_bytes(sb, title.buf, title.len, |
| 1598 | -last_line_length(sb), 1, max_length); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1599 | } else { |
| 1600 | strbuf_addbuf(sb, &title); |
| 1601 | } |
| 1602 | strbuf_addch(sb, '\n'); |
| 1603 | |
Jeff King | a908047 | 2013-07-03 03:08:22 -0400 | [diff] [blame] | 1604 | if (need_8bit_cte == 0) { |
| 1605 | int i; |
| 1606 | for (i = 0; i < pp->in_body_headers.nr; i++) { |
| 1607 | if (has_non_ascii(pp->in_body_headers.items[i].string)) { |
| 1608 | need_8bit_cte = 1; |
| 1609 | break; |
| 1610 | } |
| 1611 | } |
| 1612 | } |
| 1613 | |
Junio C Hamano | 6bf4f1b | 2008-03-14 17:10:09 -0700 | [diff] [blame] | 1614 | if (need_8bit_cte > 0) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1615 | const char *header_fmt = |
| 1616 | "MIME-Version: 1.0\n" |
| 1617 | "Content-Type: text/plain; charset=%s\n" |
| 1618 | "Content-Transfer-Encoding: 8bit\n"; |
| 1619 | strbuf_addf(sb, header_fmt, encoding); |
| 1620 | } |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1621 | if (pp->after_subject) { |
| 1622 | strbuf_addstr(sb, pp->after_subject); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1623 | } |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1624 | if (cmit_fmt_is_mail(pp->fmt)) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1625 | strbuf_addch(sb, '\n'); |
| 1626 | } |
Jeff King | a908047 | 2013-07-03 03:08:22 -0400 | [diff] [blame] | 1627 | |
| 1628 | if (pp->in_body_headers.nr) { |
| 1629 | int i; |
| 1630 | for (i = 0; i < pp->in_body_headers.nr; i++) { |
| 1631 | strbuf_addstr(sb, pp->in_body_headers.items[i].string); |
| 1632 | free(pp->in_body_headers.items[i].string); |
| 1633 | } |
| 1634 | string_list_clear(&pp->in_body_headers, 0); |
| 1635 | strbuf_addch(sb, '\n'); |
| 1636 | } |
| 1637 | |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1638 | strbuf_release(&title); |
| 1639 | } |
| 1640 | |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1641 | static int pp_utf8_width(const char *start, const char *end) |
| 1642 | { |
| 1643 | int width = 0; |
| 1644 | size_t remain = end - start; |
| 1645 | |
| 1646 | while (remain) { |
| 1647 | int n = utf8_width(&start, &remain); |
| 1648 | if (n < 0 || !start) |
| 1649 | return -1; |
| 1650 | width += n; |
| 1651 | } |
| 1652 | return width; |
| 1653 | } |
| 1654 | |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 1655 | static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth, |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1656 | const char *line, int linelen) |
| 1657 | { |
| 1658 | const char *tab; |
| 1659 | |
| 1660 | while ((tab = memchr(line, '\t', linelen)) != NULL) { |
| 1661 | int width = pp_utf8_width(line, tab); |
| 1662 | |
| 1663 | /* |
| 1664 | * If it wasn't well-formed utf8, or it |
| 1665 | * had characters with badly defined |
| 1666 | * width (control characters etc), just |
| 1667 | * give up on trying to align things. |
| 1668 | */ |
| 1669 | if (width < 0) |
| 1670 | break; |
| 1671 | |
| 1672 | /* Output the data .. */ |
| 1673 | strbuf_add(sb, line, tab - line); |
| 1674 | |
| 1675 | /* .. and the de-tabified tab */ |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 1676 | strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth)); |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1677 | |
| 1678 | /* Skip over the printed part .. */ |
| 1679 | linelen -= tab + 1 - line; |
| 1680 | line = tab + 1; |
| 1681 | } |
| 1682 | |
| 1683 | /* |
| 1684 | * Print out everything after the last tab without |
| 1685 | * worrying about width - there's nothing more to |
| 1686 | * align. |
| 1687 | */ |
| 1688 | strbuf_add(sb, line, linelen); |
| 1689 | } |
| 1690 | |
| 1691 | /* |
| 1692 | * pp_handle_indent() prints out the intendation, and |
| 1693 | * the whole line (without the final newline), after |
| 1694 | * de-tabifying. |
| 1695 | */ |
| 1696 | static void pp_handle_indent(struct pretty_print_context *pp, |
| 1697 | struct strbuf *sb, int indent, |
| 1698 | const char *line, int linelen) |
| 1699 | { |
| 1700 | strbuf_addchars(sb, ' ', indent); |
| 1701 | if (pp->expand_tabs_in_log) |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 1702 | strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen); |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1703 | else |
| 1704 | strbuf_add(sb, line, linelen); |
| 1705 | } |
| 1706 | |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1707 | static int is_mboxrd_from(const char *line, int len) |
| 1708 | { |
| 1709 | /* |
| 1710 | * a line matching /^From $/ here would only have len == 4 |
| 1711 | * at this point because is_empty_line would've trimmed all |
| 1712 | * trailing space |
| 1713 | */ |
| 1714 | return len > 4 && starts_with(line + strspn(line, ">"), "From "); |
| 1715 | } |
| 1716 | |
Jeff King | 10f2fbf | 2013-07-03 03:07:48 -0400 | [diff] [blame] | 1717 | void pp_remainder(struct pretty_print_context *pp, |
Daniel Barkalow | b02bd65 | 2008-02-18 22:56:08 -0500 | [diff] [blame] | 1718 | const char **msg_p, |
| 1719 | struct strbuf *sb, |
| 1720 | int indent) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1721 | { |
| 1722 | int first = 1; |
| 1723 | for (;;) { |
| 1724 | const char *line = *msg_p; |
| 1725 | int linelen = get_one_line(line); |
| 1726 | *msg_p += linelen; |
| 1727 | |
| 1728 | if (!linelen) |
| 1729 | break; |
| 1730 | |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 1731 | if (is_blank_line(line, &linelen)) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1732 | if (first) |
| 1733 | continue; |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1734 | if (pp->fmt == CMIT_FMT_SHORT) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1735 | break; |
| 1736 | } |
| 1737 | first = 0; |
| 1738 | |
| 1739 | strbuf_grow(sb, linelen + indent + 20); |
René Scharfe | 415792e | 2014-09-07 09:06:42 +0200 | [diff] [blame] | 1740 | if (indent) |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1741 | pp_handle_indent(pp, sb, indent, line, linelen); |
Junio C Hamano | 0893eec | 2016-03-29 15:49:24 -0700 | [diff] [blame] | 1742 | else if (pp->expand_tabs_in_log) |
Junio C Hamano | fe37a9c | 2016-03-29 16:05:39 -0700 | [diff] [blame] | 1743 | strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, |
| 1744 | line, linelen); |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1745 | else { |
| 1746 | if (pp->fmt == CMIT_FMT_MBOXRD && |
| 1747 | is_mboxrd_from(line, linelen)) |
| 1748 | strbuf_addch(sb, '>'); |
| 1749 | |
Linus Torvalds | 7cc13c7 | 2016-03-16 09:15:53 -0700 | [diff] [blame] | 1750 | strbuf_add(sb, line, linelen); |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1751 | } |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1752 | strbuf_addch(sb, '\n'); |
| 1753 | } |
| 1754 | } |
| 1755 | |
Jeff King | 10f2fbf | 2013-07-03 03:07:48 -0400 | [diff] [blame] | 1756 | void pretty_print_commit(struct pretty_print_context *pp, |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1757 | const struct commit *commit, |
| 1758 | struct strbuf *sb) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1759 | { |
| 1760 | unsigned long beginning_of_body; |
| 1761 | int indent = 4; |
Jeff King | dd0d388 | 2013-01-26 04:44:06 -0500 | [diff] [blame] | 1762 | const char *msg; |
Jeff King | b000c59 | 2014-06-10 17:39:30 -0400 | [diff] [blame] | 1763 | const char *reencoded; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1764 | const char *encoding; |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1765 | int need_8bit_cte = pp->need_8bit_cte; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1766 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1767 | if (pp->fmt == CMIT_FMT_USERFORMAT) { |
| 1768 | format_commit_message(commit, user_format, sb, pp); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1769 | return; |
| 1770 | } |
| 1771 | |
Junio C Hamano | e297cf5 | 2012-10-17 17:12:55 -0700 | [diff] [blame] | 1772 | encoding = get_log_output_encoding(); |
Nguyễn Thái Ngọc Duy | 5a10d23 | 2013-04-19 09:08:40 +1000 | [diff] [blame] | 1773 | msg = reencoded = logmsg_reencode(commit, NULL, encoding); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1774 | |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1775 | if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt)) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1776 | indent = 0; |
| 1777 | |
Junio C Hamano | 6bf4f1b | 2008-03-14 17:10:09 -0700 | [diff] [blame] | 1778 | /* |
| 1779 | * We need to check and emit Content-type: to mark it |
| 1780 | * as 8-bit if we haven't done so. |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1781 | */ |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1782 | if (cmit_fmt_is_mail(pp->fmt) && need_8bit_cte == 0) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1783 | int i, ch, in_body; |
| 1784 | |
| 1785 | for (in_body = i = 0; (ch = msg[i]); i++) { |
| 1786 | if (!in_body) { |
| 1787 | /* author could be non 7-bit ASCII but |
| 1788 | * the log may be so; skip over the |
| 1789 | * header part first. |
| 1790 | */ |
| 1791 | if (ch == '\n' && msg[i+1] == '\n') |
| 1792 | in_body = 1; |
| 1793 | } |
| 1794 | else if (non_ascii(ch)) { |
Junio C Hamano | 6bf4f1b | 2008-03-14 17:10:09 -0700 | [diff] [blame] | 1795 | need_8bit_cte = 1; |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1796 | break; |
| 1797 | } |
| 1798 | } |
| 1799 | } |
| 1800 | |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1801 | pp_header(pp, encoding, commit, &msg, sb); |
| 1802 | if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) { |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1803 | strbuf_addch(sb, '\n'); |
| 1804 | } |
| 1805 | |
| 1806 | /* Skip excess blank lines at the beginning of body, if any... */ |
Johannes Schindelin | 7735612 | 2016-06-22 22:20:16 +0200 | [diff] [blame] | 1807 | msg = skip_blank_lines(msg); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1808 | |
| 1809 | /* These formats treat the title line specially. */ |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1810 | if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt)) |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1811 | pp_title_line(pp, &msg, sb, encoding, need_8bit_cte); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1812 | |
| 1813 | beginning_of_body = sb->len; |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1814 | if (pp->fmt != CMIT_FMT_ONELINE) |
| 1815 | pp_remainder(pp, &msg, sb, indent); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1816 | strbuf_rtrim(sb); |
| 1817 | |
| 1818 | /* Make sure there is an EOLN for the non-oneline case */ |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1819 | if (pp->fmt != CMIT_FMT_ONELINE) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1820 | strbuf_addch(sb, '\n'); |
| 1821 | |
| 1822 | /* |
| 1823 | * The caller may append additional body text in e-mail |
| 1824 | * format. Make sure we did not strip the blank line |
| 1825 | * between the header and the body. |
| 1826 | */ |
Eric Wong | 9f23e04 | 2016-06-05 04:46:39 +0000 | [diff] [blame] | 1827 | if (cmit_fmt_is_mail(pp->fmt) && sb->len <= beginning_of_body) |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1828 | strbuf_addch(sb, '\n'); |
Johannes Schindelin | a97a746 | 2009-10-09 12:21:57 +0200 | [diff] [blame] | 1829 | |
Jeff King | b66103c | 2014-06-10 17:41:39 -0400 | [diff] [blame] | 1830 | unuse_commit_buffer(commit, reencoded); |
Johannes Schindelin | 93fc05e | 2007-11-04 19:15:06 +0000 | [diff] [blame] | 1831 | } |
Jeff King | 8b8a537 | 2011-05-26 18:27:24 -0400 | [diff] [blame] | 1832 | |
| 1833 | void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit, |
| 1834 | struct strbuf *sb) |
| 1835 | { |
| 1836 | struct pretty_print_context pp = {0}; |
Jeff King | 6bf1394 | 2011-05-26 18:27:49 -0400 | [diff] [blame] | 1837 | pp.fmt = fmt; |
| 1838 | pretty_print_commit(&pp, commit, sb); |
Jeff King | 8b8a537 | 2011-05-26 18:27:24 -0400 | [diff] [blame] | 1839 | } |