undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-lib: Make it easy to do rename tracking (take 2)

Browse Source 
prune_fn in the rev_info structure is called in place of
try_to_simplify_commit. This makes it possible to do rename tracking
with a custom try_to_simplify_commit-like function.

This commit also introduces init_revisions which initialises the rev_info
structure with default values.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2006-03-10 10:21:39 +01:00 committed by Junio C Hamano
parent 6b6dcfc297
commit 8efdc326c9
3 changed files with 75 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rev-list.c
View File

@ -190,7 +190,7 @@ static int count_distance(struct commit_list *entry)
if (commit->object.flags & (UNINTERESTING | COUNTED)) if (commit->object.flags & (UNINTERESTING | COUNTED))
break; break;
if (!revs.paths || (commit->object.flags & TREECHANGE)) if (!revs.prune_fn || (commit->object.flags & TREECHANGE))
nr++; nr++;
commit->object.flags |= COUNTED; commit->object.flags |= COUNTED;
p = commit->parents; p = commit->parents;
@ -224,7 +224,7 @@ static struct commit_list *find_bisection(struct commit_list *list)
nr = 0; nr = 0;
p = list; p = list;
while (p) { while (p) {
if (!revs.paths || (p->item->object.flags & TREECHANGE)) if (!revs.prune_fn || (p->item->object.flags & TREECHANGE))
nr++; nr++;
p = p->next; p = p->next;
} }
@ -234,7 +234,7 @@ static struct commit_list *find_bisection(struct commit_list *list)
for (p = list; p; p = p->next) { for (p = list; p; p = p->next) {
int distance; int distance;
if (revs.paths && !(p->item->object.flags & TREECHANGE)) if (revs.prune_fn && !(p->item->object.flags & TREECHANGE))
continue; continue;
distance = count_distance(p); distance = count_distance(p);

98
revision.c
View File

@ -199,31 +199,27 @@ static int everybody_uninteresting(struct commit_list *orig)
return 1; return 1;
} }
#define TREE_SAME 0 static int tree_difference = REV_TREE_SAME;
#define TREE_NEW 1
#define TREE_DIFFERENT 2
static int tree_difference = TREE_SAME;
static void file_add_remove(struct diff_options *options, static void file_add_remove(struct diff_options *options,
int addremove, unsigned mode, int addremove, unsigned mode,
const unsigned char *sha1, const unsigned char *sha1,
const char *base, const char *path) const char *base, const char *path)
{ {
int diff = TREE_DIFFERENT; int diff = REV_TREE_DIFFERENT;
/* /*
* Is it an add of a new file? It means that * Is it an add of a new file? It means that the old tree
* the old tree didn't have it at all, so we * didn't have it at all, so we will turn "REV_TREE_SAME" ->
* will turn "TREE_SAME" -> "TREE_NEW", but * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
* leave any "TREE_DIFFERENT" alone (and if * (and if it already was "REV_TREE_NEW", we'll keep it
* it already was "TREE_NEW", we'll keep it * "REV_TREE_NEW" of course).
* "TREE_NEW" of course).
*/ */
if (addremove == '+') { if (addremove == '+') {
diff = tree_difference; diff = tree_difference;
if (diff != TREE_SAME) if (diff != REV_TREE_SAME)
return; return;
diff = TREE_NEW; diff = REV_TREE_NEW;
} }
tree_difference = diff; tree_difference = diff;
} }
@ -234,7 +230,7 @@ static void file_change(struct diff_options *options,
const unsigned char *new_sha1, const unsigned char *new_sha1,
const char *base, const char *path) const char *base, const char *path)
{ {
tree_difference = TREE_DIFFERENT; tree_difference = REV_TREE_DIFFERENT;
} }
static struct diff_options diff_opt = { static struct diff_options diff_opt = {
@ -243,19 +239,19 @@ static struct diff_options diff_opt = {
.change = file_change, .change = file_change,
}; };
static int compare_tree(struct tree *t1, struct tree *t2) int rev_compare_tree(struct tree *t1, struct tree *t2)
{ {
if (!t1) if (!t1)
return TREE_NEW; return REV_TREE_NEW;
if (!t2) if (!t2)
return TREE_DIFFERENT; return REV_TREE_DIFFERENT;
tree_difference = TREE_SAME; tree_difference = REV_TREE_SAME;
if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", &diff_opt) < 0) if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "", &diff_opt) < 0)
return TREE_DIFFERENT; return REV_TREE_DIFFERENT;
return tree_difference; return tree_difference;
} }
static int same_tree_as_empty(struct tree *t1) int rev_same_tree_as_empty(struct tree *t1)
{ {
int retval; int retval;
void *tree; void *tree;
@ -288,7 +284,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
return; return;
if (!commit->parents) { if (!commit->parents) {
if (!same_tree_as_empty(commit->tree)) if (!rev_same_tree_as_empty(commit->tree))
commit->object.flags |= TREECHANGE; commit->object.flags |= TREECHANGE;
return; return;
} }
@ -298,8 +294,8 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
struct commit *p = parent->item; struct commit *p = parent->item;
parse_commit(p); parse_commit(p);
switch (compare_tree(p->tree, commit->tree)) { switch (rev_compare_tree(p->tree, commit->tree)) {
case TREE_SAME: case REV_TREE_SAME:
if (p->object.flags & UNINTERESTING) { if (p->object.flags & UNINTERESTING) {
/* Even if a merge with an uninteresting /* Even if a merge with an uninteresting
* side branch brought the entire change * side branch brought the entire change
@ -314,13 +310,14 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
commit->parents = parent; commit->parents = parent;
return; return;
case TREE_NEW: case REV_TREE_NEW:
if (revs->remove_empty_trees && same_tree_as_empty(p->tree)) { if (revs->remove_empty_trees &&
rev_same_tree_as_empty(p->tree)) {
*pp = parent->next; *pp = parent->next;
continue; continue;
} }
/* fallthrough */ /* fallthrough */
case TREE_DIFFERENT: case REV_TREE_DIFFERENT:
tree_changed = 1; tree_changed = 1;
pp = &parent->next; pp = &parent->next;
continue; continue;
@ -368,8 +365,8 @@ static void add_parents_to_list(struct rev_info *revs, struct commit *commit, st
* simplify the commit history and find the parent * simplify the commit history and find the parent
* that has no differences in the path set if one exists. * that has no differences in the path set if one exists.
*/ */
if (revs->paths) if (revs->prune_fn)
try_to_simplify_commit(revs, commit); revs->prune_fn(revs, commit);
parent = commit->parents; parent = commit->parents;
while (parent) { while (parent) {
@ -391,9 +388,6 @@ static void limit_list(struct rev_info *revs)
struct commit_list *newlist = NULL; struct commit_list *newlist = NULL;
struct commit_list **p = &newlist; struct commit_list **p = &newlist;
if (revs->paths)
diff_tree_setup_paths(revs->paths);
while (list) { while (list) {
struct commit_list *entry = list; struct commit_list *entry = list;
struct commit *commit = list->item; struct commit *commit = list->item;
@ -445,6 +439,23 @@ static void handle_all(struct rev_info *revs, unsigned flags)
for_each_ref(handle_one_ref); for_each_ref(handle_one_ref);
} }
void init_revisions(struct rev_info *revs)
{
memset(revs, 0, sizeof(*revs));
revs->lifo = 1;
revs->dense = 1;
revs->prefix = setup_git_directory();
revs->max_age = -1;
revs->min_age = -1;
revs->max_count = -1;
revs->prune_fn = NULL;
revs->prune_data = NULL;
revs->topo_setter = topo_sort_default_setter;
revs->topo_getter = topo_sort_default_getter;
}
/* /*
* Parse revision information, filling in the "rev_info" structure, * Parse revision information, filling in the "rev_info" structure,
* and removing the used arguments from the argument list. * and removing the used arguments from the argument list.
@ -458,13 +469,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
const char **unrecognized = argv + 1; const char **unrecognized = argv + 1;
int left = 1; int left = 1;
memset(revs, 0, sizeof(*revs)); init_revisions(revs);
revs->lifo = 1;
revs->dense = 1;
revs->prefix = setup_git_directory();
revs->max_age = -1;
revs->min_age = -1;
revs->max_count = -1;
/* First, search for "--" */ /* First, search for "--" */
seen_dashdash = 0; seen_dashdash = 0;
@ -474,7 +479,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
continue; continue;
argv[i] = NULL; argv[i] = NULL;
argc = i; argc = i;
revs->paths = get_pathspec(revs->prefix, argv + i + 1); revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
seen_dashdash = 1; seen_dashdash = 1;
break; break;
} }
@ -638,7 +643,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (lstat(argv[j], &st) < 0) if (lstat(argv[j], &st) < 0)
die("'%s': %s", arg, strerror(errno)); die("'%s': %s", arg, strerror(errno));
} }
revs->paths = get_pathspec(revs->prefix, argv + i); revs->prune_data = get_pathspec(revs->prefix, argv + i);
break; break;
} }
commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags); commit = get_commit_reference(revs, arg, sha1, flags ^ local_flags);
@ -652,8 +657,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
commit = get_commit_reference(revs, def, sha1, 0); commit = get_commit_reference(revs, def, sha1, 0);
add_one_commit(commit, revs); add_one_commit(commit, revs);
} }
if (revs->paths)
if (revs->prune_data) {
diff_tree_setup_paths(revs->prune_data);
revs->prune_fn = try_to_simplify_commit;
revs->limited = 1; revs->limited = 1;
}
return left; return left;
} }
@ -663,7 +673,9 @@ void prepare_revision_walk(struct rev_info *revs)
if (revs->limited) if (revs->limited)
limit_list(revs); limit_list(revs);
if (revs->topo_order) if (revs->topo_order)
sort_in_topological_order(&revs->commits, revs->lifo); sort_in_topological_order_fn(&revs->commits, revs->lifo,
revs->topo_setter,
revs->topo_getter);
} }
static int rewrite_one(struct commit **pp) static int rewrite_one(struct commit **pp)
@ -719,7 +731,7 @@ struct commit *get_revision(struct rev_info *revs)
return NULL; return NULL;
if (revs->no_merges && commit->parents && commit->parents->next) if (revs->no_merges && commit->parents && commit->parents->next)
goto next; goto next;
if (revs->paths && revs->dense) { if (revs->prune_fn && revs->dense) {
if (!(commit->object.flags & TREECHANGE)) if (!(commit->object.flags & TREECHANGE))
goto next; goto next;
rewrite_parents(commit); rewrite_parents(commit);

18
revision.h
View File

@ -7,6 +7,10 @@
#define SHOWN (1u<<3) #define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */ #define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
struct rev_info;
typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
struct rev_info { struct rev_info {
/* Starting list */ /* Starting list */
struct commit_list *commits; struct commit_list *commits;
@ -14,7 +18,8 @@ struct rev_info {
/* Basic information */ /* Basic information */
const char *prefix; const char *prefix;
const char **paths; void *prune_data;
prune_fn_t *prune_fn;
/* Traversal flags */ /* Traversal flags */
unsigned int dense:1, unsigned int dense:1,
@ -33,9 +38,20 @@ struct rev_info {
int max_count; int max_count;
unsigned long max_age; unsigned long max_age;
unsigned long min_age; unsigned long min_age;
topo_sort_set_fn_t topo_setter;
topo_sort_get_fn_t topo_getter;
}; };
#define REV_TREE_SAME 0
#define REV_TREE_NEW 1
#define REV_TREE_DIFFERENT 2
/* revision.c */ /* revision.c */
extern int rev_same_tree_as_empty(struct tree *t1);
extern int rev_compare_tree(struct tree *t1, struct tree *t2);
extern void init_revisions(struct rev_info *revs);
extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def); extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
extern void prepare_revision_walk(struct rev_info *revs); extern void prepare_revision_walk(struct rev_info *revs);
extern struct commit *get_revision(struct rev_info *revs); extern struct commit *get_revision(struct rev_info *revs);