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

remote.c: refactor match_explicit_refs()

Browse Source 
This does not change functionality; just splits one block that
is deeply nested and indented out of a huge loop into a separate
function.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-06-08 23:22:58 -07:00
parent e58db03bbe
commit 54a8ad925c
1 changed files with 92 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
remote.c
View File

@ -406,24 +406,23 @@ static struct ref *try_explicit_object_name(const char *name)
return ref; return ref;
} }
static int match_explicit_refs(struct ref *src, struct ref *dst, static int match_explicit(struct ref *src, struct ref *dst,
struct ref ***dst_tail, struct refspec *rs, struct ref ***dst_tail,
int rs_nr) struct refspec *rs,
int errs)
{ {
int i, errs;
for (i = errs = 0; i < rs_nr; i++) {
struct ref *matched_src, *matched_dst; struct ref *matched_src, *matched_dst;
const char *dst_value = rs[i].dst; const char *dst_value = rs->dst;
if (rs[i].pattern) if (rs->pattern)
continue; return errs;
if (dst_value == NULL) if (dst_value == NULL)
dst_value = rs[i].src; dst_value = rs->src;
matched_src = matched_dst = NULL; matched_src = matched_dst = NULL;
switch (count_refspec_match(rs[i].src, src, &matched_src)) { switch (count_refspec_match(rs->src, src, &matched_src)) {
case 1: case 1:
break; break;
case 0: case 0:
@ -431,17 +430,17 @@ static int match_explicit_refs(struct ref *src, struct ref *dst,
* not a reference name. :refs/other is a * not a reference name. :refs/other is a
* way to delete 'other' ref at the remote end. * way to delete 'other' ref at the remote end.
*/ */
matched_src = try_explicit_object_name(rs[i].src); matched_src = try_explicit_object_name(rs->src);
if (matched_src) if (matched_src)
break; break;
errs = 1; errs = 1;
error("src refspec %s does not match any.", error("src refspec %s does not match any.",
rs[i].src); rs->src);
break; break;
default: default:
errs = 1; errs = 1;
error("src refspec %s matches more than one.", error("src refspec %s matches more than one.",
rs[i].src); rs->src);
break; break;
} }
switch (count_refspec_match(dst_value, dst, &matched_dst)) { switch (count_refspec_match(dst_value, dst, &matched_dst)) {
@ -454,7 +453,7 @@ static int match_explicit_refs(struct ref *src, struct ref *dst,
memcpy(matched_dst->name, dst_value, len); memcpy(matched_dst->name, dst_value, len);
link_dst_tail(matched_dst, dst_tail); link_dst_tail(matched_dst, dst_tail);
} }
else if (!strcmp(rs[i].src, dst_value) && else if (!strcmp(rs->src, dst_value) &&
matched_src) { matched_src) {
/* pushing "master:master" when /* pushing "master:master" when
* remote does not have master yet. * remote does not have master yet.
@ -479,7 +478,7 @@ static int match_explicit_refs(struct ref *src, struct ref *dst,
break; break;
} }
if (errs) if (errs)
continue; return errs;
if (matched_dst->peer_ref) { if (matched_dst->peer_ref) {
errs = 1; errs = 1;
error("dst ref %s receives from more than one src.", error("dst ref %s receives from more than one src.",
@ -487,9 +486,18 @@ static int match_explicit_refs(struct ref *src, struct ref *dst,
} }
else { else {
matched_dst->peer_ref = matched_src; matched_dst->peer_ref = matched_src;
matched_dst->force = rs[i].force; matched_dst->force = rs->force;
} }
return errs;
} }
static int match_explicit_refs(struct ref *src, struct ref *dst,
struct ref ***dst_tail, struct refspec *rs,
int rs_nr)
{
int i, errs;
for (i = errs = 0; i < rs_nr; i++)
errs |= match_explicit(src, dst, dst_tail, &rs[i], errs);
return -errs; return -errs;
} }
@ -513,6 +521,11 @@ static const struct refspec *check_pattern_match(const struct refspec *rs,
return NULL; return NULL;
} }
/*
* Note. This is used only by "push"; refspec matching rules for
* push and fetch are subtly different, so do not try to reuse it
* without thinking.
*/
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail, int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
int nr_refspec, char **refspec, int all) int nr_refspec, char **refspec, int all)
{ {