116
add_object(obj, &revs->pending_objects, NULL, name);
117
}
118
119
-static struct commit *get_commit_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
119
+static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
120
{
121
struct object *object;
122
123
object = parse_object(sha1);
124
if (!object)
125
die("bad object %s", name);
126
+ object->flags |= flags;
127
+ return object;
128
+}
129
+
130
+static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
131
+{
132
+ unsigned long flags = object->flags;
133
134
/*
135
* Tag object? Look what it points to..
136
*/
137
while (object->type == tag_type) {
138
struct tag *tag = (struct tag *) object;
132
- object->flags |= flags;
133
- if (revs->tag_objects && !(object->flags & UNINTERESTING))
139
+ if (revs->tag_objects && !(flags & UNINTERESTING))
140
add_pending_object(revs, object, tag->tag);
141
object = parse_object(tag->tagged->sha1);
142
if (!object)
149
*/
150
if (object->type == commit_type) {
151
struct commit *commit = (struct commit *)object;
146
- object->flags |= flags;
152
if (parse_commit(commit) < 0)
153
die("unable to parse commit %s", name);
154
if (flags & UNINTERESTING) {
246
return REV_TREE_DIFFERENT;
247
tree_difference = REV_TREE_SAME;
248
if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
244
- &revs->diffopt) < 0)
249
+ &revs->pruning) < 0)
250
return REV_TREE_DIFFERENT;
251
return tree_difference;
252
}
269
empty.size = 0;
270
271
tree_difference = 0;
267
- retval = diff_tree(&empty, &real, "", &revs->diffopt);
272
+ retval = diff_tree(&empty, &real, "", &revs->pruning);
273
free(tree);
274
275
return retval >= 0 && !tree_difference;
456
revs->commits = newlist;
457
}
458
454
-static void add_one_commit(struct commit *commit, struct rev_info *revs)
455
-{
456
- if (!commit || (commit->object.flags & SEEN))
457
- return;
458
- commit->object.flags |= SEEN;
459
- commit_list_insert(commit, &revs->commits);
460
-}
461
-
459
static int all_flags;
460
static struct rev_info *all_revs;
461
462
static int handle_one_ref(const char *path, const unsigned char *sha1)
463
{
467
- struct commit *commit = get_commit_reference(all_revs, path, sha1, all_flags);
468
- add_one_commit(commit, all_revs);
464
+ struct object *object = get_reference(all_revs, path, sha1, all_flags);
465
+ add_pending_object(all_revs, object, "");
466
return 0;
467
}
468
476
void init_revisions(struct rev_info *revs)
477
{
478
memset(revs, 0, sizeof(*revs));
482
- revs->diffopt.recursive = 1;
483
- revs->diffopt.add_remove = file_add_remove;
484
- revs->diffopt.change = file_change;
479
+ revs->pruning.recursive = 1;
480
+ revs->pruning.add_remove = file_add_remove;
481
+ revs->pruning.change = file_change;
482
revs->lifo = 1;
483
revs->dense = 1;
484
revs->prefix = setup_git_directory();
491
492
revs->topo_setter = topo_sort_default_setter;
493
revs->topo_getter = topo_sort_default_getter;
494
+
495
+ revs->header_prefix = "";
496
+ revs->commit_format = CMIT_FMT_DEFAULT;
497
+
498
+ diff_setup(&revs->diffopt);
499
}
500
501
/*
528
529
flags = 0;
530
for (i = 1; i < argc; i++) {
529
- struct commit *commit;
531
+ struct object *object;
532
const char *arg = argv[i];
533
unsigned char sha1[20];
534
char *dotdot;
535
int local_flags;
536
537
if (*arg == '-') {
538
+ int opts;
539
if (!strncmp(arg, "--max-count=", 12)) {
540
revs->max_count = atoi(arg + 12);
541
continue;
643
revs->unpacked = 1;
644
continue;
645
}
646
+ if (!strcmp(arg, "-r")) {
647
+ revs->diff = 1;
648
+ revs->diffopt.recursive = 1;
649
+ continue;
650
+ }
651
+ if (!strcmp(arg, "-t")) {
652
+ revs->diff = 1;
653
+ revs->diffopt.recursive = 1;
654
+ revs->diffopt.tree_in_recursive = 1;
655
+ continue;
656
+ }
657
+ if (!strcmp(arg, "-m")) {
658
+ revs->ignore_merges = 0;
659
+ continue;
660
+ }
661
+ if (!strcmp(arg, "-c")) {
662
+ revs->diff = 1;
663
+ revs->combine_merges = 1;
664
+ continue;
665
+ }
666
+ if (!strcmp(arg, "--cc")) {
667
+ revs->diff = 1;
668
+ revs->dense_combined_merges = 1;
669
+ revs->combine_merges = 1;
670
+ continue;
671
+ }
672
+ if (!strcmp(arg, "-v")) {
673
+ revs->verbose_header = 1;
674
+ revs->header_prefix = "diff-tree ";
675
+ continue;
676
+ }
677
+ if (!strncmp(arg, "--pretty", 8)) {
678
+ revs->verbose_header = 1;
679
+ revs->header_prefix = "diff-tree ";
680
+ revs->commit_format = get_commit_format(arg+8);
681
+ continue;
682
+ }
683
+ if (!strcmp(arg, "--root")) {
684
+ revs->show_root_diff = 1;
685
+ continue;
686
+ }
687
+ if (!strcmp(arg, "--no-commit-id")) {
688
+ revs->no_commit_id = 1;
689
+ continue;
690
+ }
691
+ if (!strcmp(arg, "--always")) {
692
+ revs->always_show_header = 1;
693
+ continue;
694
+ }
695
+ if (!strcmp(arg, "--no-abbrev")) {
696
+ revs->abbrev = 0;
697
+ continue;
698
+ }
699
+ if (!strcmp(arg, "--abbrev")) {
700
+ revs->abbrev = DEFAULT_ABBREV;
701
+ continue;
702
+ }
703
+ if (!strcmp(arg, "--abbrev-commit")) {
704
+ revs->abbrev_commit = 1;
705
+ continue;
706
+ }
707
+ if (!strcmp(arg, "--full-diff")) {
708
+ revs->diff = 1;
709
+ revs->full_diff = 1;
710
+ continue;
711
+ }
712
+ opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
713
+ if (opts > 0) {
714
+ revs->diff = 1;
715
+ i += opts - 1;
716
+ continue;
717
+ }
718
*unrecognized++ = arg;
719
left++;
720
continue;
731
this = "HEAD";
732
if (!get_sha1(this, from_sha1) &&
733
!get_sha1(next, sha1)) {
659
- struct commit *exclude;
660
- struct commit *include;
734
+ struct object *exclude;
735
+ struct object *include;
736
662
- exclude = get_commit_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
663
- include = get_commit_reference(revs, next, sha1, flags);
737
+ exclude = get_reference(revs, this, from_sha1, flags ^ UNINTERESTING);
738
+ include = get_reference(revs, next, sha1, flags);
739
if (!exclude || !include)
740
die("Invalid revision range %s..%s", arg, next);
666
- add_one_commit(exclude, revs);
667
- add_one_commit(include, revs);
741
+ add_pending_object(revs, exclude, this);
742
+ add_pending_object(revs, include, next);
743
continue;
744
}
745
*dotdot = '.';
764
revs->prune_data = get_pathspec(revs->prefix, argv + i);
765
break;
766
}
692
- commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags);
693
- add_one_commit(commit, revs);
767
+ object = get_reference(revs, arg, sha1, flags ^ local_flags);
768
+ add_pending_object(revs, object, arg);
769
}
695
- if (def && !revs->commits) {
770
+ if (def && !revs->pending_objects) {
771
unsigned char sha1[20];
697
- struct commit *commit;
772
+ struct object *object;
773
if (get_sha1(def, sha1) < 0)
774
die("bad default revision '%s'", def);
700
- commit = get_commit_reference(revs, def, sha1, 0);
701
- add_one_commit(commit, revs);
775
+ object = get_reference(revs, def, sha1, 0);
776
+ add_pending_object(revs, object, def);
777
}
778
779
if (revs->topo_order || revs->unpacked)
780
revs->limited = 1;
781
782
if (revs->prune_data) {
708
- diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
783
+ diff_tree_setup_paths(revs->prune_data, &revs->pruning);
784
revs->prune_fn = try_to_simplify_commit;
785
+ if (!revs->full_diff)
786
+ diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
787
}
788
+ if (revs->combine_merges) {
789
+ revs->ignore_merges = 0;
790
+ if (revs->dense_combined_merges)
791
+ revs->diffopt.output_format = DIFF_FORMAT_PATCH;
792
+ }
793
+ if (revs->diffopt.output_format == DIFF_FORMAT_PATCH)
794
+ revs->diffopt.recursive = 1;
795
+ revs->diffopt.abbrev = revs->abbrev;
796
+ diff_setup_done(&revs->diffopt);
797
798
return left;
799
}
800
801
void prepare_revision_walk(struct rev_info *revs)
802
{
717
- sort_by_date(&revs->commits);
803
+ struct object_list *list;
804
+
805
+ list = revs->pending_objects;
806
+ revs->pending_objects = NULL;
807
+ while (list) {
808
+ struct commit *commit = handle_commit(revs, list->item, list->name);
809
+ if (commit) {
810
+ if (!(commit->object.flags & SEEN)) {
811
+ commit->object.flags |= SEEN;
812
+ insert_by_date(commit, &revs->commits);
813
+ }
814
+ }
815
+ list = list->next;
816
+ }
817
+
818
if (revs->limited)
819
limit_list(revs);
820
if (revs->topo_order)