Skip to content

Commit

Permalink
Fix parent rewriting in --early-output
Browse files Browse the repository at this point in the history 
We cannot tell a node that has been checked and found not to be
interesting (which does not have the TREECHANGE flag) from a
node that hasn't been checked if it is interesting or not,
without relying on something else, such as object->parsed.

But an object can get the "parsed" flag for other reasons.
Which means that "TREECHANGE" has the wrong polarity.

This changes the way how the path pruning logic marks an
uninteresting commits.  From now on, we consider a commit
interesting by default, and explicitly mark the ones we decided
to prune.  The flag is renamed to "TREESAME".

Then, this fixes the logic to show the early output with
incomplete pruning.  It basically says "a commit that has
TREESAME set is kind-of-UNINTERESTING", but obviously in a
different way than an outright UNINTERESTING commit.  Until we
parse and examine enough parents to determine if a commit
becomes surely "kind-of-UNINTERESTING", we avoid rewriting
the ancestry so that later rounds can fix things up.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Linus Torvalds authored and Junio C Hamano committed Nov 14, 2007
1 parent 53b2c82 commit 7dc0fe3
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion builtin-fmt-merge-msg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static void shortlog(const char *name, unsigned char *sha1,
struct commit *commit;
struct object *branch;
struct list subjects = { NULL, NULL, 0, 0 };
int flags = UNINTERESTING | TREECHANGE | SEEN | SHOWN | ADDED;
int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;

branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40);
if (!branch || branch->type != OBJ_COMMIT)
Expand Down
2 changes: 1 addition & 1 deletion builtin-log.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
struct commit *commit = list->item;
unsigned int flags = commit->object.flags;
list = list->next;
if ((flags & TREECHANGE) && !(flags & UNINTERESTING))
if (!(flags & (TREESAME | UNINTERESTING)))
n++;
}
return n;
Expand Down
16 changes: 8 additions & 8 deletions builtin-rev-list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static int count_distance(struct commit_list *entry)

if (commit->object.flags & (UNINTERESTING | COUNTED))
break;
if (commit->object.flags & TREECHANGE)
if (!(commit->object.flags & TREESAME))
nr++;
commit->object.flags |= COUNTED;
p = commit->parents;
Expand Down Expand Up @@ -198,7 +198,7 @@ static inline int halfway(struct commit_list *p, int nr)
/*
* Don't short-cut something we are not going to return!
*/
if (!(p->item->object.flags & TREECHANGE))
if (p->item->object.flags & TREESAME)
return 0;
if (DEBUG_BISECT)
return 0;
Expand Down Expand Up @@ -234,7 +234,7 @@ static void show_list(const char *debug, int counted, int nr,
char *ep, *sp;

fprintf(stderr, "%c%c%c ",
(flags & TREECHANGE) ? 'T' : ' ',
(flags & TREESAME) ? ' ' : 'T',
(flags & UNINTERESTING) ? 'U' : ' ',
(flags & COUNTED) ? 'C' : ' ');
if (commit->util)
Expand Down Expand Up @@ -268,7 +268,7 @@ static struct commit_list *best_bisection(struct commit_list *list, int nr)
int distance;
unsigned flags = p->item->object.flags;

if (!(flags & TREECHANGE))
if (flags & TREESAME)
continue;
distance = weight(p);
if (nr - distance < distance)
Expand Down Expand Up @@ -308,7 +308,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
int distance;
unsigned flags = p->item->object.flags;

if (!(flags & TREECHANGE))
if (flags & TREESAME)
continue;
distance = weight(p);
if (nr - distance < distance)
Expand Down Expand Up @@ -362,7 +362,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
p->item->util = &weights[n++];
switch (count_interesting_parents(commit)) {
case 0:
if (flags & TREECHANGE) {
if (!(flags & TREESAME)) {
weight_set(p, 1);
counted++;
show_list("bisection 2 count one",
Expand Down Expand Up @@ -435,7 +435,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
* add one for p itself if p is to be counted,
* otherwise inherit it from q directly.
*/
if (flags & TREECHANGE) {
if (!(flags & TREESAME)) {
weight_set(p, weight(q)+1);
counted++;
show_list("bisection 2 count one",
Expand Down Expand Up @@ -482,7 +482,7 @@ static struct commit_list *find_bisection(struct commit_list *list,
continue;
p->next = last;
last = p;
if (flags & TREECHANGE)
if (!(flags & TREESAME))
nr++;
on_list++;
}
Expand Down
22 changes: 11 additions & 11 deletions revision.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,28 +311,24 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
/*
* If we don't do pruning, everything is interesting
*/
if (!revs->prune) {
commit->object.flags |= TREECHANGE;
if (!revs->prune)
return;
}

if (!commit->tree)
return;

if (!commit->parents) {
if (!rev_same_tree_as_empty(revs, commit->tree))
commit->object.flags |= TREECHANGE;
if (rev_same_tree_as_empty(revs, commit->tree))
commit->object.flags |= TREESAME;
return;
}

/*
* Normal non-merge commit? If we don't want to make the
* history dense, we consider it always to be a change..
*/
if (!revs->dense && !commit->parents->next) {
commit->object.flags |= TREECHANGE;
if (!revs->dense && !commit->parents->next)
return;
}

pp = &commit->parents;
while ((parent = *pp) != NULL) {
Expand All @@ -357,6 +353,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
}
parent->next = NULL;
commit->parents = parent;
commit->object.flags |= TREESAME;
return;

case REV_TREE_NEW:
Expand Down Expand Up @@ -385,7 +382,8 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
}
if (tree_changed && !tree_same)
commit->object.flags |= TREECHANGE;
return;
commit->object.flags |= TREESAME;
}

static int add_parents_to_list(struct rev_info *revs, struct commit *commit, struct commit_list **list)
Expand Down Expand Up @@ -1354,7 +1352,9 @@ static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp
return rewrite_one_error;
if (p->parents && p->parents->next)
return rewrite_one_ok;
if (p->object.flags & (TREECHANGE | UNINTERESTING))
if (p->object.flags & UNINTERESTING)
return rewrite_one_ok;
if (!(p->object.flags & TREESAME))
return rewrite_one_ok;
if (!p->parents)
return rewrite_one_noparents;
Expand Down Expand Up @@ -1427,7 +1427,7 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
return commit_ignore;
if (revs->prune && revs->dense) {
/* Commit without changes? */
if (!(commit->object.flags & TREECHANGE)) {
if (commit->object.flags & TREESAME) {
/* drop merges unless we want parenthood */
if (!revs->parents)
return commit_ignore;
Expand Down
2 changes: 1 addition & 1 deletion revision.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define SEEN (1u<<0)
#define UNINTERESTING (1u<<1)
#define TREECHANGE (1u<<2)
#define TREESAME (1u<<2)
#define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
#define BOUNDARY (1u<<5)
Expand Down

0 comments on commit 7dc0fe3

Please sign in to comment.