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

builtin/fmt-merge-message: convert to struct object_id

Browse Source 
Convert most of the code to use struct object_id, including struct
origin_data and struct merge_parents.  Convert several instances of
hardcoded numbers into references to GIT_SHA1_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-02-21 23:47:24 +00:00
committed by Junio C Hamano
parent 273f8ee8c0
commit 175ccdcf2a
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
builtin/fmt-merge-msg.c
View File

@ -41,7 +41,7 @@ struct src_data {
}; };
struct origin_data { struct origin_data {
unsigned char sha1[20]; struct object_id oid;
unsigned is_local_branch:1; unsigned is_local_branch:1;
}; };
@ -59,8 +59,8 @@ static struct string_list origins = STRING_LIST_INIT_DUP;
struct merge_parents { struct merge_parents {
int alloc, nr; int alloc, nr;
struct merge_parent { struct merge_parent {
unsigned char given[20]; struct object_id given;
unsigned char commit[20]; struct object_id commit;
unsigned char used; unsigned char used;
} *item; } *item;
}; };
@ -70,14 +70,14 @@ struct merge_parents {
* hundreds of heads at a time anyway. * hundreds of heads at a time anyway.
*/ */
static struct merge_parent *find_merge_parent(struct merge_parents *table, static struct merge_parent *find_merge_parent(struct merge_parents *table,
unsigned char *given, struct object_id *given,
unsigned char *commit) struct object_id *commit)
{ {
int i; int i;
for (i = 0; i < table->nr; i++) { for (i = 0; i < table->nr; i++) {
if (given && hashcmp(table->item[i].given, given)) if (given && oidcmp(&table->item[i].given, given))
continue; continue;
if (commit && hashcmp(table->item[i].commit, commit)) if (commit && oidcmp(&table->item[i].commit, commit))
continue; continue;
return &table->item[i]; return &table->item[i];
} }
@ -85,14 +85,14 @@ static struct merge_parent *find_merge_parent(struct merge_parents *table,
} }
static void add_merge_parent(struct merge_parents *table, static void add_merge_parent(struct merge_parents *table,
unsigned char *given, struct object_id *given,
unsigned char *commit) struct object_id *commit)
{ {
if (table->nr && find_merge_parent(table, given, commit)) if (table->nr && find_merge_parent(table, given, commit))
return; return;
ALLOC_GROW(table->item, table->nr + 1, table->alloc); ALLOC_GROW(table->item, table->nr + 1, table->alloc);
hashcpy(table->item[table->nr].given, given); oidcpy(&table->item[table->nr].given, given);
hashcpy(table->item[table->nr].commit, commit); oidcpy(&table->item[table->nr].commit, commit);
table->item[table->nr].used = 0; table->item[table->nr].used = 0;
table->nr++; table->nr++;
} }
@ -106,30 +106,30 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
struct src_data *src_data; struct src_data *src_data;
struct string_list_item *item; struct string_list_item *item;
int pulling_head = 0; int pulling_head = 0;
unsigned char sha1[20]; struct object_id oid;
if (len < 43 || line[40] != '\t') if (len < GIT_SHA1_HEXSZ + 3 || line[GIT_SHA1_HEXSZ] != '\t')
return 1; return 1;
if (starts_with(line + 41, "not-for-merge")) if (starts_with(line + GIT_SHA1_HEXSZ + 1, "not-for-merge"))
return 0; return 0;
if (line[41] != '\t') if (line[GIT_SHA1_HEXSZ + 1] != '\t')
return 2; return 2;
i = get_sha1_hex(line, sha1); i = get_oid_hex(line, &oid);
if (i) if (i)
return 3; return 3;
if (!find_merge_parent(merge_parents, sha1, NULL)) if (!find_merge_parent(merge_parents, &oid, NULL))
return 0; /* subsumed by other parents */ return 0; /* subsumed by other parents */
origin_data = xcalloc(1, sizeof(struct origin_data)); origin_data = xcalloc(1, sizeof(struct origin_data));
hashcpy(origin_data->sha1, sha1); oidcpy(&origin_data->oid, &oid);
if (line[len - 1] == '\n') if (line[len - 1] == '\n')
line[len - 1] = 0; line[len - 1] = 0;
line += 42; line += GIT_SHA1_HEXSZ + 2;
/* /*
* At this point, line points at the beginning of comment e.g. * At this point, line points at the beginning of comment e.g.
@ -338,10 +338,10 @@ static void shortlog(const char *name,
struct string_list committers = STRING_LIST_INIT_DUP; struct string_list committers = STRING_LIST_INIT_DUP;
int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED; int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
const unsigned char *sha1 = origin_data->sha1; const struct object_id *oid = &origin_data->oid;
int limit = opts->shortlog_len; int limit = opts->shortlog_len;
branch = deref_tag(parse_object(sha1), sha1_to_hex(sha1), 40); branch = deref_tag(parse_object(oid->hash), oid_to_hex(oid), GIT_SHA1_HEXSZ);
if (!branch || branch->type != OBJ_COMMIT) if (!branch || branch->type != OBJ_COMMIT)
return; return;
@ -531,7 +531,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
} }
static void find_merge_parents(struct merge_parents *result, static void find_merge_parents(struct merge_parents *result,
struct strbuf *in, unsigned char *head) struct strbuf *in, struct object_id *head)
{ {
struct commit_list *parents; struct commit_list *parents;
struct commit *head_commit; struct commit *head_commit;
@ -542,31 +542,31 @@ static void find_merge_parents(struct merge_parents *result,
int len; int len;
char *p = in->buf + pos; char *p = in->buf + pos;
char *newline = strchr(p, '\n'); char *newline = strchr(p, '\n');
unsigned char sha1[20]; struct object_id oid;
struct commit *parent; struct commit *parent;
struct object *obj; struct object *obj;
len = newline ? newline - p : strlen(p); len = newline ? newline - p : strlen(p);
pos += len + !!newline; pos += len + !!newline;
if (len < 43 || if (len < GIT_SHA1_HEXSZ + 3 ||
get_sha1_hex(p, sha1) || get_oid_hex(p, &oid) ||
p[40] != '\t' || p[GIT_SHA1_HEXSZ] != '\t' ||
p[41] != '\t') p[GIT_SHA1_HEXSZ + 1] != '\t')
continue; /* skip not-for-merge */ continue; /* skip not-for-merge */
/* /*
* Do not use get_merge_parent() here; we do not have * Do not use get_merge_parent() here; we do not have
* "name" here and we do not want to contaminate its * "name" here and we do not want to contaminate its
* util field yet. * util field yet.
*/ */
obj = parse_object(sha1); obj = parse_object(oid.hash);
parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT); parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT);
if (!parent) if (!parent)
continue; continue;
commit_list_insert(parent, &parents); commit_list_insert(parent, &parents);
add_merge_parent(result, obj->oid.hash, parent->object.oid.hash); add_merge_parent(result, &obj->oid, &parent->object.oid);
} }
head_commit = lookup_commit(head); head_commit = lookup_commit(head->hash);
if (head_commit) if (head_commit)
commit_list_insert(head_commit, &parents); commit_list_insert(head_commit, &parents);
parents = reduce_heads(parents); parents = reduce_heads(parents);
@ -574,7 +574,7 @@ static void find_merge_parents(struct merge_parents *result,
while (parents) { while (parents) {
struct commit *cmit = pop_commit(&parents); struct commit *cmit = pop_commit(&parents);
for (i = 0; i < result->nr; i++) for (i = 0; i < result->nr; i++)
if (!hashcmp(result->item[i].commit, cmit->object.oid.hash)) if (!oidcmp(&result->item[i].commit, &cmit->object.oid))
result->item[i].used = 1; result->item[i].used = 1;
} }
@ -592,7 +592,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct fmt_merge_msg_opts *opts) struct fmt_merge_msg_opts *opts)
{ {
int i = 0, pos = 0; int i = 0, pos = 0;
unsigned char head_sha1[20]; struct object_id head_oid;
const char *current_branch; const char *current_branch;
void *current_branch_to_free; void *current_branch_to_free;
struct merge_parents merge_parents; struct merge_parents merge_parents;
@ -601,13 +601,13 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
/* get current branch */ /* get current branch */
current_branch = current_branch_to_free = current_branch = current_branch_to_free =
resolve_refdup("HEAD", RESOLVE_REF_READING, head_sha1, NULL); resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL);
if (!current_branch) if (!current_branch)
die("No current branch"); die("No current branch");
if (starts_with(current_branch, "refs/heads/")) if (starts_with(current_branch, "refs/heads/"))
current_branch += 11; current_branch += 11;
find_merge_parents(&merge_parents, in, head_sha1); find_merge_parents(&merge_parents, in, &head_oid);
/* get a line */ /* get a line */
while (pos < in->len) { while (pos < in->len) {
@ -633,7 +633,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct commit *head; struct commit *head;
struct rev_info rev; struct rev_info rev;
head = lookup_commit_or_die(head_sha1, "HEAD"); head = lookup_commit_or_die(head_oid.hash, "HEAD");
init_revisions(&rev, NULL); init_revisions(&rev, NULL);
rev.commit_format = CMIT_FMT_ONELINE; rev.commit_format = CMIT_FMT_ONELINE;
rev.ignore_merges = 1; rev.ignore_merges = 1;