mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shallow: rewrite functions to take object_id arguments

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2015-05-25 18:39:06 +00:00
committed by Junio C Hamano
parent 9c5fe0b846
commit 580b04ef98
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
shallow.c
View File

@ -475,11 +475,10 @@ static void paint_down(struct paint_info *info, const unsigned char *sha1,
free(tmp); free(tmp);
} }
static int mark_uninteresting(const char *refname, static int mark_uninteresting(const char *refname, const struct object_id *oid,
const unsigned char *sha1,
int flags, void *cb_data) int flags, void *cb_data)
{ {
struct commit *commit = lookup_commit_reference_gently(sha1, 1); struct commit *commit = lookup_commit_reference_gently(oid->hash, 1);
if (!commit) if (!commit)
return 0; return 0;
commit->object.flags |= UNINTERESTING; commit->object.flags |= UNINTERESTING;
@ -512,8 +511,6 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
unsigned int i, nr; unsigned int i, nr;
int *shallow, nr_shallow = 0; int *shallow, nr_shallow = 0;
struct paint_info pi; struct paint_info pi;
struct each_ref_fn_sha1_adapter wrapped_mark_uninteresting =
{mark_uninteresting, NULL};
trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n"); trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n");
shallow = xmalloc(sizeof(*shallow) * (info->nr_ours + info->nr_theirs)); shallow = xmalloc(sizeof(*shallow) * (info->nr_ours + info->nr_theirs));
@ -544,8 +541,8 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
* connect to old refs. If not (e.g. force ref updates) it'll * connect to old refs. If not (e.g. force ref updates) it'll
* have to go down to the current shallow commits. * have to go down to the current shallow commits.
*/ */
head_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting); head_ref(mark_uninteresting, NULL);
for_each_ref(each_ref_fn_adapter, &wrapped_mark_uninteresting); for_each_ref(mark_uninteresting, NULL);
/* Mark potential bottoms so we won't go out of bound */ /* Mark potential bottoms so we won't go out of bound */
for (i = 0; i < nr_shallow; i++) { for (i = 0; i < nr_shallow; i++) {
@ -586,12 +583,12 @@ struct commit_array {
int nr, alloc; int nr, alloc;
}; };
static int add_ref(const char *refname, static int add_ref(const char *refname, const struct object_id *oid,
const unsigned char *sha1, int flags, void *cb_data) int flags, void *cb_data)
{ {
struct commit_array *ca = cb_data; struct commit_array *ca = cb_data;
ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc); ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc);
ca->commits[ca->nr] = lookup_commit_reference_gently(sha1, 1); ca->commits[ca->nr] = lookup_commit_reference_gently(oid->hash, 1);
if (ca->commits[ca->nr]) if (ca->commits[ca->nr])
ca->nr++; ca->nr++;
return 0; return 0;
@ -620,8 +617,6 @@ static void post_assign_shallow(struct shallow_info *info,
int dst, i, j; int dst, i, j;
int bitmap_nr = (info->ref->nr + 31) / 32; int bitmap_nr = (info->ref->nr + 31) / 32;
struct commit_array ca; struct commit_array ca;
struct each_ref_fn_sha1_adapter wrapped_add_ref =
{add_ref, &ca};
trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n"); trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
if (ref_status) if (ref_status)
@ -645,8 +640,8 @@ static void post_assign_shallow(struct shallow_info *info,
info->nr_theirs = dst; info->nr_theirs = dst;
memset(&ca, 0, sizeof(ca)); memset(&ca, 0, sizeof(ca));
head_ref(each_ref_fn_adapter, &wrapped_add_ref); head_ref(add_ref, &ca);
for_each_ref(each_ref_fn_adapter, &wrapped_add_ref); for_each_ref(add_ref, &ca);
/* Remove unreachable shallow commits from "ours" */ /* Remove unreachable shallow commits from "ours" */
for (i = dst = 0; i < info->nr_ours; i++) { for (i = dst = 0; i < info->nr_ours; i++) {
@ -678,12 +673,10 @@ int delayed_reachability_test(struct shallow_info *si, int c)
if (!si->commits) { if (!si->commits) {
struct commit_array ca; struct commit_array ca;
struct each_ref_fn_sha1_adapter wrapped_add_ref =
{add_ref, &ca};
memset(&ca, 0, sizeof(ca)); memset(&ca, 0, sizeof(ca));
head_ref(each_ref_fn_adapter, &wrapped_add_ref); head_ref(add_ref, &ca);
for_each_ref(each_ref_fn_adapter, &wrapped_add_ref); for_each_ref(add_ref, &ca);
si->commits = ca.commits; si->commits = ca.commits;
si->nr_commits = ca.nr; si->nr_commits = ca.nr;
} }