Andrew's git / gitweb.git / commit.c
?
commit.con commit git-revert: Revert revert message to old behaviour (e43b010)
   1#include "cache.h"
   2#include "tag.h"
   3#include "commit.h"
   4#include "pkt-line.h"
   5#include "utf8.h"
   6#include "interpolate.h"
   7
   8int save_commit_buffer = 1;
   9
  10struct sort_node
  11{
  12        /*
  13         * the number of children of the associated commit
  14         * that also occur in the list being sorted.
  15         */
  16        unsigned int indegree;
  17
  18        /*
  19         * reference to original list item that we will re-use
  20         * on output.
  21         */
  22        struct commit_list * list_item;
  23
  24};
  25
  26const char *commit_type = "commit";
  27
  28struct cmt_fmt_map {
  29        const char *n;
  30        size_t cmp_len;
  31        enum cmit_fmt v;
  32} cmt_fmts[] = {
  33        { "raw",        1,      CMIT_FMT_RAW },
  34        { "medium",     1,      CMIT_FMT_MEDIUM },
  35        { "short",      1,      CMIT_FMT_SHORT },
  36        { "email",      1,      CMIT_FMT_EMAIL },
  37        { "full",       5,      CMIT_FMT_FULL },
  38        { "fuller",     5,      CMIT_FMT_FULLER },
  39        { "oneline",    1,      CMIT_FMT_ONELINE },
  40        { "format:",    7,      CMIT_FMT_USERFORMAT},
  41};
  42
  43static char *user_format;
  44
  45enum cmit_fmt get_commit_format(const char *arg)
  46{
  47        int i;
  48
  49        if (!arg || !*arg)
  50                return CMIT_FMT_DEFAULT;
  51        if (*arg == '=')
  52                arg++;
  53        if (!prefixcmp(arg, "format:")) {
  54                if (user_format)
  55                        free(user_format);
  56                user_format = xstrdup(arg + 7);
  57                return CMIT_FMT_USERFORMAT;
  58        }
  59        for (i = 0; i < ARRAY_SIZE(cmt_fmts); i++) {
  60                if (!strncmp(arg, cmt_fmts[i].n, cmt_fmts[i].cmp_len) &&
  61                    !strncmp(arg, cmt_fmts[i].n, strlen(arg)))
  62                        return cmt_fmts[i].v;
  63        }
  64
  65        die("invalid --pretty format: %s", arg);
  66}
  67
  68static struct commit *check_commit(struct object *obj,
  69                                   const unsigned char *sha1,
  70                                   int quiet)
  71{
  72        if (obj->type != OBJ_COMMIT) {
  73                if (!quiet)
  74                        error("Object %s is a %s, not a commit",
  75                              sha1_to_hex(sha1), typename(obj->type));
  76                return NULL;
  77        }
  78        return (struct commit *) obj;
  79}
  80
  81struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
  82                                              int quiet)
  83{
  84        struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
  85
  86        if (!obj)
  87                return NULL;
  88        return check_commit(obj, sha1, quiet);
  89}
  90
  91struct commit *lookup_commit_reference(const unsigned char *sha1)
  92{
  93        return lookup_commit_reference_gently(sha1, 0);
  94}
  95
  96struct commit *lookup_commit(const unsigned char *sha1)
  97{
  98        struct object *obj = lookup_object(sha1);
  99        if (!obj) {
 100                struct commit *ret = alloc_commit_node();
 101                created_object(sha1, &ret->object);
 102                ret->object.type = OBJ_COMMIT;
 103                return ret;
 104        }
 105        if (!obj->type)
 106                obj->type = OBJ_COMMIT;
 107        return check_commit(obj, sha1, 0);
 108}
 109
 110static unsigned long parse_commit_date(const char *buf)
 111{
 112        unsigned long date;
 113
 114        if (memcmp(buf, "author", 6))
 115                return 0;
 116        while (*buf++ != '\n')
 117                /* nada */;
 118        if (memcmp(buf, "committer", 9))
 119                return 0;
 120        while (*buf++ != '>')
 121                /* nada */;
 122        date = strtoul(buf, NULL, 10);
 123        if (date == ULONG_MAX)
 124                date = 0;
 125        return date;
 126}
 127
 128static struct commit_graft **commit_graft;
 129static int commit_graft_alloc, commit_graft_nr;
 130
 131static int commit_graft_pos(const unsigned char *sha1)
 132{
 133        int lo, hi;
 134        lo = 0;
 135        hi = commit_graft_nr;
 136        while (lo < hi) {
 137                int mi = (lo + hi) / 2;
 138                struct commit_graft *graft = commit_graft[mi];
 139                int cmp = hashcmp(sha1, graft->sha1);
 140                if (!cmp)
 141                        return mi;
 142                if (cmp < 0)
 143                        hi = mi;
 144                else
 145                        lo = mi + 1;
 146        }
 147        return -lo - 1;
 148}
 149
 150int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 151{
 152        int pos = commit_graft_pos(graft->sha1);
 153        
 154        if (0 <= pos) {
 155                if (ignore_dups)
 156                        free(graft);
 157                else {
 158                        free(commit_graft[pos]);
 159                        commit_graft[pos] = graft;
 160                }
 161                return 1;
 162        }
 163        pos = -pos - 1;
 164        if (commit_graft_alloc <= ++commit_graft_nr) {
 165                commit_graft_alloc = alloc_nr(commit_graft_alloc);
 166                commit_graft = xrealloc(commit_graft,
 167                                        sizeof(*commit_graft) *
 168                                        commit_graft_alloc);
 169        }
 170        if (pos < commit_graft_nr)
 171                memmove(commit_graft + pos + 1,
 172                        commit_graft + pos,
 173                        (commit_graft_nr - pos - 1) *
 174                        sizeof(*commit_graft));
 175        commit_graft[pos] = graft;
 176        return 0;
 177}
 178
 179struct commit_graft *read_graft_line(char *buf, int len)
 180{
 181        /* The format is just "Commit Parent1 Parent2 ...\n" */
 182        int i;
 183        struct commit_graft *graft = NULL;
 184
 185        if (buf[len-1] == '\n')
 186                buf[--len] = 0;
 187        if (buf[0] == '#' || buf[0] == '\0')
 188                return NULL;
 189        if ((len + 1) % 41) {
 190        bad_graft_data:
 191                error("bad graft data: %s", buf);
 192                free(graft);
 193                return NULL;
 194        }
 195        i = (len + 1) / 41 - 1;
 196        graft = xmalloc(sizeof(*graft) + 20 * i);
 197        graft->nr_parent = i;
 198        if (get_sha1_hex(buf, graft->sha1))
 199                goto bad_graft_data;
 200        for (i = 40; i < len; i += 41) {
 201                if (buf[i] != ' ')
 202                        goto bad_graft_data;
 203                if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
 204                        goto bad_graft_data;
 205        }
 206        return graft;
 207}
 208
 209int read_graft_file(const char *graft_file)
 210{
 211        FILE *fp = fopen(graft_file, "r");
 212        char buf[1024];
 213        if (!fp)
 214                return -1;
 215        while (fgets(buf, sizeof(buf), fp)) {
 216                /* The format is just "Commit Parent1 Parent2 ...\n" */
 217                int len = strlen(buf);
 218                struct commit_graft *graft = read_graft_line(buf, len);
 219                if (!graft)
 220                        continue;
 221                if (register_commit_graft(graft, 1))
 222                        error("duplicate graft data: %s", buf);
 223        }
 224        fclose(fp);
 225        return 0;
 226}
 227
 228static void prepare_commit_graft(void)
 229{
 230        static int commit_graft_prepared;
 231        char *graft_file;
 232
 233        if (commit_graft_prepared)
 234                return;
 235        graft_file = get_graft_file();
 236        read_graft_file(graft_file);
 237        /* make sure shallows are read */
 238        is_repository_shallow();
 239        commit_graft_prepared = 1;
 240}
 241
 242static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
 243{
 244        int pos;
 245        prepare_commit_graft();
 246        pos = commit_graft_pos(sha1);
 247        if (pos < 0)
 248                return NULL;
 249        return commit_graft[pos];
 250}
 251
 252int write_shallow_commits(int fd, int use_pack_protocol)
 253{
 254        int i, count = 0;
 255        for (i = 0; i < commit_graft_nr; i++)
 256                if (commit_graft[i]->nr_parent < 0) {
 257                        const char *hex =
 258                                sha1_to_hex(commit_graft[i]->sha1);
 259                        count++;
 260                        if (use_pack_protocol)
 261                                packet_write(fd, "shallow %s", hex);
 262                        else {
 263                                if (write_in_full(fd, hex,  40) != 40)
 264                                        break;
 265                                if (write_in_full(fd, "\n", 1) != 1)
 266                                        break;
 267                        }
 268                }
 269        return count;
 270}
 271
 272int unregister_shallow(const unsigned char *sha1)
 273{
 274        int pos = commit_graft_pos(sha1);
 275        if (pos < 0)
 276                return -1;
 277        if (pos + 1 < commit_graft_nr)
 278                memcpy(commit_graft + pos, commit_graft + pos + 1,
 279                                sizeof(struct commit_graft *)
 280                                * (commit_graft_nr - pos - 1));
 281        commit_graft_nr--;
 282        return 0;
 283}
 284
 285int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 286{
 287        char *tail = buffer;
 288        char *bufptr = buffer;
 289        unsigned char parent[20];
 290        struct commit_list **pptr;
 291        struct commit_graft *graft;
 292        unsigned n_refs = 0;
 293
 294        if (item->object.parsed)
 295                return 0;
 296        item->object.parsed = 1;
 297        tail += size;
 298        if (tail <= bufptr + 5 || memcmp(bufptr, "tree ", 5))
 299                return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
 300        if (tail <= bufptr + 45 || get_sha1_hex(bufptr + 5, parent) < 0)
 301                return error("bad tree pointer in commit %s",
 302                             sha1_to_hex(item->object.sha1));
 303        item->tree = lookup_tree(parent);
 304        if (item->tree)
 305                n_refs++;
 306        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
 307        pptr = &item->parents;
 308
 309        graft = lookup_commit_graft(item->object.sha1);
 310        while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
 311                struct commit *new_parent;
 312
 313                if (tail <= bufptr + 48 ||
 314                    get_sha1_hex(bufptr + 7, parent) ||
 315                    bufptr[47] != '\n')
 316                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
 317                bufptr += 48;
 318                if (graft)
 319                        continue;
 320                new_parent = lookup_commit(parent);
 321                if (new_parent) {
 322                        pptr = &commit_list_insert(new_parent, pptr)->next;
 323                        n_refs++;
 324                }
 325        }
 326        if (graft) {
 327                int i;
 328                struct commit *new_parent;
 329                for (i = 0; i < graft->nr_parent; i++) {
 330                        new_parent = lookup_commit(graft->parent[i]);
 331                        if (!new_parent)
 332                                continue;
 333                        pptr = &commit_list_insert(new_parent, pptr)->next;
 334                        n_refs++;
 335                }
 336        }
 337        item->date = parse_commit_date(bufptr);
 338
 339        if (track_object_refs) {
 340                unsigned i = 0;
 341                struct commit_list *p;
 342                struct object_refs *refs = alloc_object_refs(n_refs);
 343                if (item->tree)
 344                        refs->ref[i++] = &item->tree->object;
 345                for (p = item->parents; p; p = p->next)
 346                        refs->ref[i++] = &p->item->object;
 347                set_object_refs(&item->object, refs);
 348        }
 349
 350        return 0;
 351}
 352
 353int parse_commit(struct commit *item)
 354{
 355        enum object_type type;
 356        void *buffer;
 357        unsigned long size;
 358        int ret;
 359
 360        if (item->object.parsed)
 361                return 0;
 362        buffer = read_sha1_file(item->object.sha1, &type, &size);
 363        if (!buffer)
 364                return error("Could not read %s",
 365                             sha1_to_hex(item->object.sha1));
 366        if (type != OBJ_COMMIT) {
 367                free(buffer);
 368                return error("Object %s not a commit",
 369                             sha1_to_hex(item->object.sha1));
 370        }
 371        ret = parse_commit_buffer(item, buffer, size);
 372        if (save_commit_buffer && !ret) {
 373                item->buffer = buffer;
 374                return 0;
 375        }
 376        free(buffer);
 377        return ret;
 378}
 379
 380struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 381{
 382        struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
 383        new_list->item = item;
 384        new_list->next = *list_p;
 385        *list_p = new_list;
 386        return new_list;
 387}
 388
 389void free_commit_list(struct commit_list *list)
 390{
 391        while (list) {
 392                struct commit_list *temp = list;
 393                list = temp->next;
 394                free(temp);
 395        }
 396}
 397
 398struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
 399{
 400        struct commit_list **pp = list;
 401        struct commit_list *p;
 402        while ((p = *pp) != NULL) {
 403                if (p->item->date < item->date) {
 404                        break;
 405                }
 406                pp = &p->next;
 407        }
 408        return commit_list_insert(item, pp);
 409}
 410
 411        
 412void sort_by_date(struct commit_list **list)
 413{
 414        struct commit_list *ret = NULL;
 415        while (*list) {
 416                insert_by_date((*list)->item, &ret);
 417                *list = (*list)->next;
 418        }
 419        *list = ret;
 420}
 421
 422struct commit *pop_most_recent_commit(struct commit_list **list,
 423                                      unsigned int mark)
 424{
 425        struct commit *ret = (*list)->item;
 426        struct commit_list *parents = ret->parents;
 427        struct commit_list *old = *list;
 428
 429        *list = (*list)->next;
 430        free(old);
 431
 432        while (parents) {
 433                struct commit *commit = parents->item;
 434                parse_commit(commit);
 435                if (!(commit->object.flags & mark)) {
 436                        commit->object.flags |= mark;
 437                        insert_by_date(commit, list);
 438                }
 439                parents = parents->next;
 440        }
 441        return ret;
 442}
 443
 444void clear_commit_marks(struct commit *commit, unsigned int mark)
 445{
 446        struct commit_list *parents;
 447
 448        commit->object.flags &= ~mark;
 449        parents = commit->parents;
 450        while (parents) {
 451                struct commit *parent = parents->item;
 452
 453                /* Have we already cleared this? */
 454                if (mark & parent->object.flags)
 455                        clear_commit_marks(parent, mark);
 456                parents = parents->next;
 457        }
 458}
 459
 460/*
 461 * Generic support for pretty-printing the header
 462 */
 463static int get_one_line(const char *msg, unsigned long len)
 464{
 465        int ret = 0;
 466
 467        while (len--) {
 468                char c = *msg++;
 469                if (!c)
 470                        break;
 471                ret++;
 472                if (c == '\n')
 473                        break;
 474        }
 475        return ret;
 476}
 477
 478/* High bit set, or ISO-2022-INT */
 479static int non_ascii(int ch)
 480{
 481        ch = (ch & 0xff);
 482        return ((ch & 0x80) || (ch == 0x1b));
 483}
 484
 485static int is_rfc2047_special(char ch)
 486{
 487        return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
 488}
 489
 490static int add_rfc2047(char *buf, const char *line, int len,
 491                       const char *encoding)
 492{
 493        char *bp = buf;
 494        int i, needquote;
 495        char q_encoding[128];
 496        const char *q_encoding_fmt = "=?%s?q?";
 497
 498        for (i = needquote = 0; !needquote && i < len; i++) {
 499                int ch = line[i];
 500                if (non_ascii(ch))
 501                        needquote++;
 502                if ((i + 1 < len) &&
 503                    (ch == '=' && line[i+1] == '?'))
 504                        needquote++;
 505        }
 506        if (!needquote)
 507                return sprintf(buf, "%.*s", len, line);
 508
 509        i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
 510        if (sizeof(q_encoding) < i)
 511                die("Insanely long encoding name %s", encoding);
 512        memcpy(bp, q_encoding, i);
 513        bp += i;
 514        for (i = 0; i < len; i++) {
 515                unsigned ch = line[i] & 0xFF;
 516                if (is_rfc2047_special(ch)) {
 517                        sprintf(bp, "=%02X", ch);
 518                        bp += 3;
 519                }
 520                else if (ch == ' ')
 521                        *bp++ = '_';
 522                else
 523                        *bp++ = ch;
 524        }
 525        memcpy(bp, "?=", 2);
 526        bp += 2;
 527        return bp - buf;
 528}
 529
 530static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
 531                         const char *line, int relative_date,
 532                         const char *encoding)
 533{
 534        char *date;
 535        int namelen;
 536        unsigned long time;
 537        int tz, ret;
 538        const char *filler = "    ";
 539
 540        if (fmt == CMIT_FMT_ONELINE)
 541                return 0;
 542        date = strchr(line, '>');
 543        if (!date)
 544                return 0;
 545        namelen = ++date - line;
 546        time = strtoul(date, &date, 10);
 547        tz = strtol(date, NULL, 10);
 548
 549        if (fmt == CMIT_FMT_EMAIL) {
 550                char *name_tail = strchr(line, '<');
 551                int display_name_length;
 552                if (!name_tail)
 553                        return 0;
 554                while (line < name_tail && isspace(name_tail[-1]))
 555                        name_tail--;
 556                display_name_length = name_tail - line;
 557                filler = "";
 558                strcpy(buf, "From: ");
 559                ret = strlen(buf);
 560                ret += add_rfc2047(buf + ret, line, display_name_length,
 561                                   encoding);
 562                memcpy(buf + ret, name_tail, namelen - display_name_length);
 563                ret += namelen - display_name_length;
 564                buf[ret++] = '\n';
 565        }
 566        else {
 567                ret = sprintf(buf, "%s: %.*s%.*s\n", what,
 568                              (fmt == CMIT_FMT_FULLER) ? 4 : 0,
 569                              filler, namelen, line);
 570        }
 571        switch (fmt) {
 572        case CMIT_FMT_MEDIUM:
 573                ret += sprintf(buf + ret, "Date:   %s\n",
 574                               show_date(time, tz, relative_date));
 575                break;
 576        case CMIT_FMT_EMAIL:
 577                ret += sprintf(buf + ret, "Date: %s\n",
 578                               show_rfc2822_date(time, tz));
 579                break;
 580        case CMIT_FMT_FULLER:
 581                ret += sprintf(buf + ret, "%sDate: %s\n", what,
 582                               show_date(time, tz, relative_date));
 583                break;
 584        default:
 585                /* notin' */
 586                break;
 587        }
 588        return ret;
 589}
 590
 591static int is_empty_line(const char *line, int *len_p)
 592{
 593        int len = *len_p;
 594        while (len && isspace(line[len-1]))
 595                len--;
 596        *len_p = len;
 597        return !len;
 598}
 599
 600static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
 601{
 602        struct commit_list *parent = commit->parents;
 603        int offset;
 604
 605        if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
 606            !parent || !parent->next)
 607                return 0;
 608
 609        offset = sprintf(buf, "Merge:");
 610
 611        while (parent) {
 612                struct commit *p = parent->item;
 613                const char *hex = NULL;
 614                const char *dots;
 615                if (abbrev)
 616                        hex = find_unique_abbrev(p->object.sha1, abbrev);
 617                if (!hex)
 618                        hex = sha1_to_hex(p->object.sha1);
 619                dots = (abbrev && strlen(hex) != 40) ?  "..." : "";
 620                parent = parent->next;
 621
 622                offset += sprintf(buf + offset, " %s%s", hex, dots);
 623        }
 624        buf[offset++] = '\n';
 625        return offset;
 626}
 627
 628static char *get_header(const struct commit *commit, const char *key)
 629{
 630        int key_len = strlen(key);
 631        const char *line = commit->buffer;
 632
 633        for (;;) {
 634                const char *eol = strchr(line, '\n'), *next;
 635
 636                if (line == eol)
 637                        return NULL;
 638                if (!eol) {
 639                        eol = line + strlen(line);
 640                        next = NULL;
 641                } else
 642                        next = eol + 1;
 643                if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
 644                        int len = eol - line - key_len;
 645                        char *ret = xmalloc(len);
 646                        memcpy(ret, line + key_len + 1, len - 1);
 647                        ret[len - 1] = '\0';
 648                        return ret;
 649                }
 650                line = next;
 651        }
 652}
 653
 654static char *replace_encoding_header(char *buf, const char *encoding)
 655{
 656        char *encoding_header = strstr(buf, "\nencoding ");
 657        char *end_of_encoding_header;
 658        int encoding_header_pos;
 659        int encoding_header_len;
 660        int new_len;
 661        int need_len;
 662        int buflen = strlen(buf) + 1;
 663
 664        if (!encoding_header)
 665                return buf; /* should not happen but be defensive */
 666        encoding_header++;
 667        end_of_encoding_header = strchr(encoding_header, '\n');
 668        if (!end_of_encoding_header)
 669                return buf; /* should not happen but be defensive */
 670        end_of_encoding_header++;
 671
 672        encoding_header_len = end_of_encoding_header - encoding_header;
 673        encoding_header_pos = encoding_header - buf;
 674
 675        if (is_encoding_utf8(encoding)) {
 676                /* we have re-coded to UTF-8; drop the header */
 677                memmove(encoding_header, end_of_encoding_header,
 678                        buflen - (encoding_header_pos + encoding_header_len));
 679                return buf;
 680        }
 681        new_len = strlen(encoding);
 682        need_len = new_len + strlen("encoding \n");
 683        if (encoding_header_len < need_len) {
 684                buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
 685                encoding_header = buf + encoding_header_pos;
 686                end_of_encoding_header = encoding_header + encoding_header_len;
 687        }
 688        memmove(end_of_encoding_header + (need_len - encoding_header_len),
 689                end_of_encoding_header,
 690                buflen - (encoding_header_pos + encoding_header_len));
 691        memcpy(encoding_header + 9, encoding, strlen(encoding));
 692        encoding_header[9 + new_len] = '\n';
 693        return buf;
 694}
 695
 696static char *logmsg_reencode(const struct commit *commit,
 697                             const char *output_encoding)
 698{
 699        static const char *utf8 = "utf-8";
 700        const char *use_encoding;
 701        char *encoding;
 702        char *out;
 703
 704        if (!*output_encoding)
 705                return NULL;
 706        encoding = get_header(commit, "encoding");
 707        use_encoding = encoding ? encoding : utf8;
 708        if (!strcmp(use_encoding, output_encoding))
 709                out = xstrdup(commit->buffer);
 710        else
 711                out = reencode_string(commit->buffer,
 712                                      output_encoding, use_encoding);
 713        if (out)
 714                out = replace_encoding_header(out, output_encoding);
 715
 716        free(encoding);
 717        return out;
 718}
 719
 720static char *xstrndup(const char *text, int len)
 721{
 722        char *result = xmalloc(len + 1);
 723        memcpy(result, text, len);
 724        result[len] = '\0';
 725        return result;
 726}
 727
 728static void fill_person(struct interp *table, const char *msg, int len)
 729{
 730        int start, end, tz = 0;
 731        unsigned long date;
 732        char *ep;
 733
 734        /* parse name */
 735        for (end = 0; end < len && msg[end] != '<'; end++)
 736                ; /* do nothing */
 737        start = end + 1;
 738        while (end > 0 && isspace(msg[end - 1]))
 739                end--;
 740        table[0].value = xstrndup(msg, end);
 741
 742        if (start >= len)
 743                return;
 744
 745        /* parse email */
 746        for (end = start + 1; end < len && msg[end] != '>'; end++)
 747                ; /* do nothing */
 748
 749        if (end >= len)
 750                return;
 751
 752        table[1].value = xstrndup(msg + start, end - start);
 753
 754        /* parse date */
 755        for (start = end + 1; start < len && isspace(msg[start]); start++)
 756                ; /* do nothing */
 757        if (start >= len)
 758                return;
 759        date = strtoul(msg + start, &ep, 10);
 760        if (msg + start == ep)
 761                return;
 762
 763        table[5].value = xstrndup(msg + start, ep - msg + start);
 764
 765        /* parse tz */
 766        for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
 767                ; /* do nothing */
 768        if (start + 1 < len) {
 769                tz = strtoul(msg + start + 1, NULL, 10);
 770                if (msg[start] == '-')
 771                        tz = -tz;
 772        }
 773
 774        interp_set_entry(table, 2, show_date(date, tz, 0));
 775        interp_set_entry(table, 3, show_rfc2822_date(date, tz));
 776        interp_set_entry(table, 4, show_date(date, tz, 1));
 777}
 778
 779static long format_commit_message(const struct commit *commit,
 780                const char *msg, char *buf, unsigned long space)
 781{
 782        struct interp table[] = {
 783                { "%H" },       /* commit hash */
 784                { "%h" },       /* abbreviated commit hash */
 785                { "%T" },       /* tree hash */
 786                { "%t" },       /* abbreviated tree hash */
 787                { "%P" },       /* parent hashes */
 788                { "%p" },       /* abbreviated parent hashes */
 789                { "%an" },      /* author name */
 790                { "%ae" },      /* author email */
 791                { "%ad" },      /* author date */
 792                { "%aD" },      /* author date, RFC2822 style */
 793                { "%ar" },      /* author date, relative */
 794                { "%at" },      /* author date, UNIX timestamp */
 795                { "%cn" },      /* committer name */
 796                { "%ce" },      /* committer email */
 797                { "%cd" },      /* committer date */
 798                { "%cD" },      /* committer date, RFC2822 style */
 799                { "%cr" },      /* committer date, relative */
 800                { "%ct" },      /* committer date, UNIX timestamp */
 801                { "%e" },       /* encoding */
 802                { "%s" },       /* subject */
 803                { "%b" },       /* body */
 804                { "%Cred" },    /* red */
 805                { "%Cgreen" },  /* green */
 806                { "%Cblue" },   /* blue */
 807                { "%Creset" },  /* reset color */
 808                { "%n" }        /* newline */
 809        };
 810        enum interp_index {
 811                IHASH = 0, IHASH_ABBREV,
 812                ITREE, ITREE_ABBREV,
 813                IPARENTS, IPARENTS_ABBREV,
 814                IAUTHOR_NAME, IAUTHOR_EMAIL,
 815                IAUTHOR_DATE, IAUTHOR_DATE_RFC2822, IAUTHOR_DATE_RELATIVE,
 816                IAUTHOR_TIMESTAMP,
 817                ICOMMITTER_NAME, ICOMMITTER_EMAIL,
 818                ICOMMITTER_DATE, ICOMMITTER_DATE_RFC2822,
 819                ICOMMITTER_DATE_RELATIVE, ICOMMITTER_TIMESTAMP,
 820                IENCODING,
 821                ISUBJECT,
 822                IBODY,
 823                IRED, IGREEN, IBLUE, IRESET_COLOR,
 824                INEWLINE
 825        };
 826        struct commit_list *p;
 827        char parents[1024];
 828        int i;
 829        enum { HEADER, SUBJECT, BODY } state;
 830
 831        if (INEWLINE + 1 != ARRAY_SIZE(table))
 832                die("invalid interp table!");
 833
 834        /* these are independent of the commit */
 835        interp_set_entry(table, IRED, "\033[31m");
 836        interp_set_entry(table, IGREEN, "\033[32m");
 837        interp_set_entry(table, IBLUE, "\033[34m");
 838        interp_set_entry(table, IRESET_COLOR, "\033[m");
 839        interp_set_entry(table, INEWLINE, "\n");
 840
 841        /* these depend on the commit */
 842        if (!commit->object.parsed)
 843                parse_object(commit->object.sha1);
 844        interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
 845        interp_set_entry(table, IHASH_ABBREV,
 846                        find_unique_abbrev(commit->object.sha1,
 847                                DEFAULT_ABBREV));
 848        interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
 849        interp_set_entry(table, ITREE_ABBREV,
 850                        find_unique_abbrev(commit->tree->object.sha1,
 851                                DEFAULT_ABBREV));
 852        for (i = 0, p = commit->parents;
 853                        p && i < sizeof(parents) - 1;
 854                        p = p->next)
 855                i += snprintf(parents + i, sizeof(parents) - i - 1, "%s ",
 856                        sha1_to_hex(p->item->object.sha1));
 857        interp_set_entry(table, IPARENTS, parents);
 858        for (i = 0, p = commit->parents;
 859                        p && i < sizeof(parents) - 1;
 860                        p = p->next)
 861                i += snprintf(parents + i, sizeof(parents) - i - 1, "%s ",
 862                        find_unique_abbrev(p->item->object.sha1,
 863                                DEFAULT_ABBREV));
 864        interp_set_entry(table, IPARENTS_ABBREV, parents);
 865
 866        for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
 867                int eol;
 868                for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
 869                        ; /* do nothing */
 870
 871                if (state == SUBJECT) {
 872                        table[ISUBJECT].value = xstrndup(msg + i, eol - i);
 873                        i = eol;
 874                }
 875                if (i == eol) {
 876                        state++;
 877                        /* strip empty lines */
 878                        while (msg[eol + 1] == '\n')
 879                                eol++;
 880                } else if (!prefixcmp(msg + i, "author "))
 881                        fill_person(table + IAUTHOR_NAME,
 882                                        msg + i + 7, eol - i - 7);
 883                else if (!prefixcmp(msg + i, "committer "))
 884                        fill_person(table + ICOMMITTER_NAME,
 885                                        msg + i + 10, eol - i - 10);
 886                else if (!prefixcmp(msg + i, "encoding "))
 887                        table[IENCODING].value = xstrndup(msg + i, eol - i);
 888                i = eol;
 889        }
 890        if (msg[i])
 891                table[IBODY].value = xstrdup(msg + i);
 892        for (i = 0; i < ARRAY_SIZE(table); i++)
 893                if (!table[i].value)
 894                        interp_set_entry(table, i, "<unknown>");
 895
 896        interpolate(buf, space, user_format, table, ARRAY_SIZE(table));
 897        interp_clear_table(table, ARRAY_SIZE(table));
 898
 899        return strlen(buf);
 900}
 901
 902unsigned long pretty_print_commit(enum cmit_fmt fmt,
 903                                  const struct commit *commit,
 904                                  unsigned long len,
 905                                  char *buf, unsigned long space,
 906                                  int abbrev, const char *subject,
 907                                  const char *after_subject,
 908                                  int relative_date)
 909{
 910        int hdr = 1, body = 0, seen_title = 0;
 911        unsigned long offset = 0;
 912        int indent = 4;
 913        int parents_shown = 0;
 914        const char *msg = commit->buffer;
 915        int plain_non_ascii = 0;
 916        char *reencoded;
 917        const char *encoding;
 918
 919        if (fmt == CMIT_FMT_USERFORMAT)
 920                return format_commit_message(commit, msg, buf, space);
 921
 922        encoding = (git_log_output_encoding
 923                    ? git_log_output_encoding
 924                    : git_commit_encoding);
 925        if (!encoding)
 926                encoding = "utf-8";
 927        reencoded = logmsg_reencode(commit, encoding);
 928        if (reencoded)
 929                msg = reencoded;
 930
 931        if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
 932                indent = 0;
 933
 934        /* After-subject is used to pass in Content-Type: multipart
 935         * MIME header; in that case we do not have to do the
 936         * plaintext content type even if the commit message has
 937         * non 7-bit ASCII character.  Otherwise, check if we need
 938         * to say this is not a 7-bit ASCII.
 939         */
 940        if (fmt == CMIT_FMT_EMAIL && !after_subject) {
 941                int i, ch, in_body;
 942
 943                for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
 944                        if (!in_body) {
 945                                /* author could be non 7-bit ASCII but
 946                                 * the log may be so; skip over the
 947                                 * header part first.
 948                                 */
 949                                if (ch == '\n' &&
 950                                    i + 1 < len && msg[i+1] == '\n')
 951                                        in_body = 1;
 952                        }
 953                        else if (non_ascii(ch)) {
 954                                plain_non_ascii = 1;
 955                                break;
 956                        }
 957                }
 958        }
 959
 960        for (;;) {
 961                const char *line = msg;
 962                int linelen = get_one_line(msg, len);
 963
 964                if (!linelen)
 965                        break;
 966
 967                /*
 968                 * We want some slop for indentation and a possible
 969                 * final "...". Thus the "+ 20".
 970                 */
 971                if (offset + linelen + 20 > space) {
 972                        memcpy(buf + offset, "    ...\n", 8);
 973                        offset += 8;
 974                        break;
 975                }
 976
 977                msg += linelen;
 978                len -= linelen;
 979                if (hdr) {
 980                        if (linelen == 1) {
 981                                hdr = 0;
 982                                if ((fmt != CMIT_FMT_ONELINE) && !subject)
 983                                        buf[offset++] = '\n';
 984                                continue;
 985                        }
 986                        if (fmt == CMIT_FMT_RAW) {
 987                                memcpy(buf + offset, line, linelen);
 988                                offset += linelen;
 989                                continue;
 990                        }
 991                        if (!memcmp(line, "parent ", 7)) {
 992                                if (linelen != 48)
 993                                        die("bad parent line in commit");
 994                                continue;
 995                        }
 996
 997                        if (!parents_shown) {
 998                                offset += add_merge_info(fmt, buf + offset,
 999                                                         commit, abbrev);
1000                                parents_shown = 1;
1001                                continue;
1002                        }
1003                        /*
1004                         * MEDIUM == DEFAULT shows only author with dates.
1005                         * FULL shows both authors but not dates.
1006                         * FULLER shows both authors and dates.
1007                         */
1008                        if (!memcmp(line, "author ", 7))
1009                                offset += add_user_info("Author", fmt,
1010                                                        buf + offset,
1011                                                        line + 7,
1012                                                        relative_date,
1013                                                        encoding);
1014                        if (!memcmp(line, "committer ", 10) &&
1015                            (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
1016                                offset += add_user_info("Commit", fmt,
1017                                                        buf + offset,
1018                                                        line + 10,
1019                                                        relative_date,
1020                                                        encoding);
1021                        continue;
1022                }
1023
1024                if (!subject)
1025                        body = 1;
1026
1027                if (is_empty_line(line, &linelen)) {
1028                        if (!seen_title)
1029                                continue;
1030                        if (!body)
1031                                continue;
1032                        if (subject)
1033                                continue;
1034                        if (fmt == CMIT_FMT_SHORT)
1035                                break;
1036                }
1037
1038                seen_title = 1;
1039                if (subject) {
1040                        int slen = strlen(subject);
1041                        memcpy(buf + offset, subject, slen);
1042                        offset += slen;
1043                        offset += add_rfc2047(buf + offset, line, linelen,
1044                                              encoding);
1045                }
1046                else {
1047                        memset(buf + offset, ' ', indent);
1048                        memcpy(buf + offset + indent, line, linelen);
1049                        offset += linelen + indent;
1050                }
1051                buf[offset++] = '\n';
1052                if (fmt == CMIT_FMT_ONELINE)
1053                        break;
1054                if (subject && plain_non_ascii) {
1055                        int sz;
1056                        char header[512];
1057                        const char *header_fmt =
1058                                "Content-Type: text/plain; charset=%s\n"
1059                                "Content-Transfer-Encoding: 8bit\n";
1060                        sz = snprintf(header, sizeof(header), header_fmt,
1061                                      encoding);
1062                        if (sizeof(header) < sz)
1063                                die("Encoding name %s too long", encoding);
1064                        memcpy(buf + offset, header, sz);
1065                        offset += sz;
1066                }
1067                if (after_subject) {
1068                        int slen = strlen(after_subject);
1069                        if (slen > space - offset - 1)
1070                                slen = space - offset - 1;
1071                        memcpy(buf + offset, after_subject, slen);
1072                        offset += slen;
1073                        after_subject = NULL;
1074                }
1075                subject = NULL;
1076        }
1077        while (offset && isspace(buf[offset-1]))
1078                offset--;
1079        /* Make sure there is an EOLN for the non-oneline case */
1080        if (fmt != CMIT_FMT_ONELINE)
1081                buf[offset++] = '\n';
1082        /*
1083         * make sure there is another EOLN to separate the headers from whatever
1084         * body the caller appends if we haven't already written a body
1085         */
1086        if (fmt == CMIT_FMT_EMAIL && !body)
1087                buf[offset++] = '\n';
1088        buf[offset] = '\0';
1089
1090        free(reencoded);
1091        return offset;
1092}
1093
1094struct commit *pop_commit(struct commit_list **stack)
1095{
1096        struct commit_list *top = *stack;
1097        struct commit *item = top ? top->item : NULL;
1098
1099        if (top) {
1100                *stack = top->next;
1101                free(top);
1102        }
1103        return item;
1104}
1105
1106int count_parents(struct commit * commit)
1107{
1108        int count;
1109        struct commit_list * parents = commit->parents;
1110        for (count = 0; parents; parents = parents->next,count++)
1111                ;
1112        return count;
1113}
1114
1115void topo_sort_default_setter(struct commit *c, void *data)
1116{
1117        c->util = data;
1118}
1119
1120void *topo_sort_default_getter(struct commit *c)
1121{
1122        return c->util;
1123}
1124
1125/*
1126 * Performs an in-place topological sort on the list supplied.
1127 */
1128void sort_in_topological_order(struct commit_list ** list, int lifo)
1129{
1130        sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1131                                     topo_sort_default_getter);
1132}
1133
1134void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1135                                  topo_sort_set_fn_t setter,
1136                                  topo_sort_get_fn_t getter)
1137{
1138        struct commit_list * next = *list;
1139        struct commit_list * work = NULL, **insert;
1140        struct commit_list ** pptr = list;
1141        struct sort_node * nodes;
1142        struct sort_node * next_nodes;
1143        int count = 0;
1144
1145        /* determine the size of the list */
1146        while (next) {
1147                next = next->next;
1148                count++;
1149        }
1150        
1151        if (!count)
1152                return;
1153        /* allocate an array to help sort the list */
1154        nodes = xcalloc(count, sizeof(*nodes));
1155        /* link the list to the array */
1156        next_nodes = nodes;
1157        next=*list;
1158        while (next) {
1159                next_nodes->list_item = next;
1160                setter(next->item, next_nodes);
1161                next_nodes++;
1162                next = next->next;
1163        }
1164        /* update the indegree */
1165        next=*list;
1166        while (next) {
1167                struct commit_list * parents = next->item->parents;
1168                while (parents) {
1169                        struct commit * parent=parents->item;
1170                        struct sort_node * pn = (struct sort_node *) getter(parent);
1171
1172                        if (pn)
1173                                pn->indegree++;
1174                        parents=parents->next;
1175                }
1176                next=next->next;
1177        }
1178        /* 
1179         * find the tips
1180         *
1181         * tips are nodes not reachable from any other node in the list 
1182         * 
1183         * the tips serve as a starting set for the work queue.
1184         */
1185        next=*list;
1186        insert = &work;
1187        while (next) {
1188                struct sort_node * node = (struct sort_node *) getter(next->item);
1189
1190                if (node->indegree == 0) {
1191                        insert = &commit_list_insert(next->item, insert)->next;
1192                }
1193                next=next->next;
1194        }
1195
1196        /* process the list in topological order */
1197        if (!lifo)
1198                sort_by_date(&work);
1199        while (work) {
1200                struct commit * work_item = pop_commit(&work);
1201                struct sort_node * work_node = (struct sort_node *) getter(work_item);
1202                struct commit_list * parents = work_item->parents;
1203
1204                while (parents) {
1205                        struct commit * parent=parents->item;
1206                        struct sort_node * pn = (struct sort_node *) getter(parent);
1207
1208                        if (pn) {
1209                                /*
1210                                 * parents are only enqueued for emission 
1211                                 * when all their children have been emitted thereby
1212                                 * guaranteeing topological order.
1213                                 */
1214                                pn->indegree--;
1215                                if (!pn->indegree) {
1216                                        if (!lifo)
1217                                                insert_by_date(parent, &work);
1218                                        else
1219                                                commit_list_insert(parent, &work);
1220                                }
1221                        }
1222                        parents=parents->next;
1223                }
1224                /*
1225                 * work_item is a commit all of whose children
1226                 * have already been emitted. we can emit it now.
1227                 */
1228                *pptr = work_node->list_item;
1229                pptr = &(*pptr)->next;
1230                *pptr = NULL;
1231                setter(work_item, NULL);
1232        }
1233        free(nodes);
1234}
1235
1236/* merge-base stuff */
1237
1238/* bits #0..15 in revision.h */
1239#define PARENT1         (1u<<16)
1240#define PARENT2         (1u<<17)
1241#define STALE           (1u<<18)
1242#define RESULT          (1u<<19)
1243
1244static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1245
1246static struct commit *interesting(struct commit_list *list)
1247{
1248        while (list) {
1249                struct commit *commit = list->item;
1250                list = list->next;
1251                if (commit->object.flags & STALE)
1252                        continue;
1253                return commit;
1254        }
1255        return NULL;
1256}
1257
1258static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1259{
1260        struct commit_list *list = NULL;
1261        struct commit_list *result = NULL;
1262
1263        if (one == two)
1264                /* We do not mark this even with RESULT so we do not
1265                 * have to clean it up.
1266                 */
1267                return commit_list_insert(one, &result);
1268
1269        parse_commit(one);
1270        parse_commit(two);
1271
1272        one->object.flags |= PARENT1;
1273        two->object.flags |= PARENT2;
1274        insert_by_date(one, &list);
1275        insert_by_date(two, &list);
1276
1277        while (interesting(list)) {
1278                struct commit *commit;
1279                struct commit_list *parents;
1280                struct commit_list *n;
1281                int flags;
1282
1283                commit = list->item;
1284                n = list->next;
1285                free(list);
1286                list = n;
1287
1288                flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1289                if (flags == (PARENT1 | PARENT2)) {
1290                        if (!(commit->object.flags & RESULT)) {
1291                                commit->object.flags |= RESULT;
1292                                insert_by_date(commit, &result);
1293                        }
1294                        /* Mark parents of a found merge stale */
1295                        flags |= STALE;
1296                }
1297                parents = commit->parents;
1298                while (parents) {
1299                        struct commit *p = parents->item;
1300                        parents = parents->next;
1301                        if ((p->object.flags & flags) == flags)
1302                                continue;
1303                        parse_commit(p);
1304                        p->object.flags |= flags;
1305                        insert_by_date(p, &list);
1306                }
1307        }
1308
1309        /* Clean up the result to remove stale ones */
1310        free_commit_list(list);
1311        list = result; result = NULL;
1312        while (list) {
1313                struct commit_list *n = list->next;
1314                if (!(list->item->object.flags & STALE))
1315                        insert_by_date(list->item, &result);
1316                free(list);
1317                list = n;
1318        }
1319        return result;
1320}
1321
1322struct commit_list *get_merge_bases(struct commit *one,
1323                                    struct commit *two,
1324                                    int cleanup)
1325{
1326        struct commit_list *list;
1327        struct commit **rslt;
1328        struct commit_list *result;
1329        int cnt, i, j;
1330
1331        result = merge_bases(one, two);
1332        if (one == two)
1333                return result;
1334        if (!result || !result->next) {
1335                if (cleanup) {
1336                        clear_commit_marks(one, all_flags);
1337                        clear_commit_marks(two, all_flags);
1338                }
1339                return result;
1340        }
1341
1342        /* There are more than one */
1343        cnt = 0;
1344        list = result;
1345        while (list) {
1346                list = list->next;
1347                cnt++;
1348        }
1349        rslt = xcalloc(cnt, sizeof(*rslt));
1350        for (list = result, i = 0; list; list = list->next)
1351                rslt[i++] = list->item;
1352        free_commit_list(result);
1353
1354        clear_commit_marks(one, all_flags);
1355        clear_commit_marks(two, all_flags);
1356        for (i = 0; i < cnt - 1; i++) {
1357                for (j = i+1; j < cnt; j++) {
1358                        if (!rslt[i] || !rslt[j])
1359                                continue;
1360                        result = merge_bases(rslt[i], rslt[j]);
1361                        clear_commit_marks(rslt[i], all_flags);
1362                        clear_commit_marks(rslt[j], all_flags);
1363                        for (list = result; list; list = list->next) {
1364                                if (rslt[i] == list->item)
1365                                        rslt[i] = NULL;
1366                                if (rslt[j] == list->item)
1367                                        rslt[j] = NULL;
1368                        }
1369                }
1370        }
1371
1372        /* Surviving ones in rslt[] are the independent results */
1373        result = NULL;
1374        for (i = 0; i < cnt; i++) {
1375                if (rslt[i])
1376                        insert_by_date(rslt[i], &result);
1377        }
1378        free(rslt);
1379        return result;
1380}
1381
1382int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1383{
1384        struct commit_list *bases, *b;
1385        int ret = 0;
1386
1387        if (num == 1)
1388                bases = get_merge_bases(commit, *reference, 1);
1389        else
1390                die("not yet");
1391        for (b = bases; b; b = b->next) {
1392                if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1393                        ret = 1;
1394                        break;
1395                }
1396        }
1397
1398        free_commit_list(bases);
1399        return ret;
1400}