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