kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge branch 'tf/commit-list-prefix' 

* tf/commit-list-prefix:
  commit: Add commit_list prefix in two function names.

Conflicts:
	sha1_name.c
maint
Junio C Hamano 14 years ago
parent
853563d734 47e44ed1dc
commit
716958c9a2
9 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      builtin/describe.c
  2. 4
      builtin/fetch-pack.c
  3. 6
      builtin/show-branch.c
  4. 24
      commit.c
  5. 10
      commit.h
  6. 12
      revision.c
  7. 2
      sha1_name.c
  8. 4
      upload-pack.c
  9. 2
      walker.c

6
builtin/describe.c
Unescape View File

@ -218,7 +218,7 @@ static unsigned long finish_depth_computation(
struct commit *p = parents->item; struct commit *p = parents->item;
parse_commit(p); parse_commit(p);
if (!(p->object.flags & SEEN)) if (!(p->object.flags & SEEN))
insert_by_date(p, list); commit_list_insert_by_date(p, list);
p->object.flags |= c->object.flags; p->object.flags |= c->object.flags;
parents = parents->next; parents = parents->next;
} }
@ -334,7 +334,7 @@ static void describe(const char *arg, int last_one)
struct commit *p = parents->item; struct commit *p = parents->item;
parse_commit(p); parse_commit(p);
if (!(p->object.flags & SEEN)) if (!(p->object.flags & SEEN))
insert_by_date(p, &list); commit_list_insert_by_date(p, &list);
p->object.flags |= c->object.flags; p->object.flags |= c->object.flags;
parents = parents->next; parents = parents->next;
} }
@ -362,7 +362,7 @@ static void describe(const char *arg, int last_one)
qsort(all_matches, match_cnt, sizeof(all_matches[0]), compare_pt); qsort(all_matches, match_cnt, sizeof(all_matches[0]), compare_pt);


if (gave_up_on) { if (gave_up_on) {
insert_by_date(gave_up_on, &list); commit_list_insert_by_date(gave_up_on, &list);
seen_commits--; seen_commits--;
} }
seen_commits += finish_depth_computation(&list, &all_matches[0]); seen_commits += finish_depth_computation(&list, &all_matches[0]);

4
builtin/fetch-pack.c
Unescape View File

@ -47,7 +47,7 @@ static void rev_list_push(struct commit *commit, int mark)
if (parse_commit(commit)) if (parse_commit(commit))
return; return;


insert_by_date(commit, &rev_list); commit_list_insert_by_date(commit, &rev_list);


if (!(commit->object.flags & COMMON)) if (!(commit->object.flags & COMMON))
non_common_revs++; non_common_revs++;
@ -436,7 +436,7 @@ static int mark_complete(const char *path, const unsigned char *sha1, int flag,
if (o && o->type == OBJ_COMMIT) { if (o && o->type == OBJ_COMMIT) {
struct commit *commit = (struct commit *)o; struct commit *commit = (struct commit *)o;
commit->object.flags |= COMPLETE; commit->object.flags |= COMPLETE;
insert_by_date(commit, &complete); commit_list_insert_by_date(commit, &complete);
} }
return 0; return 0;
} }

6
builtin/show-branch.c
Unescape View File

@ -243,7 +243,7 @@ static void join_revs(struct commit_list **list_p,
if (mark_seen(p, seen_p) && !still_interesting) if (mark_seen(p, seen_p) && !still_interesting)
extra--; extra--;
p->object.flags |= flags; p->object.flags |= flags;
insert_by_date(p, list_p); commit_list_insert_by_date(p, list_p);
} }
} }


@ -859,7 +859,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
*/ */
commit->object.flags |= flag; commit->object.flags |= flag;
if (commit->object.flags == flag) if (commit->object.flags == flag)
insert_by_date(commit, &list); commit_list_insert_by_date(commit, &list);
rev[num_rev] = commit; rev[num_rev] = commit;
} }
for (i = 0; i < num_rev; i++) for (i = 0; i < num_rev; i++)
@ -868,7 +868,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
if (0 <= extra) if (0 <= extra)
join_revs(&list, &seen, num_rev, extra); join_revs(&list, &seen, num_rev, extra);


sort_by_date(&seen); commit_list_sort_by_date(&seen);


if (merge_base) if (merge_base)
return show_merge_base(seen, num_rev); return show_merge_base(seen, num_rev);

24
commit.c
Unescape View File

@ -374,7 +374,7 @@ void free_commit_list(struct commit_list *list)
} }
} }


struct commit_list * insert_by_date(struct commit *item, struct commit_list **list) struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
{ {
struct commit_list **pp = list; struct commit_list **pp = list;
struct commit_list *p; struct commit_list *p;
@ -388,11 +388,11 @@ struct commit_list * insert_by_date(struct commit *item, struct commit_list **li
} }




void sort_by_date(struct commit_list **list) void commit_list_sort_by_date(struct commit_list **list)
{ {
struct commit_list *ret = NULL; struct commit_list *ret = NULL;
while (*list) { while (*list) {
insert_by_date((*list)->item, &ret); commit_list_insert_by_date((*list)->item, &ret);
*list = (*list)->next; *list = (*list)->next;
} }
*list = ret; *list = ret;
@ -412,7 +412,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
struct commit *commit = parents->item; struct commit *commit = parents->item;
if (!parse_commit(commit) && !(commit->object.flags & mark)) { if (!parse_commit(commit) && !(commit->object.flags & mark)) {
commit->object.flags |= mark; commit->object.flags |= mark;
insert_by_date(commit, list); commit_list_insert_by_date(commit, list);
} }
parents = parents->next; parents = parents->next;
} }
@ -501,7 +501,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)


/* process the list in topological order */ /* process the list in topological order */
if (!lifo) if (!lifo)
sort_by_date(&work); commit_list_sort_by_date(&work);


pptr = list; pptr = list;
*list = NULL; *list = NULL;
@ -527,7 +527,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
*/ */
if (--parent->indegree == 1) { if (--parent->indegree == 1) {
if (!lifo) if (!lifo)
insert_by_date(parent, &work); commit_list_insert_by_date(parent, &work);
else else
commit_list_insert(parent, &work); commit_list_insert(parent, &work);
} }
@ -587,10 +587,10 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
} }


one->object.flags |= PARENT1; one->object.flags |= PARENT1;
insert_by_date(one, &list); commit_list_insert_by_date(one, &list);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
twos[i]->object.flags |= PARENT2; twos[i]->object.flags |= PARENT2;
insert_by_date(twos[i], &list); commit_list_insert_by_date(twos[i], &list);
} }


while (interesting(list)) { while (interesting(list)) {
@ -608,7 +608,7 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
if (flags == (PARENT1 | PARENT2)) { if (flags == (PARENT1 | PARENT2)) {
if (!(commit->object.flags & RESULT)) { if (!(commit->object.flags & RESULT)) {
commit->object.flags |= RESULT; commit->object.flags |= RESULT;
insert_by_date(commit, &result); commit_list_insert_by_date(commit, &result);
} }
/* Mark parents of a found merge stale */ /* Mark parents of a found merge stale */
flags |= STALE; flags |= STALE;
@ -622,7 +622,7 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
if (parse_commit(p)) if (parse_commit(p))
return NULL; return NULL;
p->object.flags |= flags; p->object.flags |= flags;
insert_by_date(p, &list); commit_list_insert_by_date(p, &list);
} }
} }


@ -632,7 +632,7 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
while (list) { while (list) {
struct commit_list *next = list->next; struct commit_list *next = list->next;
if (!(list->item->object.flags & STALE)) if (!(list->item->object.flags & STALE))
insert_by_date(list->item, &result); commit_list_insert_by_date(list->item, &result);
free(list); free(list);
list = next; list = next;
} }
@ -725,7 +725,7 @@ struct commit_list *get_merge_bases_many(struct commit *one,
result = NULL; result = NULL;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
if (rslt[i]) if (rslt[i])
insert_by_date(rslt[i], &result); commit_list_insert_by_date(rslt[i], &result);
} }
free(rslt); free(rslt);
return result; return result;

10
commit.h
Unescape View File

@ -39,20 +39,20 @@ struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
struct commit *lookup_commit_reference_by_name(const char *name); struct commit *lookup_commit_reference_by_name(const char *name);


int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size); int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);

int parse_commit(struct commit *item); int parse_commit(struct commit *item);


/* Find beginning and length of commit subject. */ /* Find beginning and length of commit subject. */
int find_commit_subject(const char *commit_buffer, const char **subject); int find_commit_subject(const char *commit_buffer, const char **subject);


struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p); struct commit_list *commit_list_insert(struct commit *item,
struct commit_list **list);
unsigned commit_list_count(const struct commit_list *l); unsigned commit_list_count(const struct commit_list *l);
struct commit_list * insert_by_date(struct commit *item, struct commit_list **list); struct commit_list *commit_list_insert_by_date(struct commit *item,
struct commit_list **list);
void commit_list_sort_by_date(struct commit_list **list);


void free_commit_list(struct commit_list *list); void free_commit_list(struct commit_list *list);


void sort_by_date(struct commit_list **list);

/* Commit formats */ /* Commit formats */
enum cmit_fmt { enum cmit_fmt {
CMIT_FMT_RAW, CMIT_FMT_RAW,

12
revision.c
Unescape View File

@ -444,15 +444,15 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
commit->object.flags |= TREESAME; commit->object.flags |= TREESAME;
} }


static void insert_by_date_cached(struct commit *p, struct commit_list **head, static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
struct commit_list *cached_base, struct commit_list **cache) struct commit_list *cached_base, struct commit_list **cache)
{ {
struct commit_list *new_entry; struct commit_list *new_entry;


if (cached_base && p->date < cached_base->item->date) if (cached_base && p->date < cached_base->item->date)
new_entry = insert_by_date(p, &cached_base->next); new_entry = commit_list_insert_by_date(p, &cached_base->next);
else else
new_entry = insert_by_date(p, head); new_entry = commit_list_insert_by_date(p, head);


if (cache && (!*cache || p->date < (*cache)->item->date)) if (cache && (!*cache || p->date < (*cache)->item->date))
*cache = new_entry; *cache = new_entry;
@ -494,7 +494,7 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
if (p->object.flags & SEEN) if (p->object.flags & SEEN)
continue; continue;
p->object.flags |= SEEN; p->object.flags |= SEEN;
insert_by_date_cached(p, list, cached_base, cache_ptr); commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
} }
return 0; return 0;
} }
@ -521,7 +521,7 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
p->object.flags |= left_flag; p->object.flags |= left_flag;
if (!(p->object.flags & SEEN)) { if (!(p->object.flags & SEEN)) {
p->object.flags |= SEEN; p->object.flags |= SEEN;
insert_by_date_cached(p, list, cached_base, cache_ptr); commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
} }
if (revs->first_parent_only) if (revs->first_parent_only)
break; break;
@ -1891,7 +1891,7 @@ int prepare_revision_walk(struct rev_info *revs)
if (commit) { if (commit) {
if (!(commit->object.flags & SEEN)) { if (!(commit->object.flags & SEEN)) {
commit->object.flags |= SEEN; commit->object.flags |= SEEN;
insert_by_date(commit, &revs->commits); commit_list_insert_by_date(commit, &revs->commits);
} }
} }
e++; e++;

2
sha1_name.c
Unescape View File

@ -707,7 +707,7 @@ static int handle_one_ref(const char *path,
} }
if (object->type != OBJ_COMMIT) if (object->type != OBJ_COMMIT)
return 0; return 0;
insert_by_date((struct commit *)object, list); commit_list_insert_by_date((struct commit *)object, list);
return 0; return 0;
} }



4
upload-pack.c
Unescape View File

@ -366,7 +366,7 @@ static int reachable(struct commit *want)
{ {
struct commit_list *work = NULL; struct commit_list *work = NULL;


insert_by_date(want, &work); commit_list_insert_by_date(want, &work);
while (work) { while (work) {
struct commit_list *list = work->next; struct commit_list *list = work->next;
struct commit *commit = work->item; struct commit *commit = work->item;
@ -387,7 +387,7 @@ static int reachable(struct commit *want)
for (list = commit->parents; list; list = list->next) { for (list = commit->parents; list; list = list->next) {
struct commit *parent = list->item; struct commit *parent = list->item;
if (!(parent->object.flags & REACHABLE)) if (!(parent->object.flags & REACHABLE))
insert_by_date(parent, &work); commit_list_insert_by_date(parent, &work);
} }
} }
want->object.flags |= REACHABLE; want->object.flags |= REACHABLE;

2
walker.c
Unescape View File

@ -207,7 +207,7 @@ static int mark_complete(const char *path, const unsigned char *sha1, int flag,
struct commit *commit = lookup_commit_reference_gently(sha1, 1); struct commit *commit = lookup_commit_reference_gently(sha1, 1);
if (commit) { if (commit) {
commit->object.flags |= COMPLETE; commit->object.flags |= COMPLETE;
insert_by_date(commit, &complete); commit_list_insert_by_date(commit, &complete);
} }
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save