Andrew's git / gitweb.git / commit.c
?
commit.con commit Merge branch 'jc/unresolve' into next (f31613d)
   1#include "cache.h"
   2#include "tag.h"
   3#include "commit.h"
   4
   5int save_commit_buffer = 1;
   6
   7struct sort_node
   8{
   9        /*
  10         * the number of children of the associated commit
  11         * that also occur in the list being sorted.
  12         */
  13        unsigned int indegree;
  14
  15        /*
  16         * reference to original list item that we will re-use
  17         * on output.
  18         */
  19        struct commit_list * list_item;
  20
  21};
  22
  23const char *commit_type = "commit";
  24
  25enum cmit_fmt get_commit_format(const char *arg)
  26{
  27        if (!*arg)
  28                return CMIT_FMT_DEFAULT;
  29        if (!strcmp(arg, "=raw"))
  30                return CMIT_FMT_RAW;
  31        if (!strcmp(arg, "=medium"))
  32                return CMIT_FMT_MEDIUM;
  33        if (!strcmp(arg, "=short"))
  34                return CMIT_FMT_SHORT;
  35        if (!strcmp(arg, "=full"))
  36                return CMIT_FMT_FULL;
  37        if (!strcmp(arg, "=fuller"))
  38                return CMIT_FMT_FULLER;
  39        if (!strcmp(arg, "=email"))
  40                return CMIT_FMT_EMAIL;
  41        if (!strcmp(arg, "=oneline"))
  42                return CMIT_FMT_ONELINE;
  43        die("invalid --pretty format");
  44}
  45
  46static struct commit *check_commit(struct object *obj,
  47                                   const unsigned char *sha1,
  48                                   int quiet)
  49{
  50        if (obj->type != commit_type) {
  51                if (!quiet)
  52                        error("Object %s is a %s, not a commit",
  53                              sha1_to_hex(sha1), obj->type);
  54                return NULL;
  55        }
  56        return (struct commit *) obj;
  57}
  58
  59struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
  60                                              int quiet)
  61{
  62        struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
  63
  64        if (!obj)
  65                return NULL;
  66        return check_commit(obj, sha1, quiet);
  67}
  68
  69struct commit *lookup_commit_reference(const unsigned char *sha1)
  70{
  71        return lookup_commit_reference_gently(sha1, 0);
  72}
  73
  74struct commit *lookup_commit(const unsigned char *sha1)
  75{
  76        struct object *obj = lookup_object(sha1);
  77        if (!obj) {
  78                struct commit *ret = xcalloc(1, sizeof(struct commit));
  79                created_object(sha1, &ret->object);
  80                ret->object.type = commit_type;
  81                return ret;
  82        }
  83        if (!obj->type)
  84                obj->type = commit_type;
  85        return check_commit(obj, sha1, 0);
  86}
  87
  88static unsigned long parse_commit_date(const char *buf)
  89{
  90        unsigned long date;
  91
  92        if (memcmp(buf, "author", 6))
  93                return 0;
  94        while (*buf++ != '\n')
  95                /* nada */;
  96        if (memcmp(buf, "committer", 9))
  97                return 0;
  98        while (*buf++ != '>')
  99                /* nada */;
 100        date = strtoul(buf, NULL, 10);
 101        if (date == ULONG_MAX)
 102                date = 0;
 103        return date;
 104}
 105
 106static struct commit_graft **commit_graft;
 107static int commit_graft_alloc, commit_graft_nr;
 108
 109static int commit_graft_pos(const unsigned char *sha1)
 110{
 111        int lo, hi;
 112        lo = 0;
 113        hi = commit_graft_nr;
 114        while (lo < hi) {
 115                int mi = (lo + hi) / 2;
 116                struct commit_graft *graft = commit_graft[mi];
 117                int cmp = memcmp(sha1, graft->sha1, 20);
 118                if (!cmp)
 119                        return mi;
 120                if (cmp < 0)
 121                        hi = mi;
 122                else
 123                        lo = mi + 1;
 124        }
 125        return -lo - 1;
 126}
 127
 128int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 129{
 130        int pos = commit_graft_pos(graft->sha1);
 131        
 132        if (0 <= pos) {
 133                if (ignore_dups)
 134                        free(graft);
 135                else {
 136                        free(commit_graft[pos]);
 137                        commit_graft[pos] = graft;
 138                }
 139                return 1;
 140        }
 141        pos = -pos - 1;
 142        if (commit_graft_alloc <= ++commit_graft_nr) {
 143                commit_graft_alloc = alloc_nr(commit_graft_alloc);
 144                commit_graft = xrealloc(commit_graft,
 145                                        sizeof(*commit_graft) *
 146                                        commit_graft_alloc);
 147        }
 148        if (pos < commit_graft_nr)
 149                memmove(commit_graft + pos + 1,
 150                        commit_graft + pos,
 151                        (commit_graft_nr - pos - 1) *
 152                        sizeof(*commit_graft));
 153        commit_graft[pos] = graft;
 154        return 0;
 155}
 156
 157struct commit_graft *read_graft_line(char *buf, int len)
 158{
 159        /* The format is just "Commit Parent1 Parent2 ...\n" */
 160        int i;
 161        struct commit_graft *graft = NULL;
 162
 163        if (buf[len-1] == '\n')
 164                buf[--len] = 0;
 165        if (buf[0] == '#' || buf[0] == '\0')
 166                return NULL;
 167        if ((len + 1) % 41) {
 168        bad_graft_data:
 169                error("bad graft data: %s", buf);
 170                free(graft);
 171                return NULL;
 172        }
 173        i = (len + 1) / 41 - 1;
 174        graft = xmalloc(sizeof(*graft) + 20 * i);
 175        graft->nr_parent = i;
 176        if (get_sha1_hex(buf, graft->sha1))
 177                goto bad_graft_data;
 178        for (i = 40; i < len; i += 41) {
 179                if (buf[i] != ' ')
 180                        goto bad_graft_data;
 181                if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
 182                        goto bad_graft_data;
 183        }
 184        return graft;
 185}
 186
 187int read_graft_file(const char *graft_file)
 188{
 189        FILE *fp = fopen(graft_file, "r");
 190        char buf[1024];
 191        if (!fp)
 192                return -1;
 193        while (fgets(buf, sizeof(buf), fp)) {
 194                /* The format is just "Commit Parent1 Parent2 ...\n" */
 195                int len = strlen(buf);
 196                struct commit_graft *graft = read_graft_line(buf, len);
 197                if (!graft)
 198                        continue;
 199                if (register_commit_graft(graft, 1))
 200                        error("duplicate graft data: %s", buf);
 201        }
 202        fclose(fp);
 203        return 0;
 204}
 205
 206static void prepare_commit_graft(void)
 207{
 208        static int commit_graft_prepared;
 209        char *graft_file;
 210
 211        if (commit_graft_prepared)
 212                return;
 213        graft_file = get_graft_file();
 214        read_graft_file(graft_file);
 215        commit_graft_prepared = 1;
 216}
 217
 218static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
 219{
 220        int pos;
 221        prepare_commit_graft();
 222        pos = commit_graft_pos(sha1);
 223        if (pos < 0)
 224                return NULL;
 225        return commit_graft[pos];
 226}
 227
 228int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 229{
 230        char *bufptr = buffer;
 231        unsigned char parent[20];
 232        struct commit_list **pptr;
 233        struct commit_graft *graft;
 234        unsigned n_refs = 0;
 235
 236        if (item->object.parsed)
 237                return 0;
 238        item->object.parsed = 1;
 239        if (memcmp(bufptr, "tree ", 5))
 240                return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
 241        if (get_sha1_hex(bufptr + 5, parent) < 0)
 242                return error("bad tree pointer in commit %s",
 243                             sha1_to_hex(item->object.sha1));
 244        item->tree = lookup_tree(parent);
 245        if (item->tree)
 246                n_refs++;
 247        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
 248        pptr = &item->parents;
 249
 250        graft = lookup_commit_graft(item->object.sha1);
 251        while (!memcmp(bufptr, "parent ", 7)) {
 252                struct commit *new_parent;
 253
 254                if (get_sha1_hex(bufptr + 7, parent) || bufptr[47] != '\n')
 255                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
 256                bufptr += 48;
 257                if (graft)
 258                        continue;
 259                new_parent = lookup_commit(parent);
 260                if (new_parent) {
 261                        pptr = &commit_list_insert(new_parent, pptr)->next;
 262                        n_refs++;
 263                }
 264        }
 265        if (graft) {
 266                int i;
 267                struct commit *new_parent;
 268                for (i = 0; i < graft->nr_parent; i++) {
 269                        new_parent = lookup_commit(graft->parent[i]);
 270                        if (!new_parent)
 271                                continue;
 272                        pptr = &commit_list_insert(new_parent, pptr)->next;
 273                        n_refs++;
 274                }
 275        }
 276        item->date = parse_commit_date(bufptr);
 277
 278        if (track_object_refs) {
 279                unsigned i = 0;
 280                struct commit_list *p;
 281                struct object_refs *refs = alloc_object_refs(n_refs);
 282                if (item->tree)
 283                        refs->ref[i++] = &item->tree->object;
 284                for (p = item->parents; p; p = p->next)
 285                        refs->ref[i++] = &p->item->object;
 286                set_object_refs(&item->object, refs);
 287        }
 288
 289        return 0;
 290}
 291
 292int parse_commit(struct commit *item)
 293{
 294        char type[20];
 295        void *buffer;
 296        unsigned long size;
 297        int ret;
 298
 299        if (item->object.parsed)
 300                return 0;
 301        buffer = read_sha1_file(item->object.sha1, type, &size);
 302        if (!buffer)
 303                return error("Could not read %s",
 304                             sha1_to_hex(item->object.sha1));
 305        if (strcmp(type, commit_type)) {
 306                free(buffer);
 307                return error("Object %s not a commit",
 308                             sha1_to_hex(item->object.sha1));
 309        }
 310        ret = parse_commit_buffer(item, buffer, size);
 311        if (save_commit_buffer && !ret) {
 312                item->buffer = buffer;
 313                return 0;
 314        }
 315        free(buffer);
 316        return ret;
 317}
 318
 319struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 320{
 321        struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
 322        new_list->item = item;
 323        new_list->next = *list_p;
 324        *list_p = new_list;
 325        return new_list;
 326}
 327
 328void free_commit_list(struct commit_list *list)
 329{
 330        while (list) {
 331                struct commit_list *temp = list;
 332                list = temp->next;
 333                free(temp);
 334        }
 335}
 336
 337struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
 338{
 339        struct commit_list **pp = list;
 340        struct commit_list *p;
 341        while ((p = *pp) != NULL) {
 342                if (p->item->date < item->date) {
 343                        break;
 344                }
 345                pp = &p->next;
 346        }
 347        return commit_list_insert(item, pp);
 348}
 349
 350        
 351void sort_by_date(struct commit_list **list)
 352{
 353        struct commit_list *ret = NULL;
 354        while (*list) {
 355                insert_by_date((*list)->item, &ret);
 356                *list = (*list)->next;
 357        }
 358        *list = ret;
 359}
 360
 361struct commit *pop_most_recent_commit(struct commit_list **list,
 362                                      unsigned int mark)
 363{
 364        struct commit *ret = (*list)->item;
 365        struct commit_list *parents = ret->parents;
 366        struct commit_list *old = *list;
 367
 368        *list = (*list)->next;
 369        free(old);
 370
 371        while (parents) {
 372                struct commit *commit = parents->item;
 373                parse_commit(commit);
 374                if (!(commit->object.flags & mark)) {
 375                        commit->object.flags |= mark;
 376                        insert_by_date(commit, list);
 377                }
 378                parents = parents->next;
 379        }
 380        return ret;
 381}
 382
 383void clear_commit_marks(struct commit *commit, unsigned int mark)
 384{
 385        struct commit_list *parents;
 386
 387        parents = commit->parents;
 388        commit->object.flags &= ~mark;
 389        while (parents) {
 390                struct commit *parent = parents->item;
 391                if (parent && parent->object.parsed &&
 392                    (parent->object.flags & mark))
 393                        clear_commit_marks(parent, mark);
 394                parents = parents->next;
 395        }
 396}
 397
 398/*
 399 * Generic support for pretty-printing the header
 400 */
 401static int get_one_line(const char *msg, unsigned long len)
 402{
 403        int ret = 0;
 404
 405        while (len--) {
 406                char c = *msg++;
 407                if (!c)
 408                        break;
 409                ret++;
 410                if (c == '\n')
 411                        break;
 412        }
 413        return ret;
 414}
 415
 416static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
 417{
 418        char *date;
 419        int namelen;
 420        unsigned long time;
 421        int tz, ret;
 422        const char *filler = "    ";
 423
 424        if (fmt == CMIT_FMT_ONELINE)
 425                return 0;
 426        date = strchr(line, '>');
 427        if (!date)
 428                return 0;
 429        namelen = ++date - line;
 430        time = strtoul(date, &date, 10);
 431        tz = strtol(date, NULL, 10);
 432
 433        if (fmt == CMIT_FMT_EMAIL) {
 434                what = "From";
 435                filler = "";
 436        }
 437        ret = sprintf(buf, "%s: %.*s%.*s\n", what,
 438                      (fmt == CMIT_FMT_FULLER) ? 4 : 0,
 439                      filler, namelen, line);
 440        switch (fmt) {
 441        case CMIT_FMT_MEDIUM:
 442                ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
 443                break;
 444        case CMIT_FMT_EMAIL:
 445                ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
 446                break;
 447        case CMIT_FMT_FULLER:
 448                ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
 449                break;
 450        default:
 451                /* notin' */
 452                break;
 453        }
 454        return ret;
 455}
 456
 457static int is_empty_line(const char *line, int *len_p)
 458{
 459        int len = *len_p;
 460        while (len && isspace(line[len-1]))
 461                len--;
 462        *len_p = len;
 463        return !len;
 464}
 465
 466static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *commit, int abbrev)
 467{
 468        struct commit_list *parent = commit->parents;
 469        int offset;
 470
 471        if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
 472            !parent || !parent->next)
 473                return 0;
 474
 475        offset = sprintf(buf, "Merge:");
 476
 477        while (parent) {
 478                struct commit *p = parent->item;
 479                const char *hex = abbrev
 480                        ? find_unique_abbrev(p->object.sha1, abbrev)
 481                        : sha1_to_hex(p->object.sha1);
 482                char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
 483                parent = parent->next;
 484
 485                offset += sprintf(buf + offset, " %s%s", hex, dots);
 486        }
 487        buf[offset++] = '\n';
 488        return offset;
 489}
 490
 491unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev)
 492{
 493        int hdr = 1, body = 0;
 494        unsigned long offset = 0;
 495        int indent = 4;
 496        int parents_shown = 0;
 497        const char *msg = commit->buffer;
 498        const char *subject = NULL;
 499
 500        if (fmt == CMIT_FMT_EMAIL)
 501                subject = "Subject: [PATCH] ";
 502        if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
 503                indent = 0;
 504
 505        for (;;) {
 506                const char *line = msg;
 507                int linelen = get_one_line(msg, len);
 508
 509                if (!linelen)
 510                        break;
 511
 512                /*
 513                 * We want some slop for indentation and a possible
 514                 * final "...". Thus the "+ 20".
 515                 */
 516                if (offset + linelen + 20 > space) {
 517                        memcpy(buf + offset, "    ...\n", 8);
 518                        offset += 8;
 519                        break;
 520                }
 521
 522                msg += linelen;
 523                len -= linelen;
 524                if (hdr) {
 525                        if (linelen == 1) {
 526                                hdr = 0;
 527                                if ((fmt != CMIT_FMT_ONELINE) && !subject)
 528                                        buf[offset++] = '\n';
 529                                continue;
 530                        }
 531                        if (fmt == CMIT_FMT_RAW) {
 532                                memcpy(buf + offset, line, linelen);
 533                                offset += linelen;
 534                                continue;
 535                        }
 536                        if (!memcmp(line, "parent ", 7)) {
 537                                if (linelen != 48)
 538                                        die("bad parent line in commit");
 539                                continue;
 540                        }
 541
 542                        if (!parents_shown) {
 543                                offset += add_merge_info(fmt, buf + offset,
 544                                                         commit, abbrev);
 545                                parents_shown = 1;
 546                                continue;
 547                        }
 548                        /*
 549                         * MEDIUM == DEFAULT shows only author with dates.
 550                         * FULL shows both authors but not dates.
 551                         * FULLER shows both authors and dates.
 552                         */
 553                        if (!memcmp(line, "author ", 7))
 554                                offset += add_user_info("Author", fmt,
 555                                                        buf + offset,
 556                                                        line + 7);
 557                        if (!memcmp(line, "committer ", 10) &&
 558                            (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
 559                                offset += add_user_info("Commit", fmt,
 560                                                        buf + offset,
 561                                                        line + 10);
 562                        continue;
 563                }
 564
 565                if (is_empty_line(line, &linelen)) {
 566                        if (!body)
 567                                continue;
 568                        if (subject)
 569                                continue;
 570                        if (fmt == CMIT_FMT_SHORT)
 571                                break;
 572                } else {
 573                        body = 1;
 574                }
 575
 576                if (subject) {
 577                        memcpy(buf + offset, subject, 9);
 578                        offset += 9;
 579                }
 580                memset(buf + offset, ' ', indent);
 581                memcpy(buf + offset + indent, line, linelen);
 582                offset += linelen + indent;
 583                buf[offset++] = '\n';
 584                if (fmt == CMIT_FMT_ONELINE)
 585                        break;
 586                subject = NULL;
 587        }
 588        while (offset && isspace(buf[offset-1]))
 589                offset--;
 590        /* Make sure there is an EOLN for the non-oneline case */
 591        if (fmt != CMIT_FMT_ONELINE)
 592                buf[offset++] = '\n';
 593        buf[offset] = '\0';
 594        return offset;
 595}
 596
 597struct commit *pop_commit(struct commit_list **stack)
 598{
 599        struct commit_list *top = *stack;
 600        struct commit *item = top ? top->item : NULL;
 601
 602        if (top) {
 603                *stack = top->next;
 604                free(top);
 605        }
 606        return item;
 607}
 608
 609int count_parents(struct commit * commit)
 610{
 611        int count = 0;
 612        struct commit_list * parents = commit->parents;
 613        for (count=0;parents; parents=parents->next,count++)
 614          ;
 615        return count;
 616}
 617
 618void topo_sort_default_setter(struct commit *c, void *data)
 619{
 620        c->object.util = data;
 621}
 622
 623void *topo_sort_default_getter(struct commit *c)
 624{
 625        return c->object.util;
 626}
 627
 628/*
 629 * Performs an in-place topological sort on the list supplied.
 630 */
 631void sort_in_topological_order(struct commit_list ** list, int lifo)
 632{
 633        sort_in_topological_order_fn(list, lifo, topo_sort_default_setter,
 634                                     topo_sort_default_getter);
 635}
 636
 637void sort_in_topological_order_fn(struct commit_list ** list, int lifo,
 638                                  topo_sort_set_fn_t setter,
 639                                  topo_sort_get_fn_t getter)
 640{
 641        struct commit_list * next = *list;
 642        struct commit_list * work = NULL, **insert;
 643        struct commit_list ** pptr = list;
 644        struct sort_node * nodes;
 645        struct sort_node * next_nodes;
 646        int count = 0;
 647
 648        /* determine the size of the list */
 649        while (next) {
 650                next = next->next;
 651                count++;
 652        }
 653        
 654        if (!count)
 655                return;
 656        /* allocate an array to help sort the list */
 657        nodes = xcalloc(count, sizeof(*nodes));
 658        /* link the list to the array */
 659        next_nodes = nodes;
 660        next=*list;
 661        while (next) {
 662                next_nodes->list_item = next;
 663                setter(next->item, next_nodes);
 664                next_nodes++;
 665                next = next->next;
 666        }
 667        /* update the indegree */
 668        next=*list;
 669        while (next) {
 670                struct commit_list * parents = next->item->parents;
 671                while (parents) {
 672                        struct commit * parent=parents->item;
 673                        struct sort_node * pn = (struct sort_node *) getter(parent);
 674
 675                        if (pn)
 676                                pn->indegree++;
 677                        parents=parents->next;
 678                }
 679                next=next->next;
 680        }
 681        /* 
 682         * find the tips
 683         *
 684         * tips are nodes not reachable from any other node in the list 
 685         * 
 686         * the tips serve as a starting set for the work queue.
 687         */
 688        next=*list;
 689        insert = &work;
 690        while (next) {
 691                struct sort_node * node = (struct sort_node *) getter(next->item);
 692
 693                if (node->indegree == 0) {
 694                        insert = &commit_list_insert(next->item, insert)->next;
 695                }
 696                next=next->next;
 697        }
 698
 699        /* process the list in topological order */
 700        if (!lifo)
 701                sort_by_date(&work);
 702        while (work) {
 703                struct commit * work_item = pop_commit(&work);
 704                struct sort_node * work_node = (struct sort_node *) getter(work_item);
 705                struct commit_list * parents = work_item->parents;
 706
 707                while (parents) {
 708                        struct commit * parent=parents->item;
 709                        struct sort_node * pn = (struct sort_node *) getter(parent);
 710
 711                        if (pn) {
 712                                /*
 713                                 * parents are only enqueued for emission 
 714                                 * when all their children have been emitted thereby
 715                                 * guaranteeing topological order.
 716                                 */
 717                                pn->indegree--;
 718                                if (!pn->indegree) {
 719                                        if (!lifo)
 720                                                insert_by_date(parent, &work);
 721                                        else
 722                                                commit_list_insert(parent, &work);
 723                                }
 724                        }
 725                        parents=parents->next;
 726                }
 727                /*
 728                 * work_item is a commit all of whose children
 729                 * have already been emitted. we can emit it now.
 730                 */
 731                *pptr = work_node->list_item;
 732                pptr = &(*pptr)->next;
 733                *pptr = NULL;
 734                setter(work_item, NULL);
 735        }
 736        free(nodes);
 737}