log-tree.con commit Merge branch 'jk/diff-algo-finishing-touches' into maint (e4d1595)
   1#include "cache.h"
   2#include "diff.h"
   3#include "commit.h"
   4#include "tag.h"
   5#include "graph.h"
   6#include "log-tree.h"
   7#include "reflog-walk.h"
   8#include "refs.h"
   9#include "string-list.h"
  10#include "color.h"
  11#include "gpg-interface.h"
  12
  13struct decoration name_decoration = { "object names" };
  14
  15enum decoration_type {
  16        DECORATION_NONE = 0,
  17        DECORATION_REF_LOCAL,
  18        DECORATION_REF_REMOTE,
  19        DECORATION_REF_TAG,
  20        DECORATION_REF_STASH,
  21        DECORATION_REF_HEAD,
  22        DECORATION_GRAFTED,
  23};
  24
  25static char decoration_colors[][COLOR_MAXLEN] = {
  26        GIT_COLOR_RESET,
  27        GIT_COLOR_BOLD_GREEN,   /* REF_LOCAL */
  28        GIT_COLOR_BOLD_RED,     /* REF_REMOTE */
  29        GIT_COLOR_BOLD_YELLOW,  /* REF_TAG */
  30        GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
  31        GIT_COLOR_BOLD_CYAN,    /* REF_HEAD */
  32        GIT_COLOR_BOLD_BLUE,    /* GRAFTED */
  33};
  34
  35static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
  36{
  37        if (want_color(decorate_use_color))
  38                return decoration_colors[ix];
  39        return "";
  40}
  41
  42static int parse_decorate_color_slot(const char *slot)
  43{
  44        /*
  45         * We're comparing with 'ignore-case' on
  46         * (because config.c sets them all tolower),
  47         * but let's match the letters in the literal
  48         * string values here with how they are
  49         * documented in Documentation/config.txt, for
  50         * consistency.
  51         *
  52         * We love being consistent, don't we?
  53         */
  54        if (!strcasecmp(slot, "branch"))
  55                return DECORATION_REF_LOCAL;
  56        if (!strcasecmp(slot, "remoteBranch"))
  57                return DECORATION_REF_REMOTE;
  58        if (!strcasecmp(slot, "tag"))
  59                return DECORATION_REF_TAG;
  60        if (!strcasecmp(slot, "stash"))
  61                return DECORATION_REF_STASH;
  62        if (!strcasecmp(slot, "HEAD"))
  63                return DECORATION_REF_HEAD;
  64        return -1;
  65}
  66
  67int parse_decorate_color_config(const char *var, const int ofs, const char *value)
  68{
  69        int slot = parse_decorate_color_slot(var + ofs);
  70        if (slot < 0)
  71                return 0;
  72        if (!value)
  73                return config_error_nonbool(var);
  74        color_parse(value, var, decoration_colors[slot]);
  75        return 0;
  76}
  77
  78/*
  79 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
  80 * for showing the commit sha1, use the same check for --decorate
  81 */
  82#define decorate_get_color_opt(o, ix) \
  83        decorate_get_color((o)->use_color, ix)
  84
  85static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
  86{
  87        int nlen = strlen(name);
  88        struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen);
  89        memcpy(res->name, name, nlen + 1);
  90        res->type = type;
  91        res->next = add_decoration(&name_decoration, obj, res);
  92}
  93
  94static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
  95{
  96        struct object *obj;
  97        enum decoration_type type = DECORATION_NONE;
  98
  99        if (!prefixcmp(refname, "refs/replace/")) {
 100                unsigned char original_sha1[20];
 101                if (!read_replace_refs)
 102                        return 0;
 103                if (get_sha1_hex(refname + 13, original_sha1)) {
 104                        warning("invalid replace ref %s", refname);
 105                        return 0;
 106                }
 107                obj = parse_object(original_sha1);
 108                if (obj)
 109                        add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
 110                return 0;
 111        }
 112
 113        obj = parse_object(sha1);
 114        if (!obj)
 115                return 0;
 116
 117        if (!prefixcmp(refname, "refs/heads/"))
 118                type = DECORATION_REF_LOCAL;
 119        else if (!prefixcmp(refname, "refs/remotes/"))
 120                type = DECORATION_REF_REMOTE;
 121        else if (!prefixcmp(refname, "refs/tags/"))
 122                type = DECORATION_REF_TAG;
 123        else if (!strcmp(refname, "refs/stash"))
 124                type = DECORATION_REF_STASH;
 125        else if (!strcmp(refname, "HEAD"))
 126                type = DECORATION_REF_HEAD;
 127
 128        if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
 129                refname = prettify_refname(refname);
 130        add_name_decoration(type, refname, obj);
 131        while (obj->type == OBJ_TAG) {
 132                obj = ((struct tag *)obj)->tagged;
 133                if (!obj)
 134                        break;
 135                add_name_decoration(DECORATION_REF_TAG, refname, obj);
 136        }
 137        return 0;
 138}
 139
 140static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
 141{
 142        struct commit *commit = lookup_commit(graft->sha1);
 143        if (!commit)
 144                return 0;
 145        add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
 146        return 0;
 147}
 148
 149void load_ref_decorations(int flags)
 150{
 151        static int loaded;
 152        if (!loaded) {
 153                loaded = 1;
 154                for_each_ref(add_ref_decoration, &flags);
 155                head_ref(add_ref_decoration, &flags);
 156                for_each_commit_graft(add_graft_decoration, NULL);
 157        }
 158}
 159
 160static void show_parents(struct commit *commit, int abbrev)
 161{
 162        struct commit_list *p;
 163        for (p = commit->parents; p ; p = p->next) {
 164                struct commit *parent = p->item;
 165                printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
 166        }
 167}
 168
 169static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
 170{
 171        struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
 172        for ( ; p; p = p->next) {
 173                printf(" %s", find_unique_abbrev(p->item->object.sha1, abbrev));
 174        }
 175}
 176
 177void show_decorations(struct rev_info *opt, struct commit *commit)
 178{
 179        const char *prefix;
 180        struct name_decoration *decoration;
 181        const char *color_commit =
 182                diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
 183        const char *color_reset =
 184                decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
 185
 186        if (opt->show_source && commit->util)
 187                printf("\t%s", (char *) commit->util);
 188        if (!opt->show_decorations)
 189                return;
 190        decoration = lookup_decoration(&name_decoration, &commit->object);
 191        if (!decoration)
 192                return;
 193        prefix = " (";
 194        while (decoration) {
 195                printf("%s", prefix);
 196                fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
 197                      stdout);
 198                if (decoration->type == DECORATION_REF_TAG)
 199                        fputs("tag: ", stdout);
 200                printf("%s", decoration->name);
 201                fputs(color_reset, stdout);
 202                fputs(color_commit, stdout);
 203                prefix = ", ";
 204                decoration = decoration->next;
 205        }
 206        putchar(')');
 207}
 208
 209/*
 210 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
 211 * Signed-off-by: and Acked-by: lines.
 212 */
 213static int detect_any_signoff(char *letter, int size)
 214{
 215        char *cp;
 216        int seen_colon = 0;
 217        int seen_at = 0;
 218        int seen_name = 0;
 219        int seen_head = 0;
 220
 221        cp = letter + size;
 222        while (letter <= --cp && *cp == '\n')
 223                continue;
 224
 225        while (letter <= cp) {
 226                char ch = *cp--;
 227                if (ch == '\n')
 228                        break;
 229
 230                if (!seen_at) {
 231                        if (ch == '@')
 232                                seen_at = 1;
 233                        continue;
 234                }
 235                if (!seen_colon) {
 236                        if (ch == '@')
 237                                return 0;
 238                        else if (ch == ':')
 239                                seen_colon = 1;
 240                        else
 241                                seen_name = 1;
 242                        continue;
 243                }
 244                if (('A' <= ch && ch <= 'Z') ||
 245                    ('a' <= ch && ch <= 'z') ||
 246                    ch == '-') {
 247                        seen_head = 1;
 248                        continue;
 249                }
 250                /* no empty last line doesn't match */
 251                return 0;
 252        }
 253        return seen_head && seen_name;
 254}
 255
 256static void append_signoff(struct strbuf *sb, const char *signoff)
 257{
 258        static const char signed_off_by[] = "Signed-off-by: ";
 259        size_t signoff_len = strlen(signoff);
 260        int has_signoff = 0;
 261        char *cp;
 262
 263        cp = sb->buf;
 264
 265        /* First see if we already have the sign-off by the signer */
 266        while ((cp = strstr(cp, signed_off_by))) {
 267
 268                has_signoff = 1;
 269
 270                cp += strlen(signed_off_by);
 271                if (cp + signoff_len >= sb->buf + sb->len)
 272                        break;
 273                if (strncmp(cp, signoff, signoff_len))
 274                        continue;
 275                if (!isspace(cp[signoff_len]))
 276                        continue;
 277                /* we already have him */
 278                return;
 279        }
 280
 281        if (!has_signoff)
 282                has_signoff = detect_any_signoff(sb->buf, sb->len);
 283
 284        if (!has_signoff)
 285                strbuf_addch(sb, '\n');
 286
 287        strbuf_addstr(sb, signed_off_by);
 288        strbuf_add(sb, signoff, signoff_len);
 289        strbuf_addch(sb, '\n');
 290}
 291
 292static unsigned int digits_in_number(unsigned int number)
 293{
 294        unsigned int i = 10, result = 1;
 295        while (i <= number) {
 296                i *= 10;
 297                result++;
 298        }
 299        return result;
 300}
 301
 302void fmt_output_subject(struct strbuf *filename,
 303                        const char *subject,
 304                        struct rev_info *info)
 305{
 306        const char *suffix = info->patch_suffix;
 307        int nr = info->nr;
 308        int start_len = filename->len;
 309        int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
 310
 311        if (0 < info->reroll_count)
 312                strbuf_addf(filename, "v%d-", info->reroll_count);
 313        strbuf_addf(filename, "%04d-%s", nr, subject);
 314
 315        if (max_len < filename->len)
 316                strbuf_setlen(filename, max_len);
 317        strbuf_addstr(filename, suffix);
 318}
 319
 320void fmt_output_commit(struct strbuf *filename,
 321                       struct commit *commit,
 322                       struct rev_info *info)
 323{
 324        struct pretty_print_context ctx = {0};
 325        struct strbuf subject = STRBUF_INIT;
 326
 327        format_commit_message(commit, "%f", &subject, &ctx);
 328        fmt_output_subject(filename, subject.buf, info);
 329        strbuf_release(&subject);
 330}
 331
 332void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 333                             const char **subject_p,
 334                             const char **extra_headers_p,
 335                             int *need_8bit_cte_p)
 336{
 337        const char *subject = NULL;
 338        const char *extra_headers = opt->extra_headers;
 339        const char *name = sha1_to_hex(commit->object.sha1);
 340
 341        *need_8bit_cte_p = 0; /* unknown */
 342        if (opt->total > 0) {
 343                static char buffer[64];
 344                snprintf(buffer, sizeof(buffer),
 345                         "Subject: [%s%s%0*d/%d] ",
 346                         opt->subject_prefix,
 347                         *opt->subject_prefix ? " " : "",
 348                         digits_in_number(opt->total),
 349                         opt->nr, opt->total);
 350                subject = buffer;
 351        } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
 352                static char buffer[256];
 353                snprintf(buffer, sizeof(buffer),
 354                         "Subject: [%s] ",
 355                         opt->subject_prefix);
 356                subject = buffer;
 357        } else {
 358                subject = "Subject: ";
 359        }
 360
 361        printf("From %s Mon Sep 17 00:00:00 2001\n", name);
 362        graph_show_oneline(opt->graph);
 363        if (opt->message_id) {
 364                printf("Message-Id: <%s>\n", opt->message_id);
 365                graph_show_oneline(opt->graph);
 366        }
 367        if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
 368                int i, n;
 369                n = opt->ref_message_ids->nr;
 370                printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
 371                for (i = 0; i < n; i++)
 372                        printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
 373                               opt->ref_message_ids->items[i].string);
 374                graph_show_oneline(opt->graph);
 375        }
 376        if (opt->mime_boundary) {
 377                static char subject_buffer[1024];
 378                static char buffer[1024];
 379                struct strbuf filename =  STRBUF_INIT;
 380                *need_8bit_cte_p = -1; /* NEVER */
 381                snprintf(subject_buffer, sizeof(subject_buffer) - 1,
 382                         "%s"
 383                         "MIME-Version: 1.0\n"
 384                         "Content-Type: multipart/mixed;"
 385                         " boundary=\"%s%s\"\n"
 386                         "\n"
 387                         "This is a multi-part message in MIME "
 388                         "format.\n"
 389                         "--%s%s\n"
 390                         "Content-Type: text/plain; "
 391                         "charset=UTF-8; format=fixed\n"
 392                         "Content-Transfer-Encoding: 8bit\n\n",
 393                         extra_headers ? extra_headers : "",
 394                         mime_boundary_leader, opt->mime_boundary,
 395                         mime_boundary_leader, opt->mime_boundary);
 396                extra_headers = subject_buffer;
 397
 398                if (opt->numbered_files)
 399                        strbuf_addf(&filename, "%d", opt->nr);
 400                else
 401                        fmt_output_commit(&filename, commit, opt);
 402                snprintf(buffer, sizeof(buffer) - 1,
 403                         "\n--%s%s\n"
 404                         "Content-Type: text/x-patch;"
 405                         " name=\"%s\"\n"
 406                         "Content-Transfer-Encoding: 8bit\n"
 407                         "Content-Disposition: %s;"
 408                         " filename=\"%s\"\n\n",
 409                         mime_boundary_leader, opt->mime_boundary,
 410                         filename.buf,
 411                         opt->no_inline ? "attachment" : "inline",
 412                         filename.buf);
 413                opt->diffopt.stat_sep = buffer;
 414                strbuf_release(&filename);
 415        }
 416        *subject_p = subject;
 417        *extra_headers_p = extra_headers;
 418}
 419
 420static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
 421{
 422        const char *color, *reset, *eol;
 423
 424        color = diff_get_color_opt(&opt->diffopt,
 425                                   status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
 426        reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
 427        while (*bol) {
 428                eol = strchrnul(bol, '\n');
 429                printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
 430                       *eol ? "\n" : "");
 431                bol = (*eol) ? (eol + 1) : eol;
 432        }
 433}
 434
 435static void show_signature(struct rev_info *opt, struct commit *commit)
 436{
 437        struct strbuf payload = STRBUF_INIT;
 438        struct strbuf signature = STRBUF_INIT;
 439        struct strbuf gpg_output = STRBUF_INIT;
 440        int status;
 441
 442        if (parse_signed_commit(commit->object.sha1, &payload, &signature) <= 0)
 443                goto out;
 444
 445        status = verify_signed_buffer(payload.buf, payload.len,
 446                                      signature.buf, signature.len,
 447                                      &gpg_output, NULL);
 448        if (status && !gpg_output.len)
 449                strbuf_addstr(&gpg_output, "No signature\n");
 450
 451        show_sig_lines(opt, status, gpg_output.buf);
 452
 453 out:
 454        strbuf_release(&gpg_output);
 455        strbuf_release(&payload);
 456        strbuf_release(&signature);
 457}
 458
 459static int which_parent(const unsigned char *sha1, const struct commit *commit)
 460{
 461        int nth;
 462        const struct commit_list *parent;
 463
 464        for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
 465                if (!hashcmp(parent->item->object.sha1, sha1))
 466                        return nth;
 467                nth++;
 468        }
 469        return -1;
 470}
 471
 472static int is_common_merge(const struct commit *commit)
 473{
 474        return (commit->parents
 475                && commit->parents->next
 476                && !commit->parents->next->next);
 477}
 478
 479static void show_one_mergetag(struct rev_info *opt,
 480                              struct commit_extra_header *extra,
 481                              struct commit *commit)
 482{
 483        unsigned char sha1[20];
 484        struct tag *tag;
 485        struct strbuf verify_message;
 486        int status, nth;
 487        size_t payload_size, gpg_message_offset;
 488
 489        hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
 490        tag = lookup_tag(sha1);
 491        if (!tag)
 492                return; /* error message already given */
 493
 494        strbuf_init(&verify_message, 256);
 495        if (parse_tag_buffer(tag, extra->value, extra->len))
 496                strbuf_addstr(&verify_message, "malformed mergetag\n");
 497        else if (is_common_merge(commit) &&
 498                 !hashcmp(tag->tagged->sha1,
 499                          commit->parents->next->item->object.sha1))
 500                strbuf_addf(&verify_message,
 501                            "merged tag '%s'\n", tag->tag);
 502        else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
 503                strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
 504                                    tag->tag, tag->tagged->sha1);
 505        else
 506                strbuf_addf(&verify_message,
 507                            "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
 508        gpg_message_offset = verify_message.len;
 509
 510        payload_size = parse_signature(extra->value, extra->len);
 511        status = -1;
 512        if (extra->len > payload_size)
 513                if (verify_signed_buffer(extra->value, payload_size,
 514                                         extra->value + payload_size,
 515                                         extra->len - payload_size,
 516                                         &verify_message, NULL)) {
 517                        if (verify_message.len <= gpg_message_offset)
 518                                strbuf_addstr(&verify_message, "No signature\n");
 519                        else
 520                                status = 0;
 521                }
 522
 523        show_sig_lines(opt, status, verify_message.buf);
 524        strbuf_release(&verify_message);
 525}
 526
 527static void show_mergetag(struct rev_info *opt, struct commit *commit)
 528{
 529        struct commit_extra_header *extra, *to_free;
 530
 531        to_free = read_commit_extra_headers(commit, NULL);
 532        for (extra = to_free; extra; extra = extra->next) {
 533                if (strcmp(extra->key, "mergetag"))
 534                        continue; /* not a merge tag */
 535                show_one_mergetag(opt, extra, commit);
 536        }
 537        free_commit_extra_headers(to_free);
 538}
 539
 540void show_log(struct rev_info *opt)
 541{
 542        struct strbuf msgbuf = STRBUF_INIT;
 543        struct log_info *log = opt->loginfo;
 544        struct commit *commit = log->commit, *parent = log->parent;
 545        int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
 546        const char *extra_headers = opt->extra_headers;
 547        struct pretty_print_context ctx = {0};
 548
 549        opt->loginfo = NULL;
 550        if (!opt->verbose_header) {
 551                graph_show_commit(opt->graph);
 552
 553                if (!opt->graph)
 554                        put_revision_mark(opt, commit);
 555                fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
 556                if (opt->print_parents)
 557                        show_parents(commit, abbrev_commit);
 558                if (opt->children.name)
 559                        show_children(opt, commit, abbrev_commit);
 560                show_decorations(opt, commit);
 561                if (opt->graph && !graph_is_commit_finished(opt->graph)) {
 562                        putchar('\n');
 563                        graph_show_remainder(opt->graph);
 564                }
 565                putchar(opt->diffopt.line_termination);
 566                return;
 567        }
 568
 569        /*
 570         * If use_terminator is set, we already handled any record termination
 571         * at the end of the last record.
 572         * Otherwise, add a diffopt.line_termination character before all
 573         * entries but the first.  (IOW, as a separator between entries)
 574         */
 575        if (opt->shown_one && !opt->use_terminator) {
 576                /*
 577                 * If entries are separated by a newline, the output
 578                 * should look human-readable.  If the last entry ended
 579                 * with a newline, print the graph output before this
 580                 * newline.  Otherwise it will end up as a completely blank
 581                 * line and will look like a gap in the graph.
 582                 *
 583                 * If the entry separator is not a newline, the output is
 584                 * primarily intended for programmatic consumption, and we
 585                 * never want the extra graph output before the entry
 586                 * separator.
 587                 */
 588                if (opt->diffopt.line_termination == '\n' &&
 589                    !opt->missing_newline)
 590                        graph_show_padding(opt->graph);
 591                putchar(opt->diffopt.line_termination);
 592        }
 593        opt->shown_one = 1;
 594
 595        /*
 596         * If the history graph was requested,
 597         * print the graph, up to this commit's line
 598         */
 599        graph_show_commit(opt->graph);
 600
 601        /*
 602         * Print header line of header..
 603         */
 604
 605        if (opt->commit_format == CMIT_FMT_EMAIL) {
 606                log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
 607                                        &ctx.need_8bit_cte);
 608        } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
 609                fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
 610                if (opt->commit_format != CMIT_FMT_ONELINE)
 611                        fputs("commit ", stdout);
 612
 613                if (!opt->graph)
 614                        put_revision_mark(opt, commit);
 615                fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
 616                      stdout);
 617                if (opt->print_parents)
 618                        show_parents(commit, abbrev_commit);
 619                if (opt->children.name)
 620                        show_children(opt, commit, abbrev_commit);
 621                if (parent)
 622                        printf(" (from %s)",
 623                               find_unique_abbrev(parent->object.sha1,
 624                                                  abbrev_commit));
 625                show_decorations(opt, commit);
 626                printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
 627                if (opt->commit_format == CMIT_FMT_ONELINE) {
 628                        putchar(' ');
 629                } else {
 630                        putchar('\n');
 631                        graph_show_oneline(opt->graph);
 632                }
 633                if (opt->reflog_info) {
 634                        /*
 635                         * setup_revisions() ensures that opt->reflog_info
 636                         * and opt->graph cannot both be set,
 637                         * so we don't need to worry about printing the
 638                         * graph info here.
 639                         */
 640                        show_reflog_message(opt->reflog_info,
 641                                            opt->commit_format == CMIT_FMT_ONELINE,
 642                                            opt->date_mode,
 643                                            opt->date_mode_explicit);
 644                        if (opt->commit_format == CMIT_FMT_ONELINE)
 645                                return;
 646                }
 647        }
 648
 649        if (opt->show_signature) {
 650                show_signature(opt, commit);
 651                show_mergetag(opt, commit);
 652        }
 653
 654        if (!commit->buffer)
 655                return;
 656
 657        if (opt->show_notes) {
 658                int raw;
 659                struct strbuf notebuf = STRBUF_INIT;
 660
 661                raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
 662                format_display_notes(commit->object.sha1, &notebuf,
 663                                     get_log_output_encoding(), raw);
 664                ctx.notes_message = notebuf.len
 665                        ? strbuf_detach(&notebuf, NULL)
 666                        : xcalloc(1, 1);
 667        }
 668
 669        /*
 670         * And then the pretty-printed message itself
 671         */
 672        if (ctx.need_8bit_cte >= 0)
 673                ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
 674        ctx.date_mode = opt->date_mode;
 675        ctx.date_mode_explicit = opt->date_mode_explicit;
 676        ctx.abbrev = opt->diffopt.abbrev;
 677        ctx.after_subject = extra_headers;
 678        ctx.preserve_subject = opt->preserve_subject;
 679        ctx.reflog_info = opt->reflog_info;
 680        ctx.fmt = opt->commit_format;
 681        ctx.mailmap = opt->mailmap;
 682        ctx.color = opt->diffopt.use_color;
 683        pretty_print_commit(&ctx, commit, &msgbuf);
 684
 685        if (opt->add_signoff)
 686                append_signoff(&msgbuf, opt->add_signoff);
 687
 688        if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
 689            ctx.notes_message && *ctx.notes_message) {
 690                if (ctx.fmt == CMIT_FMT_EMAIL) {
 691                        strbuf_addstr(&msgbuf, "---\n");
 692                        opt->shown_dashes = 1;
 693                }
 694                strbuf_addstr(&msgbuf, ctx.notes_message);
 695        }
 696
 697        if (opt->show_log_size) {
 698                printf("log size %i\n", (int)msgbuf.len);
 699                graph_show_oneline(opt->graph);
 700        }
 701
 702        /*
 703         * Set opt->missing_newline if msgbuf doesn't
 704         * end in a newline (including if it is empty)
 705         */
 706        if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
 707                opt->missing_newline = 1;
 708        else
 709                opt->missing_newline = 0;
 710
 711        if (opt->graph)
 712                graph_show_commit_msg(opt->graph, &msgbuf);
 713        else
 714                fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
 715        if (opt->use_terminator) {
 716                if (!opt->missing_newline)
 717                        graph_show_padding(opt->graph);
 718                putchar(opt->diffopt.line_termination);
 719        }
 720
 721        strbuf_release(&msgbuf);
 722        free(ctx.notes_message);
 723}
 724
 725int log_tree_diff_flush(struct rev_info *opt)
 726{
 727        opt->shown_dashes = 0;
 728        diffcore_std(&opt->diffopt);
 729
 730        if (diff_queue_is_empty()) {
 731                int saved_fmt = opt->diffopt.output_format;
 732                opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
 733                diff_flush(&opt->diffopt);
 734                opt->diffopt.output_format = saved_fmt;
 735                return 0;
 736        }
 737
 738        if (opt->loginfo && !opt->no_commit_id) {
 739                show_log(opt);
 740                if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
 741                    opt->verbose_header &&
 742                    opt->commit_format != CMIT_FMT_ONELINE) {
 743                        /*
 744                         * When showing a verbose header (i.e. log message),
 745                         * and not in --pretty=oneline format, we would want
 746                         * an extra newline between the end of log and the
 747                         * diff/diffstat output for readability.
 748                         */
 749                        int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
 750                        if (opt->diffopt.output_prefix) {
 751                                struct strbuf *msg = NULL;
 752                                msg = opt->diffopt.output_prefix(&opt->diffopt,
 753                                        opt->diffopt.output_prefix_data);
 754                                fwrite(msg->buf, msg->len, 1, stdout);
 755                        }
 756
 757                        /*
 758                         * We may have shown three-dashes line early
 759                         * between notes and the log message, in which
 760                         * case we only want a blank line after the
 761                         * notes without (an extra) three-dashes line.
 762                         * Otherwise, we show the three-dashes line if
 763                         * we are showing the patch with diffstat, but
 764                         * in that case, there is no extra blank line
 765                         * after the three-dashes line.
 766                         */
 767                        if (!opt->shown_dashes &&
 768                            (pch & opt->diffopt.output_format) == pch)
 769                                printf("---");
 770                        putchar('\n');
 771                }
 772        }
 773        diff_flush(&opt->diffopt);
 774        return 1;
 775}
 776
 777static int do_diff_combined(struct rev_info *opt, struct commit *commit)
 778{
 779        diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
 780        return !opt->loginfo;
 781}
 782
 783/*
 784 * Show the diff of a commit.
 785 *
 786 * Return true if we printed any log info messages
 787 */
 788static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
 789{
 790        int showed_log;
 791        struct commit_list *parents;
 792        unsigned const char *sha1 = commit->object.sha1;
 793
 794        if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
 795                return 0;
 796
 797        /* Root commit? */
 798        parents = commit->parents;
 799        if (!parents) {
 800                if (opt->show_root_diff) {
 801                        diff_root_tree_sha1(sha1, "", &opt->diffopt);
 802                        log_tree_diff_flush(opt);
 803                }
 804                return !opt->loginfo;
 805        }
 806
 807        /* More than one parent? */
 808        if (parents && parents->next) {
 809                if (opt->ignore_merges)
 810                        return 0;
 811                else if (opt->combine_merges)
 812                        return do_diff_combined(opt, commit);
 813                else if (opt->first_parent_only) {
 814                        /*
 815                         * Generate merge log entry only for the first
 816                         * parent, showing summary diff of the others
 817                         * we merged _in_.
 818                         */
 819                        diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
 820                        log_tree_diff_flush(opt);
 821                        return !opt->loginfo;
 822                }
 823
 824                /* If we show individual diffs, show the parent info */
 825                log->parent = parents->item;
 826        }
 827
 828        showed_log = 0;
 829        for (;;) {
 830                struct commit *parent = parents->item;
 831
 832                diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
 833                log_tree_diff_flush(opt);
 834
 835                showed_log |= !opt->loginfo;
 836
 837                /* Set up the log info for the next parent, if any.. */
 838                parents = parents->next;
 839                if (!parents)
 840                        break;
 841                log->parent = parents->item;
 842                opt->loginfo = log;
 843        }
 844        return showed_log;
 845}
 846
 847int log_tree_commit(struct rev_info *opt, struct commit *commit)
 848{
 849        struct log_info log;
 850        int shown;
 851
 852        log.commit = commit;
 853        log.parent = NULL;
 854        opt->loginfo = &log;
 855
 856        shown = log_tree_diff(opt, commit, &log);
 857        if (!shown && opt->loginfo && opt->always_show_header) {
 858                log.parent = NULL;
 859                show_log(opt);
 860                shown = 1;
 861        }
 862        opt->loginfo = NULL;
 863        maybe_flush_or_die(stdout, "stdout");
 864        return shown;
 865}