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