projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move "void *util" from "struct object" into "struct commit"
[git.git]
/
revision.c
diff --git
a/revision.c
b/revision.c
index
2294b16
..
82214eb
100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-53,8
+53,9
@@
static void mark_blob_uninteresting(struct blob *blob)
void mark_tree_uninteresting(struct tree *tree)
{
void mark_tree_uninteresting(struct tree *tree)
{
+ struct tree_desc desc;
+ struct name_entry entry;
struct object *obj = &tree->object;
struct object *obj = &tree->object;
- struct tree_entry_list *entry;
if (obj->flags & UNINTERESTING)
return;
if (obj->flags & UNINTERESTING)
return;
@@
-63,17
+64,22
@@
void mark_tree_uninteresting(struct tree *tree)
return;
if (parse_tree(tree) < 0)
die("bad tree %s", sha1_to_hex(obj->sha1));
return;
if (parse_tree(tree) < 0)
die("bad tree %s", sha1_to_hex(obj->sha1));
- entry = tree->entries;
-
tree->entries = NULL
;
- while (entry) {
- struct tree_entry_list *next = entry->next;
- if (
entry->directory
)
- mark_tree_uninteresting(
entry->item.tree
);
+
+
desc.buf = tree->buffer
;
+ desc.size = tree->size;
+ while (tree_entry(&desc, &entry)) {
+ if (
S_ISDIR(entry.mode)
)
+ mark_tree_uninteresting(
lookup_tree(entry.sha1)
);
else
else
- mark_blob_uninteresting(entry->item.blob);
- free(entry);
- entry = next;
+ mark_blob_uninteresting(lookup_blob(entry.sha1));
}
}
+
+ /*
+ * We don't care about the tree any more
+ * after it has been marked uninteresting.
+ */
+ free(tree->buffer);
+ tree->buffer = NULL;
}
void mark_parents_uninteresting(struct commit *commit)
}
void mark_parents_uninteresting(struct commit *commit)
@@
-134,7
+140,7
@@
static struct commit *handle_commit(struct rev_info *revs, struct object *object
/*
* Tag object? Look what it points to..
*/
/*
* Tag object? Look what it points to..
*/
- while (object->type ==
tag_type
) {
+ while (object->type ==
TYPE_TAG
) {
struct tag *tag = (struct tag *) object;
if (revs->tag_objects && !(flags & UNINTERESTING))
add_pending_object(revs, object, tag->tag);
struct tag *tag = (struct tag *) object;
if (revs->tag_objects && !(flags & UNINTERESTING))
add_pending_object(revs, object, tag->tag);
@@
-147,7
+153,7
@@
static struct commit *handle_commit(struct rev_info *revs, struct object *object
* Commit object? Just return it, we'll do all the complex
* reachability crud.
*/
* Commit object? Just return it, we'll do all the complex
* reachability crud.
*/
- if (object->type ==
commit_type
) {
+ if (object->type ==
TYPE_COMMIT
) {
struct commit *commit = (struct commit *)object;
if (parse_commit(commit) < 0)
die("unable to parse commit %s", name);
struct commit *commit = (struct commit *)object;
if (parse_commit(commit) < 0)
die("unable to parse commit %s", name);
@@
-163,7
+169,7
@@
static struct commit *handle_commit(struct rev_info *revs, struct object *object
* Tree object? Either mark it uniniteresting, or add it
* to the list of objects to look at later..
*/
* Tree object? Either mark it uniniteresting, or add it
* to the list of objects to look at later..
*/
- if (object->type ==
tree_type
) {
+ if (object->type ==
TYPE_TREE
) {
struct tree *tree = (struct tree *)object;
if (!revs->tree_objects)
return NULL;
struct tree *tree = (struct tree *)object;
if (!revs->tree_objects)
return NULL;
@@
-178,7
+184,7
@@
static struct commit *handle_commit(struct rev_info *revs, struct object *object
/*
* Blob object? You know the drill by now..
*/
/*
* Blob object? You know the drill by now..
*/
- if (object->type ==
blob_type
) {
+ if (object->type ==
TYPE_BLOB
) {
struct blob *blob = (struct blob *)object;
if (!revs->blob_objects)
return NULL;
struct blob *blob = (struct blob *)object;
if (!revs->blob_objects)
return NULL;
@@
-297,7
+303,7
@@
static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
parse_commit(p);
switch (rev_compare_tree(revs, p->tree, commit->tree)) {
case REV_TREE_SAME:
parse_commit(p);
switch (rev_compare_tree(revs, p->tree, commit->tree)) {
case REV_TREE_SAME:
- if (
p->object.flags & UNINTERESTING
) {
+ if (
!revs->simplify_history || (p->object.flags & UNINTERESTING)
) {
/* Even if a merge with an uninteresting
* side branch brought the entire change
* we are interested in, we do not want
/* Even if a merge with an uninteresting
* side branch brought the entire change
* we are interested in, we do not want
@@
-492,11
+498,11
@@
static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
return 0;
while (1) {
it = get_reference(revs, arg, sha1, 0);
return 0;
while (1) {
it = get_reference(revs, arg, sha1, 0);
- if (
strcmp(it->type, tag_type)
)
+ if (
it->type != TYPE_TAG
)
break;
memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
}
break;
memcpy(sha1, ((struct tag*)it)->tagged->sha1, 20);
}
- if (
strcmp(it->type, commit_type)
)
+ if (
it->type != TYPE_COMMIT
)
return 0;
commit = (struct commit *)it;
for (parents = commit->parents; parents; parents = parents->next) {
return 0;
commit = (struct commit *)it;
for (parents = commit->parents; parents; parents = parents->next) {
@@
-513,6
+519,7
@@
void init_revisions(struct rev_info *revs)
revs->abbrev = DEFAULT_ABBREV;
revs->ignore_merges = 1;
revs->abbrev = DEFAULT_ABBREV;
revs->ignore_merges = 1;
+ revs->simplify_history = 1;
revs->pruning.recursive = 1;
revs->pruning.add_remove = file_add_remove;
revs->pruning.change = file_change;
revs->pruning.recursive = 1;
revs->pruning.add_remove = file_add_remove;
revs->pruning.change = file_change;
@@
-733,6
+740,14
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->abbrev = DEFAULT_ABBREV;
continue;
}
revs->abbrev = DEFAULT_ABBREV;
continue;
}
+ if (!strncmp(arg, "--abbrev=", 9)) {
+ revs->abbrev = strtoul(arg + 9, NULL, 10);
+ if (revs->abbrev < MINIMUM_ABBREV)
+ revs->abbrev = MINIMUM_ABBREV;
+ else if (revs->abbrev > 40)
+ revs->abbrev = 40;
+ continue;
+ }
if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
continue;
if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
continue;
@@
-742,6
+757,10
@@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->full_diff = 1;
continue;
}
revs->full_diff = 1;
continue;
}
+ if (!strcmp(arg, "--full-history")) {
+ revs->simplify_history = 0;
+ continue;
+ }
opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
if (opts > 0) {
revs->diff = 1;
opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
if (opts > 0) {
revs->diff = 1;