builtin-fmt-merge-msg.c

   1 #include "builtin.h"
   2 #include "cache.h"
   3 #include "commit.h"
   4 #include "diff.h"
   5 #include "revision.h"
   6 #include "tag.h"
   7
   8 static const char * const fmt_merge_msg_usage[] = {
   9         "git fmt-merge-msg [--log|--no-log] [--file <file>]",
  10         NULL
  11 };
  12
  13 static int merge_summary;
  14
  15 static int fmt_merge_msg_config(const char *key, const char *value, void *cb)
  16 {
  17         static int found_merge_log = 0;
  18         if (!strcmp("merge.log", key)) {
  19                 found_merge_log = 1;
  20                 merge_summary = git_config_bool(key, value);
  21         }
  22         if (!found_merge_log && !strcmp("merge.summary", key))
  23                 merge_summary = git_config_bool(key, value);
  24         return 0;
  25 }
  26
  27 struct list {
  28         char **list;
  29         void **payload;
  30         unsigned nr, alloc;
  31 };
  32
  33 static void append_to_list(struct list *list, char *value, void *payload)
  34 {
  35         if (list->nr == list->alloc) {
  36                 list->alloc += 32;
  37                 list->list = xrealloc(list->list, sizeof(char *) * list->alloc);
  38                 list->payload = xrealloc(list->payload,
  39                                 sizeof(char *) * list->alloc);
  40         }
  41         list->payload[list->nr] = payload;
  42         list->list[list->nr++] = value;
  43 }
  44
  45 static int find_in_list(struct list *list, char *value)
  46 {
  47         int i;
  48
  49         for (i = 0; i < list->nr; i++)
  50                 if (!strcmp(list->list[i], value))
  51                         return i;
  52
  53         return -1;
  54 }
  55
  56 static void free_list(struct list *list)
  57 {
  58         int i;
  59
  60         if (list->alloc == 0)
  61                 return;
  62
  63         for (i = 0; i < list->nr; i++) {
  64                 free(list->list[i]);
  65                 free(list->payload[i]);
  66         }
  67         free(list->list);
  68         free(list->payload);
  69         list->nr = list->alloc = 0;
  70 }
  71
  72 struct src_data {
  73         struct list branch, tag, r_branch, generic;
  74         int head_status;
  75 };
  76
  77 static struct list srcs = { NULL, NULL, 0, 0};
  78 static struct list origins = { NULL, NULL, 0, 0};
  79
  80 static int handle_line(char *line)
  81 {
  82         int i, len = strlen(line);
  83         unsigned char *sha1;
  84         char *src, *origin;
  85         struct src_data *src_data;
  86         int pulling_head = 0;
  87
  88         if (len < 43 || line[40] != '\t')
  89                 return 1;
  90
  91         if (!prefixcmp(line + 41, "not-for-merge"))
  92                 return 0;
  93
  94         if (line[41] != '\t')
  95                 return 2;
  96
  97         line[40] = 0;
  98         sha1 = xmalloc(20);
  99         i = get_sha1(line, sha1);
 100         line[40] = '\t';
 101         if (i)
 102                 return 3;
 103
 104         if (line[len - 1] == '\n')
 105                 line[len - 1] = 0;
 106         line += 42;
 107
 108         src = strstr(line, " of ");
 109         if (src) {
 110                 *src = 0;
 111                 src += 4;
 112                 pulling_head = 0;
 113         } else {
 114                 src = line;
 115                 pulling_head = 1;
 116         }
 117
 118         i = find_in_list(&srcs, src);
 119         if (i < 0) {
 120                 i = srcs.nr;
 121                 append_to_list(&srcs, xstrdup(src),
 122                                 xcalloc(1, sizeof(struct src_data)));
 123         }
 124         src_data = srcs.payload[i];
 125
 126         if (pulling_head) {
 127                 origin = xstrdup(src);
 128                 src_data->head_status |= 1;
 129         } else if (!prefixcmp(line, "branch ")) {
 130                 origin = xstrdup(line + 7);
 131                 append_to_list(&src_data->branch, origin, NULL);
 132                 src_data->head_status |= 2;
 133         } else if (!prefixcmp(line, "tag ")) {
 134                 origin = line;
 135                 append_to_list(&src_data->tag, xstrdup(origin + 4), NULL);
 136                 src_data->head_status |= 2;
 137         } else if (!prefixcmp(line, "remote branch ")) {
 138                 origin = xstrdup(line + 14);
 139                 append_to_list(&src_data->r_branch, origin, NULL);
 140                 src_data->head_status |= 2;
 141         } else {
 142                 origin = xstrdup(src);
 143                 append_to_list(&src_data->generic, xstrdup(line), NULL);
 144                 src_data->head_status |= 2;
 145         }
 146
 147         if (!strcmp(".", src) || !strcmp(src, origin)) {
 148                 int len = strlen(origin);
 149                 if (origin[0] == '\'' && origin[len - 1] == '\'') {
 150                         origin = xmemdupz(origin + 1, len - 2);
 151                 } else {
 152                         origin = xstrdup(origin);
 153                 }
 154         } else {
 155                 char *new_origin = xmalloc(strlen(origin) + strlen(src) + 5);
 156                 sprintf(new_origin, "%s of %s", origin, src);
 157                 origin = new_origin;
 158         }
 159         append_to_list(&origins, origin, sha1);
 160         return 0;
 161 }
 162
 163 static void print_joined(const char *singular, const char *plural,
 164                 struct list *list, struct strbuf *out)
 165 {
 166         if (list->nr == 0)
 167                 return;
 168         if (list->nr == 1) {
 169                 strbuf_addf(out, "%s%s", singular, list->list[0]);
 170         } else {
 171                 int i;
 172                 strbuf_addstr(out, plural);
 173                 for (i = 0; i < list->nr - 1; i++)
 174                         strbuf_addf(out, "%s%s", i > 0 ? ", " : "", list->list[i]);
 175                 strbuf_addf(out, " and %s", list->list[list->nr - 1]);
 176         }
 177 }
 178
 179 static void shortlog(const char *name, unsigned char *sha1,
 180                 struct commit *head, struct rev_info *rev, int limit,
 181                 struct strbuf *out)
 182 {
 183         int i, count = 0;
 184         struct commit *commit;
 185         struct object *branch;
 186         struct list subjects = { NULL, NULL, 0, 0 };
 187         int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
 188
 189         branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40);
 190         if (!branch || branch->type != OBJ_COMMIT)
 191                 return;
 192
 193         setup_revisions(0, NULL, rev, NULL);
 194         rev->ignore_merges = 1;
 195         add_pending_object(rev, branch, name);
 196         add_pending_object(rev, &head->object, "^HEAD");
 197         head->object.flags |= UNINTERESTING;
 198         if (prepare_revision_walk(rev))
 199                 die("revision walk setup failed");
 200         while ((commit = get_revision(rev)) != NULL) {
 201                 char *oneline, *bol, *eol;
 202
 203                 /* ignore merges */
 204                 if (commit->parents && commit->parents->next)
 205                         continue;
 206
 207                 count++;
 208                 if (subjects.nr > limit)
 209                         continue;
 210
 211                 bol = strstr(commit->buffer, "\n\n");
 212                 if (bol) {
 213                         unsigned char c;
 214                         do {
 215                                 c = *++bol;
 216                         } while (isspace(c));
 217                         if (!c)
 218                                 bol = NULL;
 219                 }
 220
 221                 if (!bol) {
 222                         append_to_list(&subjects, xstrdup(sha1_to_hex(
 223                                                         commit->object.sha1)),
 224                                         NULL);
 225                         continue;
 226                 }
 227
 228                 eol = strchr(bol, '\n');
 229                 if (eol) {
 230                         oneline = xmemdupz(bol, eol - bol);
 231                 } else {
 232                         oneline = xstrdup(bol);
 233                 }
 234                 append_to_list(&subjects, oneline, NULL);
 235         }
 236
 237         if (count > limit)
 238                 strbuf_addf(out, "\n* %s: (%d commits)\n", name, count);
 239         else
 240                 strbuf_addf(out, "\n* %s:\n", name);
 241
 242         for (i = 0; i < subjects.nr; i++)
 243                 if (i >= limit)
 244                         strbuf_addf(out, "  ...\n");
 245                 else
 246                         strbuf_addf(out, "  %s\n", subjects.list[i]);
 247
 248         clear_commit_marks((struct commit *)branch, flags);
 249         clear_commit_marks(head, flags);
 250         free_commit_list(rev->commits);
 251         rev->commits = NULL;
 252         rev->pending.nr = 0;
 253
 254         free_list(&subjects);
 255 }
 256
 257 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
 258         int limit = 20, i = 0, pos = 0;
 259         char line[1024];
 260         char *p = line, *sep = "";
 261         unsigned char head_sha1[20];
 262         const char *current_branch;
 263
 264         /* get current branch */
 265         current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
 266         if (!current_branch)
 267                 die("No current branch");
 268         if (!prefixcmp(current_branch, "refs/heads/"))
 269                 current_branch += 11;
 270
 271         /* get a line */
 272         while (pos < in->len) {
 273                 int len;
 274                 char *newline;
 275
 276                 p = in->buf + pos;
 277                 newline = strchr(p, '\n');
 278                 len = newline ? newline - p : strlen(p);
 279                 pos += len + !!newline;
 280                 i++;
 281                 p[len] = 0;
 282                 if (handle_line(p))
 283                         die ("Error in line %d: %.*s", i, len, p);
 284         }
 285
 286         strbuf_addstr(out, "Merge ");
 287         for (i = 0; i < srcs.nr; i++) {
 288                 struct src_data *src_data = srcs.payload[i];
 289                 const char *subsep = "";
 290
 291                 strbuf_addstr(out, sep);
 292                 sep = "; ";
 293
 294                 if (src_data->head_status == 1) {
 295                         strbuf_addstr(out, srcs.list[i]);
 296                         continue;
 297                 }
 298                 if (src_data->head_status == 3) {
 299                         subsep = ", ";
 300                         strbuf_addstr(out, "HEAD");
 301                 }
 302                 if (src_data->branch.nr) {
 303                         strbuf_addstr(out, subsep);
 304                         subsep = ", ";
 305                         print_joined("branch ", "branches ", &src_data->branch,
 306                                         out);
 307                 }
 308                 if (src_data->r_branch.nr) {
 309                         strbuf_addstr(out, subsep);
 310                         subsep = ", ";
 311                         print_joined("remote branch ", "remote branches ",
 312                                         &src_data->r_branch, out);
 313                 }
 314                 if (src_data->tag.nr) {
 315                         strbuf_addstr(out, subsep);
 316                         subsep = ", ";
 317                         print_joined("tag ", "tags ", &src_data->tag, out);
 318                 }
 319                 if (src_data->generic.nr) {
 320                         strbuf_addstr(out, subsep);
 321                         print_joined("commit ", "commits ", &src_data->generic,
 322                                         out);
 323                 }
 324                 if (strcmp(".", srcs.list[i]))
 325                         strbuf_addf(out, " of %s", srcs.list[i]);
 326         }
 327
 328         if (!strcmp("master", current_branch))
 329                 strbuf_addch(out, '\n');
 330         else
 331                 strbuf_addf(out, " into %s\n", current_branch);
 332
 333         if (merge_summary) {
 334                 struct commit *head;
 335                 struct rev_info rev;
 336
 337                 head = lookup_commit(head_sha1);
 338                 init_revisions(&rev, NULL);
 339                 rev.commit_format = CMIT_FMT_ONELINE;
 340                 rev.ignore_merges = 1;
 341                 rev.limited = 1;
 342
 343                 for (i = 0; i < origins.nr; i++)
 344                         shortlog(origins.list[i], origins.payload[i],
 345                                         head, &rev, limit, out);
 346         }
 347         return 0;
 348 }
 349
 350 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 351 {
 352         const char *inpath = NULL;
 353         struct option options[] = {
 354                 OPT_BOOLEAN(0, "log",     &merge_summary, "populate log with the shortlog"),
 355                 OPT_BOOLEAN(0, "summary", &merge_summary, "alias for --log"),
 356                 OPT_STRING('F', "file",   &inpath, "file", "file to read from"),
 357                 OPT_END()
 358         };
 359
 360         FILE *in = stdin;
 361         struct strbuf input = STRBUF_INIT, output = STRBUF_INIT;
 362         int ret;
 363
 364         git_config(fmt_merge_msg_config, NULL);
 365         argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0);
 366         if (argc > 0)
 367                 usage_with_options(fmt_merge_msg_usage, options);
 368
 369         if (inpath && strcmp(inpath, "-")) {
 370                 in = fopen(inpath, "r");
 371                 if (!in)
 372                         die("cannot open %s", inpath);
 373         }
 374
 375         if (strbuf_read(&input, fileno(in), 0) < 0)
 376                 die("could not read input file %s", strerror(errno));
 377
 378         ret = fmt_merge_msg(merge_summary, &input, &output);
 379         if (ret)
 380                 return ret;
 381         write_in_full(STDOUT_FILENO, output.buf, output.len);
 382         return 0;
 383 }