Andrew's git / gitweb.git / commit.c
?
commit.con commit cvsimport: add <remote>/HEAD reference in separate remotes more (06baffd)
   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                /*
 515                 * We encode ' ' using '=20' even though rfc2047
 516                 * allows using '_' for readability.  Unfortunately,
 517                 * many programs do not understand this and just
 518                 * leave the underscore in place.
 519                 */
 520                if (is_rfc2047_special(ch) || ch == ' ') {
 521                        sprintf(bp, "=%02X", ch);
 522                        bp += 3;
 523                }
 524                else
 525                        *bp++ = ch;
 526        }
 527        memcpy(bp, "?=", 2);
 528        bp += 2;
 529        return bp - buf;
 530}
 531
 532static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
 533                         const char *line, enum date_mode dmode,
 534                         const char *encoding)
 535{
 536        char *date;
 537        int namelen;
 538        unsigned long time;
 539        int tz, ret;
 540        const char *filler = "    ";
 541
 542        if (fmt == CMIT_FMT_ONELINE)
 543                return 0;
 544        date = strchr(line, '>');
 545        if (!date)
 546                return 0;
 547        namelen = ++date - line;
 548        time = strtoul(date, &date, 10);
 549        tz = strtol(date, NULL, 10);
 550
 551        if (fmt == CMIT_FMT_EMAIL) {
 552                char *name_tail = strchr(line, '<');
 553                int display_name_length;
 554                if (!name_tail)
 555                        return 0;
 556                while (line < name_tail && isspace(name_tail[-1]))
 557                        name_tail--;
 558                display_name_length = name_tail - line;
 559                filler = "";
 560                strcpy(buf, "From: ");
 561                ret = strlen(buf);
 562                ret += add_rfc2047(buf + ret, line, display_name_length,
 563                                   encoding);
 564                memcpy(buf + ret, name_tail, namelen - display_name_length);
 565                ret += namelen - display_name_length;
 566                buf[ret++] = '\n';
 567        }
 568        else {
 569                ret = sprintf(buf, "%s: %.*s%.*s\n", what,
 570                              (fmt == CMIT_FMT_FULLER) ? 4 : 0,
 571                              filler, namelen, line);
 572        }
 573        switch (fmt) {
 574        case CMIT_FMT_MEDIUM:
 575                ret += sprintf(buf + ret, "Date:   %s\n",
 576                               show_date(time, tz, dmode));
 577                break;
 578        case CMIT_FMT_EMAIL:
 579                ret += sprintf(buf + ret, "Date: %s\n",
 580                               show_rfc2822_date(time, tz));
 581                break;
 582        case CMIT_FMT_FULLER:
 583                ret += sprintf(buf + ret, "%sDate: %s\n", what,
 584                               show_date(time, tz, dmode));
 585                break;
 586        default:
 587                /* notin' */
 588                break;
 589        }
 590        return ret;
 591}
 592
 593static int is_empty_line(const char *line, int *len_p)
 594{
 595        int len = *len_p;
 596        while (len && isspace(line[len-1]))
 597                len--;
 598        *len_p = len;
 599        return !len;
 600}
 601
 602static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
 603{
 604        struct commit_list *parent = commit->parents;
 605        int offset;
 606
 607        if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
 608            !parent || !parent->next)
 609                return 0;
 610
 611        offset = sprintf(buf, "Merge:");
 612
 613        while (parent) {
 614                struct commit *p = parent->item;
 615                const char *hex = NULL;
 616                const char *dots;
 617                if (abbrev)
 618                        hex = find_unique_abbrev(p->object.sha1, abbrev);
 619                if (!hex)
 620                        hex = sha1_to_hex(p->object.sha1);
 621                dots = (abbrev && strlen(hex) != 40) ?  "..." : "";
 622                parent = parent->next;
 623
 624                offset += sprintf(buf + offset, " %s%s", hex, dots);
 625        }
 626        buf[offset++] = '\n';
 627        return offset;
 628}
 629
 630static char *get_header(const struct commit *commit, const char *key)
 631{
 632        int key_len = strlen(key);
 633        const char *line = commit->buffer;
 634
 635        for (;;) {
 636                const char *eol = strchr(line, '\n'), *next;
 637
 638                if (line == eol)
 639                        return NULL;
 640                if (!eol) {
 641                        eol = line + strlen(line);
 642                        next = NULL;
 643                } else
 644                        next = eol + 1;
 645                if (eol - line > key_len &&
 646                    !strncmp(line, key, key_len) &&
 647                    line[key_len] == ' ') {
 648                        int len = eol - line - key_len;
 649                        char *ret = xmalloc(len);
 650                        memcpy(ret, line + key_len + 1, len - 1);
 651                        ret[len - 1] = '\0';
 652                        return ret;
 653                }
 654                line = next;
 655        }
 656}
 657
 658static char *replace_encoding_header(char *buf, const char *encoding)
 659{
 660        char *encoding_header = strstr(buf, "\nencoding ");
 661        char *header_end = strstr(buf, "\n\n");
 662        char *end_of_encoding_header;
 663        int encoding_header_pos;
 664        int encoding_header_len;
 665        int new_len;
 666        int need_len;
 667        int buflen = strlen(buf) + 1;
 668
 669        if (!header_end)
 670                header_end = buf + buflen;
 671        if (!encoding_header || encoding_header >= header_end)
 672                return buf;
 673        encoding_header++;
 674        end_of_encoding_header = strchr(encoding_header, '\n');
 675        if (!end_of_encoding_header)
 676                return buf; /* should not happen but be defensive */
 677        end_of_encoding_header++;
 678
 679        encoding_header_len = end_of_encoding_header - encoding_header;
 680        encoding_header_pos = encoding_header - buf;
 681
 682        if (is_encoding_utf8(encoding)) {
 683                /* we have re-coded to UTF-8; drop the header */
 684                memmove(encoding_header, end_of_encoding_header,
 685                        buflen - (encoding_header_pos + encoding_header_len));
 686                return buf;
 687        }
 688        new_len = strlen(encoding);
 689        need_len = new_len + strlen("encoding \n");
 690        if (encoding_header_len < need_len) {
 691                buf = xrealloc(buf, buflen + (need_len - encoding_header_len));
 692                encoding_header = buf + encoding_header_pos;
 693                end_of_encoding_header = encoding_header + encoding_header_len;
 694        }
 695        memmove(end_of_encoding_header + (need_len - encoding_header_len),
 696                end_of_encoding_header,
 697                buflen - (encoding_header_pos + encoding_header_len));
 698        memcpy(encoding_header + 9, encoding, strlen(encoding));
 699        encoding_header[9 + new_len] = '\n';
 700        return buf;
 701}
 702
 703static char *logmsg_reencode(const struct commit *commit,
 704                             const char *output_encoding)
 705{
 706        static const char *utf8 = "utf-8";
 707        const char *use_encoding;
 708        char *encoding;
 709        char *out;
 710
 711        if (!*output_encoding)
 712                return NULL;
 713        encoding = get_header(commit, "encoding");
 714        use_encoding = encoding ? encoding : utf8;
 715        if (!strcmp(use_encoding, output_encoding))
 716                out = xstrdup(commit->buffer);
 717        else
 718                out = reencode_string(commit->buffer,
 719                                      output_encoding, use_encoding);
 720        if (out)
 721                out = replace_encoding_header(out, output_encoding);
 722
 723        free(encoding);
 724        return out;
 725}
 726
 727static void fill_person(struct interp *table, const char *msg, int len)
 728{
 729        int start, end, tz = 0;
 730        unsigned long date;
 731        char *ep;
 732
 733        /* parse name */
 734        for (end = 0; end < len && msg[end] != '<'; end++)
 735                ; /* do nothing */
 736        start = end + 1;
 737        while (end > 0 && isspace(msg[end - 1]))
 738                end--;
 739        table[0].value = xstrndup(msg, end);
 740
 741        if (start >= len)
 742                return;
 743
 744        /* parse email */
 745        for (end = start + 1; end < len && msg[end] != '>'; end++)
 746                ; /* do nothing */
 747
 748        if (end >= len)
 749                return;
 750
 751        table[1].value = xstrndup(msg + start, end - start);
 752
 753        /* parse date */
 754        for (start = end + 1; start < len && isspace(msg[start]); start++)
 755                ; /* do nothing */
 756        if (start >= len)
 757                return;
 758        date = strtoul(msg + start, &ep, 10);
 759        if (msg + start == ep)
 760                return;
 761
 762        table[5].value = xstrndup(msg + start, ep - (msg + start));
 763
 764        /* parse tz */
 765        for (start = ep - msg + 1; start < len && isspace(msg[start]); start++)
 766                ; /* do nothing */
 767        if (start + 1 < len) {
 768                tz = strtoul(msg + start + 1, NULL, 10);
 769                if (msg[start] == '-')
 770                        tz = -tz;
 771        }
 772
 773        interp_set_entry(table, 2, show_date(date, tz, 0));
 774        interp_set_entry(table, 3, show_rfc2822_date(date, tz));
 775        interp_set_entry(table, 4, show_date(date, tz, 1));
 776}
 777
 778static long format_commit_message(const struct commit *commit,
 779                const char *msg, char *buf, unsigned long space)
 780{
 781        struct interp table[] = {
 782                { "%H" },       /* commit hash */
 783                { "%h" },       /* abbreviated commit hash */
 784                { "%T" },       /* tree hash */
 785                { "%t" },       /* abbreviated tree hash */
 786                { "%P" },       /* parent hashes */
 787                { "%p" },       /* abbreviated parent hashes */
 788                { "%an" },      /* author name */
 789                { "%ae" },      /* author email */
 790                { "%ad" },      /* author date */
 791                { "%aD" },      /* author date, RFC2822 style */
 792                { "%ar" },      /* author date, relative */
 793                { "%at" },      /* author date, UNIX timestamp */
 794                { "%cn" },      /* committer name */
 795                { "%ce" },      /* committer email */
 796                { "%cd" },      /* committer date */
 797                { "%cD" },      /* committer date, RFC2822 style */
 798                { "%cr" },      /* committer date, relative */
 799                { "%ct" },      /* committer date, UNIX timestamp */
 800                { "%e" },       /* encoding */
 801                { "%s" },       /* subject */
 802                { "%b" },       /* body */
 803                { "%Cred" },    /* red */
 804                { "%Cgreen" },  /* green */
 805                { "%Cblue" },   /* blue */
 806                { "%Creset" },  /* reset color */
 807                { "%n" },       /* newline */
 808                { "%m" },       /* left/right/bottom */
 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                ILEFT_RIGHT,
 826        };
 827        struct commit_list *p;
 828        char parents[1024];
 829        int i;
 830        enum { HEADER, SUBJECT, BODY } state;
 831
 832        if (ILEFT_RIGHT + 1 != ARRAY_SIZE(table))
 833                die("invalid interp table!");
 834
 835        /* these are independent of the commit */
 836        interp_set_entry(table, IRED, "\033[31m");
 837        interp_set_entry(table, IGREEN, "\033[32m");
 838        interp_set_entry(table, IBLUE, "\033[34m");
 839        interp_set_entry(table, IRESET_COLOR, "\033[m");
 840        interp_set_entry(table, INEWLINE, "\n");
 841
 842        /* these depend on the commit */
 843        if (!commit->object.parsed)
 844                parse_object(commit->object.sha1);
 845        interp_set_entry(table, IHASH, sha1_to_hex(commit->object.sha1));
 846        interp_set_entry(table, IHASH_ABBREV,
 847                        find_unique_abbrev(commit->object.sha1,
 848                                DEFAULT_ABBREV));
 849        interp_set_entry(table, ITREE, sha1_to_hex(commit->tree->object.sha1));
 850        interp_set_entry(table, ITREE_ABBREV,
 851                        find_unique_abbrev(commit->tree->object.sha1,
 852                                DEFAULT_ABBREV));
 853        interp_set_entry(table, ILEFT_RIGHT,
 854                         (commit->object.flags & BOUNDARY)
 855                         ? "-"
 856                         : (commit->object.flags & SYMMETRIC_LEFT)
 857                         ? "<"
 858                         : ">");
 859
 860        parents[1] = 0;
 861        for (i = 0, p = commit->parents;
 862                        p && i < sizeof(parents) - 1;
 863                        p = p->next)
 864                i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
 865                        sha1_to_hex(p->item->object.sha1));
 866        interp_set_entry(table, IPARENTS, parents + 1);
 867
 868        parents[1] = 0;
 869        for (i = 0, p = commit->parents;
 870                        p && i < sizeof(parents) - 1;
 871                        p = p->next)
 872                i += snprintf(parents + i, sizeof(parents) - i - 1, " %s",
 873                        find_unique_abbrev(p->item->object.sha1,
 874                                DEFAULT_ABBREV));
 875        interp_set_entry(table, IPARENTS_ABBREV, parents + 1);
 876
 877        for (i = 0, state = HEADER; msg[i] && state < BODY; i++) {
 878                int eol;
 879                for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
 880                        ; /* do nothing */
 881
 882                if (state == SUBJECT) {
 883                        table[ISUBJECT].value = xstrndup(msg + i, eol - i);
 884                        i = eol;
 885                }
 886                if (i == eol) {
 887                        state++;
 888                        /* strip empty lines */
 889                        while (msg[eol + 1] == '\n')
 890                                eol++;
 891                } else if (!prefixcmp(msg + i, "author "))
 892                        fill_person(table + IAUTHOR_NAME,
 893                                        msg + i + 7, eol - i - 7);
 894                else if (!prefixcmp(msg + i, "committer "))
 895                        fill_person(table + ICOMMITTER_NAME,
 896                                        msg + i + 10, eol - i - 10);
 897                else if (!prefixcmp(msg + i, "encoding "))
 898                        table[IENCODING].value =
 899                                xstrndup(msg + i + 9, eol - i - 9);
 900                i = eol;
 901        }
 902        if (msg[i])
 903                table[IBODY].value = xstrdup(msg + i);
 904        for (i = 0; i < ARRAY_SIZE(table); i++)
 905                if (!table[i].value)
 906                        interp_set_entry(table, i, "<unknown>");
 907
 908        interpolate(buf, space, user_format, table, ARRAY_SIZE(table));
 909        interp_clear_table(table, ARRAY_SIZE(table));
 910
 911        return strlen(buf);
 912}
 913
 914unsigned long pretty_print_commit(enum cmit_fmt fmt,
 915                                  const struct commit *commit,
 916                                  unsigned long len,
 917                                  char *buf, unsigned long space,
 918                                  int abbrev, const char *subject,
 919                                  const char *after_subject,
 920                                  enum date_mode dmode)
 921{
 922        int hdr = 1, body = 0, seen_title = 0;
 923        unsigned long offset = 0;
 924        int indent = 4;
 925        int parents_shown = 0;
 926        const char *msg = commit->buffer;
 927        int plain_non_ascii = 0;
 928        char *reencoded;
 929        const char *encoding;
 930
 931        if (fmt == CMIT_FMT_USERFORMAT)
 932                return format_commit_message(commit, msg, buf, space);
 933
 934        encoding = (git_log_output_encoding
 935                    ? git_log_output_encoding
 936                    : git_commit_encoding);
 937        if (!encoding)
 938                encoding = "utf-8";
 939        reencoded = logmsg_reencode(commit, encoding);
 940        if (reencoded)
 941                msg = reencoded;
 942
 943        if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
 944                indent = 0;
 945
 946        /* After-subject is used to pass in Content-Type: multipart
 947         * MIME header; in that case we do not have to do the
 948         * plaintext content type even if the commit message has
 949         * non 7-bit ASCII character.  Otherwise, check if we need
 950         * to say this is not a 7-bit ASCII.
 951         */
 952        if (fmt == CMIT_FMT_EMAIL && !after_subject) {
 953                int i, ch, in_body;
 954
 955                for (in_body = i = 0; (ch = msg[i]) && i < len; i++) {
 956                        if (!in_body) {
 957                                /* author could be non 7-bit ASCII but
 958                                 * the log may be so; skip over the
 959                                 * header part first.
 960                                 */
 961                                if (ch == '\n' &&
 962                                    i + 1 < len && msg[i+1] == '\n')
 963                                        in_body = 1;
 964                        }
 965                        else if (non_ascii(ch)) {
 966                                plain_non_ascii = 1;
 967                                break;
 968                        }
 969                }
 970        }
 971
 972        for (;;) {
 973                const char *line = msg;
 974                int linelen = get_one_line(msg, len);
 975
 976                if (!linelen)
 977                        break;
 978
 979                /*
 980                 * We want some slop for indentation and a possible
 981                 * final "...". Thus the "+ 20".
 982                 */
 983                if (offset + linelen + 20 > space) {
 984                        memcpy(buf + offset, "    ...\n", 8);
 985                        offset += 8;
 986                        break;
 987                }
 988
 989                msg += linelen;
 990                len -= linelen;
 991                if (hdr) {
 992                        if (linelen == 1) {
 993                                hdr = 0;
 994                                if ((fmt != CMIT_FMT_ONELINE) && !subject)
 995                                        buf[offset++] = '\n';
 996                                continue;
 997                        }
 998                        if (fmt == CMIT_FMT_RAW) {
 999                                memcpy(buf + offset, line, linelen);
1000                                offset += linelen;
1001                                continue;
1002                        }
1003                        if (!memcmp(line, "parent ", 7)) {
1004                                if (linelen != 48)
1005                                        die("bad parent line in commit");
1006                                continue;
1007                        }
1008
1009                        if (!parents_shown) {
1010                                offset += add_merge_info(fmt, buf + offset,
1011                                                         commit, abbrev);
1012                                parents_shown = 1;
1013                                continue;
1014                        }
1015                        /*
1016                         * MEDIUM == DEFAULT shows only author with dates.
1017                         * FULL shows both authors but not dates.
1018                         * FULLER shows both authors and dates.
1019                         */
1020                        if (!memcmp(line, "author ", 7))
1021                                offset += add_user_info("Author", fmt,
1022                                                        buf + offset,
1023                                                        line + 7,
1024                                                        dmode,
1025                                                        encoding);
1026                        if (!memcmp(line, "committer ", 10) &&
1027                            (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
1028                                offset += add_user_info("Commit", fmt,
1029                                                        buf + offset,
1030                                                        line + 10,
1031                                                        dmode,
1032                                                        encoding);
1033                        continue;
1034                }
1035
1036                if (!subject)
1037                        body = 1;
1038
1039                if (is_empty_line(line, &linelen)) {
1040                        if (!seen_title)
1041                                continue;
1042                        if (!body)
1043                                continue;
1044                        if (subject)
1045                                continue;
1046                        if (fmt == CMIT_FMT_SHORT)
1047                                break;
1048                }
1049
1050                seen_title = 1;
1051                if (subject) {
1052                        int slen = strlen(subject);
1053                        memcpy(buf + offset, subject, slen);
1054                        offset += slen;
1055                        offset += add_rfc2047(buf + offset, line, linelen,
1056                                              encoding);
1057                }
1058                else {
1059                        memset(buf + offset, ' ', indent);
1060                        memcpy(buf + offset + indent, line, linelen);
1061                        offset += linelen + indent;
1062                }
1063                buf[offset++] = '\n';
1064                if (fmt == CMIT_FMT_ONELINE)
1065                        break;
1066                if (subject && plain_non_ascii) {
1067                        int sz;
1068                        char header[512];
1069                        const char *header_fmt =
1070                                "MIME-Version: 1.0\n"
1071                                "Content-Type: text/plain; charset=%s\n"
1072                                "Content-Transfer-Encoding: 8bit\n";
1073                        sz = snprintf(header, sizeof(header), header_fmt,
1074                                      encoding);
1075                        if (sizeof(header) < sz)
1076                                die("Encoding name %s too long", encoding);
1077                        memcpy(buf + offset, header, sz);
1078                        offset += sz;
1079                }
1080                if (after_subject) {
1081                        int slen = strlen(after_subject);
1082                        if (slen > space - offset - 1)
1083                                slen = space - offset - 1;
1084                        memcpy(buf + offset, after_subject, slen);
1085                        offset += slen;
1086                        after_subject = NULL;
1087                }
1088                subject = NULL;
1089        }
1090        while (offset && isspace(buf[offset-1]))
1091                offset--;
1092        /* Make sure there is an EOLN for the non-oneline case */
1093        if (fmt != CMIT_FMT_ONELINE)
1094                buf[offset++] = '\n';
1095        /*
1096         * make sure there is another EOLN to separate the headers from whatever
1097         * body the caller appends if we haven't already written a body
1098         */
1099        if (fmt == CMIT_FMT_EMAIL && !body)
1100                buf[offset++] = '\n';
1101        buf[offset] = '\0';
1102
1103        free(reencoded);
1104        return offset;
1105}
1106
1107struct commit *pop_commit(struct commit_list **stack)
1108{
1109        struct commit_list *top = *stack;
1110        struct commit *item = top ? top->item : NULL;
1111
1112        if (top) {
1113                *stack = top->next;
1114                free(top);
1115        }
1116        return item;
1117}
1118
1119int count_parents(struct commit * commit)
1120{
1121        int count;
1122        struct commit_list * parents = commit->parents;
1123        for (count = 0; parents; parents = parents->next,count++)
1124                ;
1125        return count;
1126}
1127
1128void topo_sort_default_setter(struct commit *c, void *data)
1129{
1130        c->util = data;
1131}
1132
1133void *topo_sort_default_getter(struct commit *c)
1134{
1135        return c->util;
1136}
1137
1138/*
1139 * Performs an in-place topological sort on the list supplied.
1140 */
1141void sort_in_topological_order(struct commit_list ** list, int lifo)
1142{
1143        sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
1144                                     topo_sort_default_getter);
1145}
1146
1147void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
1148                                  topo_sort_set_fn_t setter,
1149                                  topo_sort_get_fn_t getter)
1150{
1151        struct commit_list * next = *list;
1152        struct commit_list * work = NULL, **insert;
1153        struct commit_list ** pptr = list;
1154        struct sort_node * nodes;
1155        struct sort_node * next_nodes;
1156        int count = 0;
1157
1158        /* determine the size of the list */
1159        while (next) {
1160                next = next->next;
1161                count++;
1162        }
1163        
1164        if (!count)
1165                return;
1166        /* allocate an array to help sort the list */
1167        nodes = xcalloc(count, sizeof(*nodes));
1168        /* link the list to the array */
1169        next_nodes = nodes;
1170        next=*list;
1171        while (next) {
1172                next_nodes->list_item = next;
1173                setter(next->item, next_nodes);
1174                next_nodes++;
1175                next = next->next;
1176        }
1177        /* update the indegree */
1178        next=*list;
1179        while (next) {
1180                struct commit_list * parents = next->item->parents;
1181                while (parents) {
1182                        struct commit * parent=parents->item;
1183                        struct sort_node * pn = (struct sort_node *) getter(parent);
1184
1185                        if (pn)
1186                                pn->indegree++;
1187                        parents=parents->next;
1188                }
1189                next=next->next;
1190        }
1191        /* 
1192         * find the tips
1193         *
1194         * tips are nodes not reachable from any other node in the list 
1195         * 
1196         * the tips serve as a starting set for the work queue.
1197         */
1198        next=*list;
1199        insert = &work;
1200        while (next) {
1201                struct sort_node * node = (struct sort_node *) getter(next->item);
1202
1203                if (node->indegree == 0) {
1204                        insert = &commit_list_insert(next->item, insert)->next;
1205                }
1206                next=next->next;
1207        }
1208
1209        /* process the list in topological order */
1210        if (!lifo)
1211                sort_by_date(&work);
1212        while (work) {
1213                struct commit * work_item = pop_commit(&work);
1214                struct sort_node * work_node = (struct sort_node *) getter(work_item);
1215                struct commit_list * parents = work_item->parents;
1216
1217                while (parents) {
1218                        struct commit * parent=parents->item;
1219                        struct sort_node * pn = (struct sort_node *) getter(parent);
1220
1221                        if (pn) {
1222                                /*
1223                                 * parents are only enqueued for emission 
1224                                 * when all their children have been emitted thereby
1225                                 * guaranteeing topological order.
1226                                 */
1227                                pn->indegree--;
1228                                if (!pn->indegree) {
1229                                        if (!lifo)
1230                                                insert_by_date(parent, &work);
1231                                        else
1232                                                commit_list_insert(parent, &work);
1233                                }
1234                        }
1235                        parents=parents->next;
1236                }
1237                /*
1238                 * work_item is a commit all of whose children
1239                 * have already been emitted. we can emit it now.
1240                 */
1241                *pptr = work_node->list_item;
1242                pptr = &(*pptr)->next;
1243                *pptr = NULL;
1244                setter(work_item, NULL);
1245        }
1246        free(nodes);
1247}
1248
1249/* merge-base stuff */
1250
1251/* bits #0..15 in revision.h */
1252#define PARENT1         (1u<<16)
1253#define PARENT2         (1u<<17)
1254#define STALE           (1u<<18)
1255#define RESULT          (1u<<19)
1256
1257static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
1258
1259static struct commit *interesting(struct commit_list *list)
1260{
1261        while (list) {
1262                struct commit *commit = list->item;
1263                list = list->next;
1264                if (commit->object.flags & STALE)
1265                        continue;
1266                return commit;
1267        }
1268        return NULL;
1269}
1270
1271static struct commit_list *merge_bases(struct commit *one, struct commit *two)
1272{
1273        struct commit_list *list = NULL;
1274        struct commit_list *result = NULL;
1275
1276        if (one == two)
1277                /* We do not mark this even with RESULT so we do not
1278                 * have to clean it up.
1279                 */
1280                return commit_list_insert(one, &result);
1281
1282        parse_commit(one);
1283        parse_commit(two);
1284
1285        one->object.flags |= PARENT1;
1286        two->object.flags |= PARENT2;
1287        insert_by_date(one, &list);
1288        insert_by_date(two, &list);
1289
1290        while (interesting(list)) {
1291                struct commit *commit;
1292                struct commit_list *parents;
1293                struct commit_list *n;
1294                int flags;
1295
1296                commit = list->item;
1297                n = list->next;
1298                free(list);
1299                list = n;
1300
1301                flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
1302                if (flags == (PARENT1 | PARENT2)) {
1303                        if (!(commit->object.flags & RESULT)) {
1304                                commit->object.flags |= RESULT;
1305                                insert_by_date(commit, &result);
1306                        }
1307                        /* Mark parents of a found merge stale */
1308                        flags |= STALE;
1309                }
1310                parents = commit->parents;
1311                while (parents) {
1312                        struct commit *p = parents->item;
1313                        parents = parents->next;
1314                        if ((p->object.flags & flags) == flags)
1315                                continue;
1316                        parse_commit(p);
1317                        p->object.flags |= flags;
1318                        insert_by_date(p, &list);
1319                }
1320        }
1321
1322        /* Clean up the result to remove stale ones */
1323        free_commit_list(list);
1324        list = result; result = NULL;
1325        while (list) {
1326                struct commit_list *n = list->next;
1327                if (!(list->item->object.flags & STALE))
1328                        insert_by_date(list->item, &result);
1329                free(list);
1330                list = n;
1331        }
1332        return result;
1333}
1334
1335struct commit_list *get_merge_bases(struct commit *one,
1336                                    struct commit *two,
1337                                    int cleanup)
1338{
1339        struct commit_list *list;
1340        struct commit **rslt;
1341        struct commit_list *result;
1342        int cnt, i, j;
1343
1344        result = merge_bases(one, two);
1345        if (one == two)
1346                return result;
1347        if (!result || !result->next) {
1348                if (cleanup) {
1349                        clear_commit_marks(one, all_flags);
1350                        clear_commit_marks(two, all_flags);
1351                }
1352                return result;
1353        }
1354
1355        /* There are more than one */
1356        cnt = 0;
1357        list = result;
1358        while (list) {
1359                list = list->next;
1360                cnt++;
1361        }
1362        rslt = xcalloc(cnt, sizeof(*rslt));
1363        for (list = result, i = 0; list; list = list->next)
1364                rslt[i++] = list->item;
1365        free_commit_list(result);
1366
1367        clear_commit_marks(one, all_flags);
1368        clear_commit_marks(two, all_flags);
1369        for (i = 0; i < cnt - 1; i++) {
1370                for (j = i+1; j < cnt; j++) {
1371                        if (!rslt[i] || !rslt[j])
1372                                continue;
1373                        result = merge_bases(rslt[i], rslt[j]);
1374                        clear_commit_marks(rslt[i], all_flags);
1375                        clear_commit_marks(rslt[j], all_flags);
1376                        for (list = result; list; list = list->next) {
1377                                if (rslt[i] == list->item)
1378                                        rslt[i] = NULL;
1379                                if (rslt[j] == list->item)
1380                                        rslt[j] = NULL;
1381                        }
1382                }
1383        }
1384
1385        /* Surviving ones in rslt[] are the independent results */
1386        result = NULL;
1387        for (i = 0; i < cnt; i++) {
1388                if (rslt[i])
1389                        insert_by_date(rslt[i], &result);
1390        }
1391        free(rslt);
1392        return result;
1393}
1394
1395int in_merge_bases(struct commit *commit, struct commit **reference, int num)
1396{
1397        struct commit_list *bases, *b;
1398        int ret = 0;
1399
1400        if (num == 1)
1401                bases = get_merge_bases(commit, *reference, 1);
1402        else
1403                die("not yet");
1404        for (b = bases; b; b = b->next) {
1405                if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
1406                        ret = 1;
1407                        break;
1408                }
1409        }
1410
1411        free_commit_list(bases);
1412        return ret;
1413}