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