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

builtin/rev-parse: convert to struct object_id

Browse Source 
Some of the functions converted are callers of lookup_commit_reference.
However, the changes involved in converting the entire thing are not too
large, so we might as well convert it all.

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-05-01 02:29:02 +00:00
committed by Junio C Hamano
parent 4931b02f4a
commit 8bc095f7d5
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
builtin/rev-parse.c
View File

@ -121,7 +121,7 @@ static void show_with_type(int type, const char *arg)
} }
/* Output a revision, only if filter allows it */ /* Output a revision, only if filter allows it */
static void show_rev(int type, const unsigned char *sha1, const char *name) static void show_rev(int type, const struct object_id *oid, const char *name)
{ {
if (!(filter & DO_REVS)) if (!(filter & DO_REVS))
return; return;
@ -129,10 +129,10 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
if ((symbolic || abbrev_ref) && name) { if ((symbolic || abbrev_ref) && name) {
if (symbolic == SHOW_SYMBOLIC_FULL || abbrev_ref) { if (symbolic == SHOW_SYMBOLIC_FULL || abbrev_ref) {
unsigned char discard[20]; struct object_id discard;
char *full; char *full;
switch (dwim_ref(name, strlen(name), discard, &full)) { switch (dwim_ref(name, strlen(name), discard.hash, &full)) {
case 0: case 0:
/* /*
* Not found -- not a ref. We could * Not found -- not a ref. We could
@ -158,9 +158,9 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
} }
} }
else if (abbrev) else if (abbrev)
show_with_type(type, find_unique_abbrev(sha1, abbrev)); show_with_type(type, find_unique_abbrev(oid->hash, abbrev));
else else
show_with_type(type, sha1_to_hex(sha1)); show_with_type(type, oid_to_hex(oid));
} }
/* Output a flag, only if filter allows it. */ /* Output a flag, only if filter allows it. */
@ -180,11 +180,11 @@ static int show_default(void)
const char *s = def; const char *s = def;
if (s) { if (s) {
unsigned char sha1[20]; struct object_id oid;
def = NULL; def = NULL;
if (!get_sha1(s, sha1)) { if (!get_oid(s, &oid)) {
show_rev(NORMAL, sha1, s); show_rev(NORMAL, &oid, s);
return 1; return 1;
} }
} }
@ -195,19 +195,19 @@ static int show_reference(const char *refname, const struct object_id *oid, int
{ {
if (ref_excluded(ref_excludes, refname)) if (ref_excluded(ref_excludes, refname))
return 0; return 0;
show_rev(NORMAL, oid->hash, refname); show_rev(NORMAL, oid, refname);
return 0; return 0;
} }
static int anti_reference(const char *refname, const struct object_id *oid, int flag, void *cb_data) static int anti_reference(const char *refname, const struct object_id *oid, int flag, void *cb_data)
{ {
show_rev(REVERSED, oid->hash, refname); show_rev(REVERSED, oid, refname);
return 0; return 0;
} }
static int show_abbrev(const struct object_id *oid, void *cb_data) static int show_abbrev(const struct object_id *oid, void *cb_data)
{ {
show_rev(NORMAL, oid->hash, NULL); show_rev(NORMAL, oid, NULL);
return 0; return 0;
} }
@ -242,8 +242,8 @@ static int show_file(const char *arg, int output_prefix)
static int try_difference(const char *arg) static int try_difference(const char *arg)
{ {
char *dotdot; char *dotdot;
unsigned char sha1[20]; struct object_id oid;
unsigned char end[20]; struct object_id end;
const char *next; const char *next;
const char *this; const char *this;
int symmetric; int symmetric;
@ -273,18 +273,18 @@ static int try_difference(const char *arg)
return 0; return 0;
} }
if (!get_sha1_committish(this, sha1) && !get_sha1_committish(next, end)) { if (!get_sha1_committish(this, oid.hash) && !get_sha1_committish(next, end.hash)) {
show_rev(NORMAL, end, next); show_rev(NORMAL, &end, next);
show_rev(symmetric ? NORMAL : REVERSED, sha1, this); show_rev(symmetric ? NORMAL : REVERSED, &oid, this);
if (symmetric) { if (symmetric) {
struct commit_list *exclude; struct commit_list *exclude;
struct commit *a, *b; struct commit *a, *b;
a = lookup_commit_reference(sha1); a = lookup_commit_reference(oid.hash);
b = lookup_commit_reference(end); b = lookup_commit_reference(end.hash);
exclude = get_merge_bases(a, b); exclude = get_merge_bases(a, b);
while (exclude) { while (exclude) {
struct commit *commit = pop_commit(&exclude); struct commit *commit = pop_commit(&exclude);
show_rev(REVERSED, commit->object.oid.hash, NULL); show_rev(REVERSED, &commit->object.oid, NULL);
} }
} }
*dotdot = '.'; *dotdot = '.';
@ -297,7 +297,7 @@ static int try_difference(const char *arg)
static int try_parent_shorthands(const char *arg) static int try_parent_shorthands(const char *arg)
{ {
char *dotdot; char *dotdot;
unsigned char sha1[20]; struct object_id oid;
struct commit *commit; struct commit *commit;
struct commit_list *parents; struct commit_list *parents;
int parent_number; int parent_number;
@ -327,12 +327,12 @@ static int try_parent_shorthands(const char *arg)
return 0; return 0;
*dotdot = 0; *dotdot = 0;
if (get_sha1_committish(arg, sha1)) { if (get_sha1_committish(arg, oid.hash)) {
*dotdot = '^'; *dotdot = '^';
return 0; return 0;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(oid.hash);
if (exclude_parent && if (exclude_parent &&
exclude_parent > commit_list_count(commit->parents)) { exclude_parent > commit_list_count(commit->parents)) {
*dotdot = '^'; *dotdot = '^';
@ -340,7 +340,7 @@ static int try_parent_shorthands(const char *arg)
} }
if (include_rev) if (include_rev)
show_rev(NORMAL, sha1, arg); show_rev(NORMAL, &oid, arg);
for (parents = commit->parents, parent_number = 1; for (parents = commit->parents, parent_number = 1;
parents; parents;
parents = parents->next, parent_number++) { parents = parents->next, parent_number++) {
@ -352,7 +352,7 @@ static int try_parent_shorthands(const char *arg)
if (symbolic) if (symbolic)
name = xstrfmt("%s^%d", arg, parent_number); name = xstrfmt("%s^%d", arg, parent_number);
show_rev(include_parents ? NORMAL : REVERSED, show_rev(include_parents ? NORMAL : REVERSED,
parents->item->object.oid.hash, name); &parents->item->object.oid, name);
free(name); free(name);
} }
@ -571,7 +571,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
int did_repo_setup = 0; int did_repo_setup = 0;
int has_dashdash = 0; int has_dashdash = 0;
int output_prefix = 0; int output_prefix = 0;
unsigned char sha1[20]; struct object_id oid;
unsigned int flags = 0; unsigned int flags = 0;
const char *name = NULL; const char *name = NULL;
struct object_context unused; struct object_context unused;
@ -910,11 +910,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
name++; name++;
type = REVERSED; type = REVERSED;
} }
if (!get_sha1_with_context(name, flags, sha1, &unused)) { if (!get_sha1_with_context(name, flags, oid.hash, &unused)) {
if (verify) if (verify)
revs_count++; revs_count++;
else else
show_rev(type, sha1, name); show_rev(type, &oid, name);
continue; continue;
} }
if (verify) if (verify)
@ -929,7 +929,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
strbuf_release(&buf); strbuf_release(&buf);
if (verify) { if (verify) {
if (revs_count == 1) { if (revs_count == 1) {
show_rev(type, sha1, name); show_rev(type, &oid, name);
return 0; return 0;
} else if (revs_count == 0 && show_default()) } else if (revs_count == 0 && show_default())
return 0; return 0;