undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the matching function to generate the match results

Browse Source 
This puts all of the interpretation of the pattern representation in a
single function for easy manipulation.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2009-03-07 01:11:34 -05:00 committed by Junio C Hamano
parent a3c8423901
commit e928213fb4
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
remote.c
View File

@ -719,9 +719,19 @@ int remote_has_url(struct remote *remote, const char *url)
return 0; return 0;
} }
static int match_name_with_pattern(const char *key, const char *name) static int match_name_with_pattern(const char *key, const char *name,
const char *value, char **result)
{ {
int ret = !prefixcmp(key, name); size_t klen = strlen(key);
int ret = !strncmp(key, name, klen);
if (ret && value) {
size_t vlen = strlen(value);
*result = xmalloc(vlen +
strlen(name) -
klen + 1);
strcpy(*result, value);
strcpy(*result + vlen, name + klen);
}
return ret; return ret;
} }
@ -748,13 +758,7 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec)
if (!fetch->dst) if (!fetch->dst)
continue; continue;
if (fetch->pattern) { if (fetch->pattern) {
if (match_name_with_pattern(key, needle)) { if (match_name_with_pattern(key, needle, value, result)) {
*result = xmalloc(strlen(value) +
strlen(needle) -
strlen(key) + 1);
strcpy(*result, value);
strcpy(*result + strlen(value),
needle + strlen(key));
refspec->force = fetch->force; refspec->force = fetch->force;
return 0; return 0;
} }
@ -1026,7 +1030,8 @@ static const struct refspec *check_pattern_match(const struct refspec *rs,
continue; continue;
} }
if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name)) if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name,
NULL, NULL))
return rs + i; return rs + i;
} }
if (matching_refs != -1) if (matching_refs != -1)
@ -1080,11 +1085,9 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
} else { } else {
const char *dst_side = pat->dst ? pat->dst : pat->src; const char *dst_side = pat->dst ? pat->dst : pat->src;
dst_name = xmalloc(strlen(dst_side) + if (!match_name_with_pattern(pat->src, src->name,
strlen(src->name) - dst_side, &dst_name))
strlen(pat->src) + 2); die("Didn't think it matches any more");
strcpy(dst_name, dst_side);
strcat(dst_name, src->name + strlen(pat->src));
} }
dst_peer = find_ref_by_name(dst, dst_name); dst_peer = find_ref_by_name(dst, dst_name);
if (dst_peer) { if (dst_peer) {
@ -1160,19 +1163,17 @@ static struct ref *get_expanded_map(const struct ref *remote_refs,
struct ref *ret = NULL; struct ref *ret = NULL;
struct ref **tail = &ret; struct ref **tail = &ret;
int remote_prefix_len = strlen(refspec->src); char *expn_name;
int local_prefix_len = strlen(refspec->dst);
for (ref = remote_refs; ref; ref = ref->next) { for (ref = remote_refs; ref; ref = ref->next) {
if (strchr(ref->name, '^')) if (strchr(ref->name, '^'))
continue; /* a dereference item */ continue; /* a dereference item */
if (match_name_with_pattern(refspec->src, ref->name)) { if (match_name_with_pattern(refspec->src, ref->name,
const char *match; refspec->dst, &expn_name)) {
struct ref *cpy = copy_ref(ref); struct ref *cpy = copy_ref(ref);
match = ref->name + remote_prefix_len;
cpy->peer_ref = alloc_ref_with_prefix(refspec->dst, cpy->peer_ref = alloc_ref(expn_name);
local_prefix_len, match); free(expn_name);
if (refspec->force) if (refspec->force)
cpy->peer_ref->force = 1; cpy->peer_ref->force = 1;
*tail = cpy; *tail = cpy;