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