Changeset 782 for git/branches/dmik/log-tree.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• log-tree.c (modified) (23 diffs)

git/branches/dmik/log-tree.c ¶

@@ -10 +10 @@
 #include "color.h"
 #include "gpg-interface.h"
+#include "sequencer.h"
+#include "line-log.h"
 
 struct decoration name_decoration = { "object names" };
@@ -97 +99 @@
         enum decoration_type type = DECORATION_NONE;
 
-        if (!prefixcmp(refname, "refs/replace/")) {
+        if (starts_with(refname, "refs/replace/")) {
                 unsigned char original_sha1[20];
-                if (!read_replace_refs)
+                if (!check_replace_refs)
                         return 0;
                 if (get_sha1_hex(refname + 13, original_sha1)) {
@@ -115 +117 @@
                 return 0;
 
-        if (!prefixcmp(refname, "refs/heads/"))
+        if (starts_with(refname, "refs/heads/"))
                 type = DECORATION_REF_LOCAL;
-        else if (!prefixcmp(refname, "refs/remotes/"))
+        else if (starts_with(refname, "refs/remotes/"))
                 type = DECORATION_REF_REMOTE;
-        else if (!prefixcmp(refname, "refs/tags/"))
+        else if (starts_with(refname, "refs/tags/"))
                 type = DECORATION_REF_TAG;
-        else if (!prefixcmp(refname, "refs/stash"))
+        else if (!strcmp(refname, "refs/stash"))
                 type = DECORATION_REF_STASH;
-        else if (!prefixcmp(refname, "HEAD"))
+        else if (!strcmp(refname, "HEAD"))
                 type = DECORATION_REF_HEAD;
 
@@ -133 +135 @@
                 if (!obj)
                         break;
+                if (!obj->parsed)
+                        parse_object(obj->sha1);
                 add_name_decoration(DECORATION_REF_TAG, refname, obj);
         }
@@ -175 +179 @@
 }
 
-void show_decorations(struct rev_info *opt, struct commit *commit)
+/*
+ * The caller makes sure there is no funny color before
+ * calling. format_decorations makes sure the same after return.
+ */
+void format_decorations(struct strbuf *sb,
+                        const struct commit *commit,
+                        int use_color)
 {
         const char *prefix;
         struct name_decoration *decoration;
         const char *color_commit =
-                diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
+                diff_get_color(use_color, DIFF_COMMIT);
         const char *color_reset =
-                decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
-
-        if (opt->show_source && commit->util)
-                printf("\t%s", (char *) commit->util);
-        if (!opt->show_decorations)
-                return;
+                decorate_get_color(use_color, DECORATION_NONE);
+
         decoration = lookup_decoration(&name_decoration, &commit->object);
         if (!decoration)
@@ -193 +199 @@
         prefix = " (";
         while (decoration) {
-                printf("%s", prefix);
-                fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
-                      stdout);
+                strbuf_addstr(sb, color_commit);
+                strbuf_addstr(sb, prefix);
+                strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
                 if (decoration->type == DECORATION_REF_TAG)
-                        fputs("tag: ", stdout);
-                printf("%s", decoration->name);
-                fputs(color_reset, stdout);
-                fputs(color_commit, stdout);
+                        strbuf_addstr(sb, "tag: ");
+                strbuf_addstr(sb, decoration->name);
+                strbuf_addstr(sb, color_reset);
                 prefix = ", ";
                 decoration = decoration->next;
         }
-        putchar(')');
-}
-
-/*
- * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
- * Signed-off-by: and Acked-by: lines.
- */
-static int detect_any_signoff(char *letter, int size)
-{
-        char *cp;
-        int seen_colon = 0;
-        int seen_at = 0;
-        int seen_name = 0;
-        int seen_head = 0;
-
-        cp = letter + size;
-        while (letter <= --cp && *cp == '\n')
-                continue;
-
-        while (letter <= cp) {
-                char ch = *cp--;
-                if (ch == '\n')
-                        break;
-
-                if (!seen_at) {
-                        if (ch == '@')
-                                seen_at = 1;
-                        continue;
-                }
-                if (!seen_colon) {
-                        if (ch == '@')
-                                return 0;
-                        else if (ch == ':')
-                                seen_colon = 1;
-                        else
-                                seen_name = 1;
-                        continue;
-                }
-                if (('A' <= ch && ch <= 'Z') ||
-                    ('a' <= ch && ch <= 'z') ||
-                    ch == '-') {
-                        seen_head = 1;
-                        continue;
-                }
-                /* no empty last line doesn't match */
-                return 0;
-        }
-        return seen_head && seen_name;
-}
-
-static void append_signoff(struct strbuf *sb, const char *signoff)
-{
-        static const char signed_off_by[] = "Signed-off-by: ";
-        size_t signoff_len = strlen(signoff);
-        int has_signoff = 0;
-        char *cp;
-
-        cp = sb->buf;
-
-        /* First see if we already have the sign-off by the signer */
-        while ((cp = strstr(cp, signed_off_by))) {
-
-                has_signoff = 1;
-
-                cp += strlen(signed_off_by);
-                if (cp + signoff_len >= sb->buf + sb->len)
-                        break;
-                if (strncmp(cp, signoff, signoff_len))
-                        continue;
-                if (!isspace(cp[signoff_len]))
-                        continue;
-                /* we already have him */
+        strbuf_addstr(sb, color_commit);
+        strbuf_addch(sb, ')');
+        strbuf_addstr(sb, color_reset);
+}
+
+void show_decorations(struct rev_info *opt, struct commit *commit)
+{
+        struct strbuf sb = STRBUF_INIT;
+
+        if (opt->show_source && commit->util)
+                printf("\t%s", (char *) commit->util);
+        if (!opt->show_decorations)
                 return;
-        }
-
-        if (!has_signoff)
-                has_signoff = detect_any_signoff(sb->buf, sb->len);
-
-        if (!has_signoff)
-                strbuf_addch(sb, '\n');
-
-        strbuf_addstr(sb, signed_off_by);
-        strbuf_add(sb, signoff, signoff_len);
-        strbuf_addch(sb, '\n');
+        format_decorations(&sb, commit, opt->diffopt.use_color);
+        fputs(sb.buf, stdout);
+        strbuf_release(&sb);
 }
 
@@ -300 +237 @@
 }
 
-void get_patch_filename(struct commit *commit, int nr, const char *suffix,
-                        struct strbuf *buf)
-{
-        int suffix_len = strlen(suffix) + 1;
-        int start_len = buf->len;
-
-        strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
-        if (commit) {
-                int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
-                struct pretty_print_context ctx = {0};
-                ctx.date_mode = DATE_NORMAL;
-
-                format_commit_message(commit, "%f", buf, &ctx);
-                if (max_len < buf->len)
-                        strbuf_setlen(buf, max_len);
-                strbuf_addstr(buf, suffix);
-        }
+void fmt_output_subject(struct strbuf *filename,
+                        const char *subject,
+                        struct rev_info *info)
+{
+        const char *suffix = info->patch_suffix;
+        int nr = info->nr;
+        int start_len = filename->len;
+        int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
+
+        if (0 < info->reroll_count)
+                strbuf_addf(filename, "v%d-", info->reroll_count);
+        strbuf_addf(filename, "%04d-%s", nr, subject);
+
+        if (max_len < filename->len)
+                strbuf_setlen(filename, max_len);
+        strbuf_addstr(filename, suffix);
+}
+
+void fmt_output_commit(struct strbuf *filename,
+                       struct commit *commit,
+                       struct rev_info *info)
+{
+        struct pretty_print_context ctx = {0};
+        struct strbuf subject = STRBUF_INIT;
+
+        format_commit_message(commit, "%f", &subject, &ctx);
+        fmt_output_subject(filename, subject.buf, info);
+        strbuf_release(&subject);
 }
 
@@ -385 +333 @@
                 extra_headers = subject_buffer;
 
-                get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
-                                    opt->patch_suffix, &filename);
+                if (opt->numbered_files)
+                        strbuf_addf(&filename, "%d", opt->nr);
+                else
+                        fmt_output_commit(&filename, commit, opt);
                 snprintf(buffer, sizeof(buffer) - 1,
                          "\n--%s%s\n"
@@ -432 +382 @@
         status = verify_signed_buffer(payload.buf, payload.len,
                                       signature.buf, signature.len,
-                                      &gpg_output);
+                                      &gpg_output, NULL);
         if (status && !gpg_output.len)
                 strbuf_addstr(&gpg_output, "No signature\n");
@@ -496 +446 @@
 
         payload_size = parse_signature(extra->value, extra->len);
-        if ((extra->len <= payload_size) ||
-            (verify_signed_buffer(extra->value, payload_size,
-                                  extra->value + payload_size,
-                                  extra->len - payload_size,
-                                  &verify_message) &&
-             verify_message.len <= gpg_message_offset)) {
-                strbuf_addstr(&verify_message, "No signature\n");
-                status = -1;
-        }
-        else if (strstr(verify_message.buf + gpg_message_offset,
-                        ": Good signature from "))
-                status = 0;
-        else
-                status = -1;
+        status = -1;
+        if (extra->len > payload_size)
+                if (verify_signed_buffer(extra->value, payload_size,
+                                         extra->value + payload_size,
+                                         extra->len - payload_size,
+                                         &verify_message, NULL)) {
+                        if (verify_message.len <= gpg_message_offset)
+                                strbuf_addstr(&verify_message, "No signature\n");
+                        else
+                                status = 0;
+                }
 
         show_sig_lines(opt, status, verify_message.buf);
@@ -538 +485 @@
 
         opt->loginfo = NULL;
-        ctx.show_notes = opt->show_notes;
         if (!opt->verbose_header) {
                 graph_show_commit(opt->graph);
@@ -614 +560 @@
                                find_unique_abbrev(parent->object.sha1,
                                                   abbrev_commit));
+                fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), stdout);
                 show_decorations(opt, commit);
-                printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
                 if (opt->commit_format == CMIT_FMT_ONELINE) {
                         putchar(' ');
@@ -630 +576 @@
                          */
                         show_reflog_message(opt->reflog_info,
-                                    opt->commit_format == CMIT_FMT_ONELINE,
-                                    opt->date_mode_explicit ?
-                                        opt->date_mode :
-                                        DATE_NORMAL);
+                                            opt->commit_format == CMIT_FMT_ONELINE,
+                                            opt->date_mode,
+                                            opt->date_mode_explicit);
                         if (opt->commit_format == CMIT_FMT_ONELINE)
                                 return;
@@ -647 +592 @@
                 return;
 
+        if (opt->show_notes) {
+                int raw;
+                struct strbuf notebuf = STRBUF_INIT;
+
+                raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
+                format_display_notes(commit->object.sha1, &notebuf,
+                                     get_log_output_encoding(), raw);
+                ctx.notes_message = notebuf.len
+                        ? strbuf_detach(&notebuf, NULL)
+                        : xcalloc(1, 1);
+        }
+
         /*
          * And then the pretty-printed message itself
          */
-        if (ctx.need_8bit_cte >= 0)
-                ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
+        if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
+                ctx.need_8bit_cte =
+                        has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
+                                               getenv("GIT_COMMITTER_EMAIL")));
         ctx.date_mode = opt->date_mode;
+        ctx.date_mode_explicit = opt->date_mode_explicit;
         ctx.abbrev = opt->diffopt.abbrev;
         ctx.after_subject = extra_headers;
@@ -658 +618 @@
         ctx.reflog_info = opt->reflog_info;
         ctx.fmt = opt->commit_format;
+        ctx.mailmap = opt->mailmap;
+        ctx.color = opt->diffopt.use_color;
+        ctx.output_encoding = get_log_output_encoding();
+        if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
+                ctx.from_ident = &opt->from_ident;
         pretty_print_commit(&ctx, commit, &msgbuf);
 
         if (opt->add_signoff)
-                append_signoff(&msgbuf, opt->add_signoff);
+                append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
+
+        if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
+            ctx.notes_message && *ctx.notes_message) {
+                if (ctx.fmt == CMIT_FMT_EMAIL) {
+                        strbuf_addstr(&msgbuf, "---\n");
+                        opt->shown_dashes = 1;
+                }
+                strbuf_addstr(&msgbuf, ctx.notes_message);
+        }
+
         if (opt->show_log_size) {
                 printf("log size %i\n", (int)msgbuf.len);
@@ -683 +658 @@
                 if (!opt->missing_newline)
                         graph_show_padding(opt->graph);
-                putchar('\n');
+                putchar(opt->diffopt.line_termination);
         }
 
         strbuf_release(&msgbuf);
+        free(ctx.notes_message);
 }
 
 int log_tree_diff_flush(struct rev_info *opt)
 {
+        opt->shown_dashes = 0;
         diffcore_std(&opt->diffopt);
 
@@ -702 +679 @@
 
         if (opt->loginfo && !opt->no_commit_id) {
-                /* When showing a verbose header (i.e. log message),
-                 * and not in --pretty=oneline format, we would want
-                 * an extra newline between the end of log and the
-                 * output for readability.
-                 */
                 show_log(opt);
                 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
                     opt->verbose_header &&
                     opt->commit_format != CMIT_FMT_ONELINE) {
+                        /*
+                         * When showing a verbose header (i.e. log message),
+                         * and not in --pretty=oneline format, we would want
+                         * an extra newline between the end of log and the
+                         * diff/diffstat output for readability.
+                         */
                         int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
-                        if ((pch & opt->diffopt.output_format) == pch)
-                                printf("---");
                         if (opt->diffopt.output_prefix) {
                                 struct strbuf *msg = NULL;
@@ -720 +696 @@
                                 fwrite(msg->buf, msg->len, 1, stdout);
                         }
+
+                        /*
+                         * We may have shown three-dashes line early
+                         * between notes and the log message, in which
+                         * case we only want a blank line after the
+                         * notes without (an extra) three-dashes line.
+                         * Otherwise, we show the three-dashes line if
+                         * we are showing the patch with diffstat, but
+                         * in that case, there is no extra blank line
+                         * after the three-dashes line.
+                         */
+                        if (!opt->shown_dashes &&
+                            (pch & opt->diffopt.output_format) == pch)
+                                printf("---");
                         putchar('\n');
                 }
@@ -742 +732 @@
         int showed_log;
         struct commit_list *parents;
-        unsigned const char *sha1 = commit->object.sha1;
+        unsigned const char *sha1;
 
         if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
                 return 0;
 
+        parse_commit_or_die(commit);
+        sha1 = commit->tree->object.sha1;
+
         /* Root commit? */
-        parents = commit->parents;
+        parents = get_saved_parents(opt, commit);
         if (!parents) {
                 if (opt->show_root_diff) {
@@ -769 +762 @@
                          * we merged _in_.
                          */
-                        diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
+                        parse_commit_or_die(parents->item);
+                        diff_tree_sha1(parents->item->tree->object.sha1,
+                                       sha1, "", &opt->diffopt);
                         log_tree_diff_flush(opt);
                         return !opt->loginfo;
@@ -782 +777 @@
                 struct commit *parent = parents->item;
 
-                diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
+                parse_commit_or_die(parent);
+                diff_tree_sha1(parent->tree->object.sha1,
+                               sha1, "", &opt->diffopt);
                 log_tree_diff_flush(opt);
 
@@ -806 +803 @@
         opt->loginfo = &log;
 
+        if (opt->line_level_traverse)
+                return line_log_print(opt, commit);
+
+        if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
+                printf("\n%s\n", opt->break_bar);
         shown = log_tree_diff(opt, commit, &log);
         if (!shown && opt->loginfo && opt->always_show_header) {
@@ -812 +814 @@
                 shown = 1;
         }
+        if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
+                printf("\n%s\n", opt->break_bar);
         opt->loginfo = NULL;
         maybe_flush_or_die(stdout, "stdout");