rev-list.con commit Merge branch 'master' of . (8ac93bc)
   1#include "cache.h"
   2#include "tag.h"
   3#include "commit.h"
   4#include "tree.h"
   5#include "blob.h"
   6#include "epoch.h"
   7
   8#define SEEN            (1u << 0)
   9#define INTERESTING     (1u << 1)
  10#define COUNTED         (1u << 2)
  11#define SHOWN           (1u << 3)
  12
  13static const char rev_list_usage[] =
  14        "git-rev-list [OPTION] commit-id <commit-id>\n"
  15                      "  --max-count=nr\n"
  16                      "  --max-age=epoch\n"
  17                      "  --min-age=epoch\n"
  18                      "  --parents\n"
  19                      "  --bisect\n"
  20                      "  --objects\n"
  21                      "  --unpacked\n"
  22                      "  --header\n"
  23                      "  --pretty\n"
  24                      "  --no-merges\n"
  25                      "  --merge-order [ --show-breaks ]\n"
  26                      "  --topo-order";
  27
  28static int unpacked = 0;
  29static int bisect_list = 0;
  30static int tag_objects = 0;
  31static int tree_objects = 0;
  32static int blob_objects = 0;
  33static int verbose_header = 0;
  34static int show_parents = 0;
  35static int hdr_termination = 0;
  36static const char *commit_prefix = "";
  37static unsigned long max_age = -1;
  38static unsigned long min_age = -1;
  39static int max_count = -1;
  40static enum cmit_fmt commit_format = CMIT_FMT_RAW;
  41static int merge_order = 0;
  42static int show_breaks = 0;
  43static int stop_traversal = 0;
  44static int topo_order = 0;
  45static int no_merges = 0;
  46
  47static void show_commit(struct commit *commit)
  48{
  49        commit->object.flags |= SHOWN;
  50        if (show_breaks) {
  51                commit_prefix = "| ";
  52                if (commit->object.flags & DISCONTINUITY) {
  53                        commit_prefix = "^ ";     
  54                } else if (commit->object.flags & BOUNDARY) {
  55                        commit_prefix = "= ";
  56                } 
  57        }                       
  58        printf("%s%s", commit_prefix, sha1_to_hex(commit->object.sha1));
  59        if (show_parents) {
  60                struct commit_list *parents = commit->parents;
  61                while (parents) {
  62                        printf(" %s", sha1_to_hex(parents->item->object.sha1));
  63                        parents = parents->next;
  64                }
  65        }
  66        if (commit_format == CMIT_FMT_ONELINE)
  67                putchar(' ');
  68        else
  69                putchar('\n');
  70
  71        if (verbose_header) {
  72                static char pretty_header[16384];
  73                pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
  74                printf("%s%c", pretty_header, hdr_termination);
  75        }
  76        fflush(stdout);
  77}
  78
  79static int filter_commit(struct commit * commit)
  80{
  81        if (stop_traversal && (commit->object.flags & BOUNDARY))
  82                return STOP;
  83        if (commit->object.flags & (UNINTERESTING|SHOWN))
  84                return CONTINUE;
  85        if (min_age != -1 && (commit->date > min_age))
  86                return CONTINUE;
  87        if (max_age != -1 && (commit->date < max_age)) {
  88                stop_traversal=1;
  89                return merge_order?CONTINUE:STOP;
  90        }
  91        if (max_count != -1 && !max_count--)
  92                return STOP;
  93        if (no_merges && (commit->parents && commit->parents->next))
  94                return CONTINUE;
  95        return DO;
  96}
  97
  98static int process_commit(struct commit * commit)
  99{
 100        int action=filter_commit(commit);
 101
 102        if (action == STOP) {
 103                return STOP;
 104        }
 105
 106        if (action == CONTINUE) {
 107                return CONTINUE;
 108        }
 109
 110        show_commit(commit);
 111
 112        return CONTINUE;
 113}
 114
 115static struct object_list **add_object(struct object *obj, struct object_list **p, const char *name)
 116{
 117        struct object_list *entry = xmalloc(sizeof(*entry));
 118        entry->item = obj;
 119        entry->next = *p;
 120        entry->name = name;
 121        *p = entry;
 122        return &entry->next;
 123}
 124
 125static struct object_list **process_blob(struct blob *blob, struct object_list **p, const char *name)
 126{
 127        struct object *obj = &blob->object;
 128
 129        if (!blob_objects)
 130                return p;
 131        if (obj->flags & (UNINTERESTING | SEEN))
 132                return p;
 133        obj->flags |= SEEN;
 134        return add_object(obj, p, name);
 135}
 136
 137static struct object_list **process_tree(struct tree *tree, struct object_list **p, const char *name)
 138{
 139        struct object *obj = &tree->object;
 140        struct tree_entry_list *entry;
 141
 142        if (!tree_objects)
 143                return p;
 144        if (obj->flags & (UNINTERESTING | SEEN))
 145                return p;
 146        if (parse_tree(tree) < 0)
 147                die("bad tree object %s", sha1_to_hex(obj->sha1));
 148        obj->flags |= SEEN;
 149        p = add_object(obj, p, name);
 150        entry = tree->entries;
 151        tree->entries = NULL;
 152        while (entry) {
 153                struct tree_entry_list *next = entry->next;
 154                if (entry->directory)
 155                        p = process_tree(entry->item.tree, p, entry->name);
 156                else
 157                        p = process_blob(entry->item.blob, p, entry->name);
 158                free(entry);
 159                entry = next;
 160        }
 161        return p;
 162}
 163
 164static struct object_list *pending_objects = NULL;
 165
 166static void show_commit_list(struct commit_list *list)
 167{
 168        struct object_list *objects = NULL, **p = &objects, *pending;
 169        while (list) {
 170                struct commit *commit = pop_most_recent_commit(&list, SEEN);
 171
 172                p = process_tree(commit->tree, p, "");
 173                if (process_commit(commit) == STOP)
 174                        break;
 175        }
 176        for (pending = pending_objects; pending; pending = pending->next) {
 177                struct object *obj = pending->item;
 178                const char *name = pending->name;
 179                if (obj->flags & (UNINTERESTING | SEEN))
 180                        continue;
 181                if (obj->type == tag_type) {
 182                        obj->flags |= SEEN;
 183                        p = add_object(obj, p, name);
 184                        continue;
 185                }
 186                if (obj->type == tree_type) {
 187                        p = process_tree((struct tree *)obj, p, name);
 188                        continue;
 189                }
 190                if (obj->type == blob_type) {
 191                        p = process_blob((struct blob *)obj, p, name);
 192                        continue;
 193                }
 194                die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
 195        }
 196        while (objects) {
 197                printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
 198                objects = objects->next;
 199        }
 200}
 201
 202static void mark_blob_uninteresting(struct blob *blob)
 203{
 204        if (!blob_objects)
 205                return;
 206        if (blob->object.flags & UNINTERESTING)
 207                return;
 208        blob->object.flags |= UNINTERESTING;
 209}
 210
 211static void mark_tree_uninteresting(struct tree *tree)
 212{
 213        struct object *obj = &tree->object;
 214        struct tree_entry_list *entry;
 215
 216        if (!tree_objects)
 217                return;
 218        if (obj->flags & UNINTERESTING)
 219                return;
 220        obj->flags |= UNINTERESTING;
 221        if (!has_sha1_file(obj->sha1))
 222                return;
 223        if (parse_tree(tree) < 0)
 224                die("bad tree %s", sha1_to_hex(obj->sha1));
 225        entry = tree->entries;
 226        tree->entries = NULL;
 227        while (entry) {
 228                struct tree_entry_list *next = entry->next;
 229                if (entry->directory)
 230                        mark_tree_uninteresting(entry->item.tree);
 231                else
 232                        mark_blob_uninteresting(entry->item.blob);
 233                free(entry);
 234                entry = next;
 235        }
 236}
 237
 238static void mark_parents_uninteresting(struct commit *commit)
 239{
 240        struct commit_list *parents = commit->parents;
 241
 242        while (parents) {
 243                struct commit *commit = parents->item;
 244                commit->object.flags |= UNINTERESTING;
 245
 246                /*
 247                 * Normally we haven't parsed the parent
 248                 * yet, so we won't have a parent of a parent
 249                 * here. However, it may turn out that we've
 250                 * reached this commit some other way (where it
 251                 * wasn't uninteresting), in which case we need
 252                 * to mark its parents recursively too..
 253                 */
 254                if (commit->parents)
 255                        mark_parents_uninteresting(commit);
 256
 257                /*
 258                 * A missing commit is ok iff its parent is marked 
 259                 * uninteresting.
 260                 *
 261                 * We just mark such a thing parsed, so that when
 262                 * it is popped next time around, we won't be trying
 263                 * to parse it and get an error.
 264                 */
 265                if (!has_sha1_file(commit->object.sha1))
 266                        commit->object.parsed = 1;
 267                parents = parents->next;
 268        }
 269}
 270
 271static int everybody_uninteresting(struct commit_list *orig)
 272{
 273        struct commit_list *list = orig;
 274        while (list) {
 275                struct commit *commit = list->item;
 276                list = list->next;
 277                if (commit->object.flags & UNINTERESTING)
 278                        continue;
 279                return 0;
 280        }
 281        return 1;
 282}
 283
 284/*
 285 * This is a truly stupid algorithm, but it's only
 286 * used for bisection, and we just don't care enough.
 287 *
 288 * We care just barely enough to avoid recursing for
 289 * non-merge entries.
 290 */
 291static int count_distance(struct commit_list *entry)
 292{
 293        int nr = 0;
 294
 295        while (entry) {
 296                struct commit *commit = entry->item;
 297                struct commit_list *p;
 298
 299                if (commit->object.flags & (UNINTERESTING | COUNTED))
 300                        break;
 301                nr++;
 302                commit->object.flags |= COUNTED;
 303                p = commit->parents;
 304                entry = p;
 305                if (p) {
 306                        p = p->next;
 307                        while (p) {
 308                                nr += count_distance(p);
 309                                p = p->next;
 310                        }
 311                }
 312        }
 313        return nr;
 314}
 315
 316static void clear_distance(struct commit_list *list)
 317{
 318        while (list) {
 319                struct commit *commit = list->item;
 320                commit->object.flags &= ~COUNTED;
 321                list = list->next;
 322        }
 323}
 324
 325static struct commit_list *find_bisection(struct commit_list *list)
 326{
 327        int nr, closest;
 328        struct commit_list *p, *best;
 329
 330        nr = 0;
 331        p = list;
 332        while (p) {
 333                nr++;
 334                p = p->next;
 335        }
 336        closest = 0;
 337        best = list;
 338
 339        p = list;
 340        while (p) {
 341                int distance = count_distance(p);
 342                clear_distance(list);
 343                if (nr - distance < distance)
 344                        distance = nr - distance;
 345                if (distance > closest) {
 346                        best = p;
 347                        closest = distance;
 348                }
 349                p = p->next;
 350        }
 351        if (best)
 352                best->next = NULL;
 353        return best;
 354}
 355
 356static void mark_edges_uninteresting(struct commit_list *list)
 357{
 358        for ( ; list; list = list->next) {
 359                struct commit_list *parents = list->item->parents;
 360
 361                for ( ; parents; parents = parents->next) {
 362                        struct commit *commit = parents->item;
 363                        if (commit->object.flags & UNINTERESTING)
 364                                mark_tree_uninteresting(commit->tree);
 365                }
 366        }
 367}
 368
 369static struct commit_list *limit_list(struct commit_list *list)
 370{
 371        struct commit_list *newlist = NULL;
 372        struct commit_list **p = &newlist;
 373        while (list) {
 374                struct commit *commit = pop_most_recent_commit(&list, SEEN);
 375                struct object *obj = &commit->object;
 376
 377                if (unpacked && has_sha1_pack(obj->sha1))
 378                        obj->flags |= UNINTERESTING;
 379                if (obj->flags & UNINTERESTING) {
 380                        mark_parents_uninteresting(commit);
 381                        if (everybody_uninteresting(list))
 382                                break;
 383                        continue;
 384                }
 385                p = &commit_list_insert(commit, p)->next;
 386        }
 387        if (tree_objects)
 388                mark_edges_uninteresting(newlist);
 389        if (bisect_list)
 390                newlist = find_bisection(newlist);
 391        return newlist;
 392}
 393
 394static void add_pending_object(struct object *obj, const char *name)
 395{
 396        add_object(obj, &pending_objects, name);
 397}
 398
 399static struct commit *get_commit_reference(const char *name, unsigned int flags)
 400{
 401        unsigned char sha1[20];
 402        struct object *object;
 403
 404        if (get_sha1(name, sha1))
 405                usage(rev_list_usage);
 406        object = parse_object(sha1);
 407        if (!object)
 408                die("bad object %s", name);
 409
 410        /*
 411         * Tag object? Look what it points to..
 412         */
 413        while (object->type == tag_type) {
 414                struct tag *tag = (struct tag *) object;
 415                object->flags |= flags;
 416                if (tag_objects && !(object->flags & UNINTERESTING))
 417                        add_pending_object(object, tag->tag);
 418                object = parse_object(tag->tagged->sha1);
 419                if (!object)
 420                        die("bad object %s", sha1_to_hex(tag->tagged->sha1));
 421        }
 422
 423        /*
 424         * Commit object? Just return it, we'll do all the complex
 425         * reachability crud.
 426         */
 427        if (object->type == commit_type) {
 428                struct commit *commit = (struct commit *)object;
 429                object->flags |= flags;
 430                if (parse_commit(commit) < 0)
 431                        die("unable to parse commit %s", name);
 432                if (flags & UNINTERESTING)
 433                        mark_parents_uninteresting(commit);
 434                return commit;
 435        }
 436
 437        /*
 438         * Tree object? Either mark it uniniteresting, or add it
 439         * to the list of objects to look at later..
 440         */
 441        if (object->type == tree_type) {
 442                struct tree *tree = (struct tree *)object;
 443                if (!tree_objects)
 444                        return NULL;
 445                if (flags & UNINTERESTING) {
 446                        mark_tree_uninteresting(tree);
 447                        return NULL;
 448                }
 449                add_pending_object(object, "");
 450                return NULL;
 451        }
 452
 453        /*
 454         * Blob object? You know the drill by now..
 455         */
 456        if (object->type == blob_type) {
 457                struct blob *blob = (struct blob *)object;
 458                if (!blob_objects)
 459                        return NULL;
 460                if (flags & UNINTERESTING) {
 461                        mark_blob_uninteresting(blob);
 462                        return NULL;
 463                }
 464                add_pending_object(object, "");
 465                return NULL;
 466        }
 467        die("%s is unknown object", name);
 468}
 469
 470static void handle_one_commit(struct commit *com, struct commit_list **lst)
 471{
 472        if (!com || com->object.flags & SEEN)
 473                return;
 474        com->object.flags |= SEEN;
 475        commit_list_insert(com, lst);
 476}
 477
 478
 479int main(int argc, char **argv)
 480{
 481        struct commit_list *list = NULL;
 482        int i, limited = 0;
 483
 484        setup_git_directory();
 485        for (i = 1 ; i < argc; i++) {
 486                int flags;
 487                char *arg = argv[i];
 488                char *dotdot;
 489                struct commit *commit;
 490
 491                if (!strncmp(arg, "--max-count=", 12)) {
 492                        max_count = atoi(arg + 12);
 493                        continue;
 494                }
 495                if (!strncmp(arg, "--max-age=", 10)) {
 496                        max_age = atoi(arg + 10);
 497                        continue;
 498                }
 499                if (!strncmp(arg, "--min-age=", 10)) {
 500                        min_age = atoi(arg + 10);
 501                        continue;
 502                }
 503                if (!strcmp(arg, "--header")) {
 504                        verbose_header = 1;
 505                        continue;
 506                }
 507                if (!strncmp(arg, "--pretty", 8)) {
 508                        commit_format = get_commit_format(arg+8);
 509                        verbose_header = 1;
 510                        hdr_termination = '\n';
 511                        if (commit_format == CMIT_FMT_ONELINE)
 512                                commit_prefix = "";
 513                        else
 514                                commit_prefix = "commit ";
 515                        continue;
 516                }
 517                if (!strncmp(arg, "--no-merges", 11)) {
 518                        no_merges = 1;
 519                        continue;
 520                }
 521                if (!strcmp(arg, "--parents")) {
 522                        show_parents = 1;
 523                        continue;
 524                }
 525                if (!strcmp(arg, "--bisect")) {
 526                        bisect_list = 1;
 527                        continue;
 528                }
 529                if (!strcmp(arg, "--objects")) {
 530                        tag_objects = 1;
 531                        tree_objects = 1;
 532                        blob_objects = 1;
 533                        continue;
 534                }
 535                if (!strcmp(arg, "--unpacked")) {
 536                        unpacked = 1;
 537                        limited = 1;
 538                        continue;
 539                }
 540                if (!strcmp(arg, "--merge-order")) {
 541                        merge_order = 1;
 542                        continue;
 543                }
 544                if (!strcmp(arg, "--show-breaks")) {
 545                        show_breaks = 1;
 546                        continue;
 547                }
 548                if (!strcmp(arg, "--topo-order")) {
 549                        topo_order = 1;
 550                        limited = 1;
 551                        continue;
 552                }
 553
 554                if (show_breaks && !merge_order)
 555                        usage(rev_list_usage);
 556
 557                flags = 0;
 558                dotdot = strstr(arg, "..");
 559                if (dotdot) {
 560                        char *next = dotdot + 2;
 561                        struct commit *exclude = NULL;
 562                        struct commit *include = NULL;
 563                        *dotdot = 0;
 564                        if (!*next)
 565                                next = "HEAD";
 566                        exclude = get_commit_reference(arg, UNINTERESTING);
 567                        include = get_commit_reference(next, 0);
 568                        if (exclude && include) {
 569                                limited = 1;
 570                                handle_one_commit(exclude, &list);
 571                                handle_one_commit(include, &list);
 572                                continue;
 573                        }
 574                        *dotdot = '.';
 575                }
 576                if (*arg == '^') {
 577                        flags = UNINTERESTING;
 578                        arg++;
 579                        limited = 1;
 580                }
 581                commit = get_commit_reference(arg, flags);
 582                handle_one_commit(commit, &list);
 583        }
 584
 585        save_commit_buffer = verbose_header;
 586        track_object_refs = 0;
 587
 588        if (!merge_order) {             
 589                sort_by_date(&list);
 590                if (limited)
 591                        list = limit_list(list);
 592                if (topo_order)
 593                        sort_in_topological_order(&list);
 594                show_commit_list(list);
 595        } else {
 596#ifndef NO_OPENSSL
 597                if (sort_list_in_merge_order(list, &process_commit)) {
 598                        die("merge order sort failed\n");
 599                }
 600#else
 601                die("merge order sort unsupported, OpenSSL not linked");
 602#endif
 603        }
 604
 605        return 0;
 606}