Merge branch 'db/remote'
* db/remote: Move refspec pattern matching to match_refs(). Update local tracking refs when pushing Add handlers for fetch-side configuration of remotes. Move refspec parser from connect.c and cache.h to remote.{c,h} Move remote parsing into a library file out of builtin-push.
This commit is contained in:
commit
322bcd9a9a
5
Makefile
5
Makefile
@ -296,7 +296,8 @@ LIB_H = \
|
||||
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
|
||||
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
|
||||
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
|
||||
utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
|
||||
utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
|
||||
mailmap.h remote.h
|
||||
|
||||
DIFF_OBJS = \
|
||||
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
|
||||
@ -318,7 +319,7 @@ LIB_OBJS = \
|
||||
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
|
||||
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
|
||||
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
|
||||
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o
|
||||
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o
|
||||
|
||||
BUILTIN_OBJS = \
|
||||
builtin-add.o \
|
||||
|
322
builtin-push.c
322
builtin-push.c
@ -5,17 +5,13 @@
|
||||
#include "refs.h"
|
||||
#include "run-command.h"
|
||||
#include "builtin.h"
|
||||
|
||||
#define MAX_URI (16)
|
||||
#include "remote.h"
|
||||
|
||||
static const char push_usage[] = "git-push [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]";
|
||||
|
||||
static int all, tags, force, thin = 1, verbose;
|
||||
static int all, force, thin = 1, verbose;
|
||||
static const char *receivepack;
|
||||
|
||||
#define BUF_SIZE (2084)
|
||||
static char buffer[BUF_SIZE];
|
||||
|
||||
static const char **refspec;
|
||||
static int refspec_nr;
|
||||
|
||||
@ -27,285 +23,47 @@ static void add_refspec(const char *ref)
|
||||
refspec_nr = nr;
|
||||
}
|
||||
|
||||
static int expand_one_ref(const char *ref, const unsigned char *sha1, int flag, void *cb_data)
|
||||
{
|
||||
/* Ignore the "refs/" at the beginning of the refname */
|
||||
ref += 5;
|
||||
|
||||
if (!prefixcmp(ref, "tags/"))
|
||||
add_refspec(xstrdup(ref));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void expand_refspecs(void)
|
||||
{
|
||||
if (all) {
|
||||
if (refspec_nr)
|
||||
die("cannot mix '--all' and a refspec");
|
||||
|
||||
/*
|
||||
* No need to expand "--all" - we'll just use
|
||||
* the "--all" flag to send-pack
|
||||
*/
|
||||
return;
|
||||
}
|
||||
if (!tags)
|
||||
return;
|
||||
for_each_ref(expand_one_ref, NULL);
|
||||
}
|
||||
|
||||
struct wildcard_cb {
|
||||
const char *from_prefix;
|
||||
int from_prefix_len;
|
||||
const char *to_prefix;
|
||||
int to_prefix_len;
|
||||
int force;
|
||||
};
|
||||
|
||||
static int expand_wildcard_ref(const char *ref, const unsigned char *sha1, int flag, void *cb_data)
|
||||
{
|
||||
struct wildcard_cb *cb = cb_data;
|
||||
int len = strlen(ref);
|
||||
char *expanded, *newref;
|
||||
|
||||
if (len < cb->from_prefix_len ||
|
||||
memcmp(cb->from_prefix, ref, cb->from_prefix_len))
|
||||
return 0;
|
||||
expanded = xmalloc(len * 2 + cb->force +
|
||||
(cb->to_prefix_len - cb->from_prefix_len) + 2);
|
||||
newref = expanded + cb->force;
|
||||
if (cb->force)
|
||||
expanded[0] = '+';
|
||||
memcpy(newref, ref, len);
|
||||
newref[len] = ':';
|
||||
memcpy(newref + len + 1, cb->to_prefix, cb->to_prefix_len);
|
||||
strcpy(newref + len + 1 + cb->to_prefix_len,
|
||||
ref + cb->from_prefix_len);
|
||||
add_refspec(expanded);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wildcard_ref(const char *ref)
|
||||
{
|
||||
int len;
|
||||
const char *colon;
|
||||
struct wildcard_cb cb;
|
||||
|
||||
memset(&cb, 0, sizeof(cb));
|
||||
if (ref[0] == '+') {
|
||||
cb.force = 1;
|
||||
ref++;
|
||||
}
|
||||
len = strlen(ref);
|
||||
colon = strchr(ref, ':');
|
||||
if (! (colon && ref < colon &&
|
||||
colon[-2] == '/' && colon[-1] == '*' &&
|
||||
/* "<mine>/<asterisk>:<yours>/<asterisk>" is at least 7 bytes */
|
||||
7 <= len &&
|
||||
ref[len-2] == '/' && ref[len-1] == '*') )
|
||||
return 0 ;
|
||||
cb.from_prefix = ref;
|
||||
cb.from_prefix_len = colon - ref - 1;
|
||||
cb.to_prefix = colon + 1;
|
||||
cb.to_prefix_len = len - (colon - ref) - 2;
|
||||
for_each_ref(expand_wildcard_ref, &cb);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void set_refspecs(const char **refs, int nr)
|
||||
{
|
||||
if (nr) {
|
||||
int i;
|
||||
for (i = 0; i < nr; i++) {
|
||||
const char *ref = refs[i];
|
||||
if (!strcmp("tag", ref)) {
|
||||
char *tag;
|
||||
int len;
|
||||
if (nr <= ++i)
|
||||
die("tag shorthand without <tag>");
|
||||
len = strlen(refs[i]) + 11;
|
||||
tag = xmalloc(len);
|
||||
strcpy(tag, "refs/tags/");
|
||||
strcat(tag, refs[i]);
|
||||
ref = tag;
|
||||
}
|
||||
else if (wildcard_ref(ref))
|
||||
continue;
|
||||
add_refspec(ref);
|
||||
int i;
|
||||
for (i = 0; i < nr; i++) {
|
||||
const char *ref = refs[i];
|
||||
if (!strcmp("tag", ref)) {
|
||||
char *tag;
|
||||
int len;
|
||||
if (nr <= ++i)
|
||||
die("tag shorthand without <tag>");
|
||||
len = strlen(refs[i]) + 11;
|
||||
tag = xmalloc(len);
|
||||
strcpy(tag, "refs/tags/");
|
||||
strcat(tag, refs[i]);
|
||||
ref = tag;
|
||||
}
|
||||
add_refspec(ref);
|
||||
}
|
||||
expand_refspecs();
|
||||
}
|
||||
|
||||
static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
|
||||
{
|
||||
int n = 0;
|
||||
FILE *f = fopen(git_path("remotes/%s", repo), "r");
|
||||
int has_explicit_refspec = refspec_nr || all || tags;
|
||||
|
||||
if (!f)
|
||||
return -1;
|
||||
while (fgets(buffer, BUF_SIZE, f)) {
|
||||
int is_refspec;
|
||||
char *s, *p;
|
||||
|
||||
if (!prefixcmp(buffer, "URL:")) {
|
||||
is_refspec = 0;
|
||||
s = buffer + 4;
|
||||
} else if (!prefixcmp(buffer, "Push:")) {
|
||||
is_refspec = 1;
|
||||
s = buffer + 5;
|
||||
} else
|
||||
continue;
|
||||
|
||||
/* Remove whitespace at the head.. */
|
||||
while (isspace(*s))
|
||||
s++;
|
||||
if (!*s)
|
||||
continue;
|
||||
|
||||
/* ..and at the end */
|
||||
p = s + strlen(s);
|
||||
while (isspace(p[-1]))
|
||||
*--p = 0;
|
||||
|
||||
if (!is_refspec) {
|
||||
if (n < MAX_URI)
|
||||
uri[n++] = xstrdup(s);
|
||||
else
|
||||
error("more than %d URL's specified, ignoring the rest", MAX_URI);
|
||||
}
|
||||
else if (is_refspec && !has_explicit_refspec) {
|
||||
if (!wildcard_ref(s))
|
||||
add_refspec(xstrdup(s));
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
if (!n)
|
||||
die("remote '%s' has no URL", repo);
|
||||
return n;
|
||||
}
|
||||
|
||||
static const char **config_uri;
|
||||
static const char *config_repo;
|
||||
static int config_repo_len;
|
||||
static int config_current_uri;
|
||||
static int config_get_refspecs;
|
||||
static int config_get_receivepack;
|
||||
|
||||
static int get_remote_config(const char* key, const char* value)
|
||||
{
|
||||
if (!prefixcmp(key, "remote.") &&
|
||||
!strncmp(key + 7, config_repo, config_repo_len)) {
|
||||
if (!strcmp(key + 7 + config_repo_len, ".url")) {
|
||||
if (config_current_uri < MAX_URI)
|
||||
config_uri[config_current_uri++] = xstrdup(value);
|
||||
else
|
||||
error("more than %d URL's specified, ignoring the rest", MAX_URI);
|
||||
}
|
||||
else if (config_get_refspecs &&
|
||||
!strcmp(key + 7 + config_repo_len, ".push")) {
|
||||
if (!wildcard_ref(value))
|
||||
add_refspec(xstrdup(value));
|
||||
}
|
||||
else if (config_get_receivepack &&
|
||||
!strcmp(key + 7 + config_repo_len, ".receivepack")) {
|
||||
if (!receivepack) {
|
||||
char *rp = xmalloc(strlen(value) + 16);
|
||||
sprintf(rp, "--receive-pack=%s", value);
|
||||
receivepack = rp;
|
||||
} else
|
||||
error("more than one receivepack given, using the first");
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_config_remotes_uri(const char *repo, const char *uri[MAX_URI])
|
||||
{
|
||||
config_repo_len = strlen(repo);
|
||||
config_repo = repo;
|
||||
config_current_uri = 0;
|
||||
config_uri = uri;
|
||||
config_get_refspecs = !(refspec_nr || all || tags);
|
||||
config_get_receivepack = (receivepack == NULL);
|
||||
|
||||
git_config(get_remote_config);
|
||||
return config_current_uri;
|
||||
}
|
||||
|
||||
static int get_branches_uri(const char *repo, const char *uri[MAX_URI])
|
||||
{
|
||||
const char *slash = strchr(repo, '/');
|
||||
int n = slash ? slash - repo : 1000;
|
||||
FILE *f = fopen(git_path("branches/%.*s", n, repo), "r");
|
||||
char *s, *p;
|
||||
int len;
|
||||
|
||||
if (!f)
|
||||
return 0;
|
||||
s = fgets(buffer, BUF_SIZE, f);
|
||||
fclose(f);
|
||||
if (!s)
|
||||
return 0;
|
||||
while (isspace(*s))
|
||||
s++;
|
||||
if (!*s)
|
||||
return 0;
|
||||
p = s + strlen(s);
|
||||
while (isspace(p[-1]))
|
||||
*--p = 0;
|
||||
len = p - s;
|
||||
if (slash)
|
||||
len += strlen(slash);
|
||||
p = xmalloc(len + 1);
|
||||
strcpy(p, s);
|
||||
if (slash)
|
||||
strcat(p, slash);
|
||||
uri[0] = p;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Read remotes and branches file, fill the push target URI
|
||||
* list. If there is no command line refspecs, read Push: lines
|
||||
* to set up the *refspec list as well.
|
||||
* return the number of push target URIs
|
||||
*/
|
||||
static int read_config(const char *repo, const char *uri[MAX_URI])
|
||||
{
|
||||
int n;
|
||||
|
||||
if (*repo != '/') {
|
||||
n = get_remotes_uri(repo, uri);
|
||||
if (n > 0)
|
||||
return n;
|
||||
|
||||
n = get_config_remotes_uri(repo, uri);
|
||||
if (n > 0)
|
||||
return n;
|
||||
|
||||
n = get_branches_uri(repo, uri);
|
||||
if (n > 0)
|
||||
return n;
|
||||
}
|
||||
|
||||
uri[0] = repo;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int do_push(const char *repo)
|
||||
{
|
||||
const char *uri[MAX_URI];
|
||||
int i, n, errs;
|
||||
int i, errs;
|
||||
int common_argc;
|
||||
const char **argv;
|
||||
int argc;
|
||||
struct remote *remote = remote_get(repo);
|
||||
|
||||
n = read_config(repo, uri);
|
||||
if (n <= 0)
|
||||
if (!remote)
|
||||
die("bad repository '%s'", repo);
|
||||
|
||||
if (remote->receivepack) {
|
||||
char *rp = xmalloc(strlen(remote->receivepack) + 16);
|
||||
sprintf(rp, "--receive-pack=%s", remote->receivepack);
|
||||
receivepack = rp;
|
||||
}
|
||||
if (!refspec && !all && remote->push_refspec_nr) {
|
||||
refspec = remote->push_refspec;
|
||||
refspec_nr = remote->push_refspec_nr;
|
||||
}
|
||||
|
||||
argv = xmalloc((refspec_nr + 10) * sizeof(char *));
|
||||
argv[0] = "dummy-send-pack";
|
||||
argc = 1;
|
||||
@ -318,18 +76,23 @@ static int do_push(const char *repo)
|
||||
common_argc = argc;
|
||||
|
||||
errs = 0;
|
||||
for (i = 0; i < n; i++) {
|
||||
for (i = 0; i < remote->uri_nr; i++) {
|
||||
int err;
|
||||
int dest_argc = common_argc;
|
||||
int dest_refspec_nr = refspec_nr;
|
||||
const char **dest_refspec = refspec;
|
||||
const char *dest = uri[i];
|
||||
const char *dest = remote->uri[i];
|
||||
const char *sender = "send-pack";
|
||||
if (!prefixcmp(dest, "http://") ||
|
||||
!prefixcmp(dest, "https://"))
|
||||
sender = "http-push";
|
||||
else if (thin)
|
||||
argv[dest_argc++] = "--thin";
|
||||
else {
|
||||
char *rem = xmalloc(strlen(remote->name) + 10);
|
||||
sprintf(rem, "--remote=%s", remote->name);
|
||||
argv[dest_argc++] = rem;
|
||||
if (thin)
|
||||
argv[dest_argc++] = "--thin";
|
||||
}
|
||||
argv[0] = sender;
|
||||
argv[dest_argc++] = dest;
|
||||
while (dest_refspec_nr--)
|
||||
@ -341,7 +104,7 @@ static int do_push(const char *repo)
|
||||
if (!err)
|
||||
continue;
|
||||
|
||||
error("failed to push to '%s'", uri[i]);
|
||||
error("failed to push to '%s'", remote->uri[i]);
|
||||
switch (err) {
|
||||
case -ERR_RUN_COMMAND_FORK:
|
||||
error("unable to fork for %s", sender);
|
||||
@ -362,7 +125,7 @@ static int do_push(const char *repo)
|
||||
int cmd_push(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i;
|
||||
const char *repo = "origin"; /* default repository */
|
||||
const char *repo = NULL; /* default repository */
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
@ -385,7 +148,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--tags")) {
|
||||
tags = 1;
|
||||
add_refspec("refs/tags/*");
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
|
||||
@ -411,5 +174,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
|
||||
usage(push_usage);
|
||||
}
|
||||
set_refspecs(argv + i, argc - i);
|
||||
if (all && refspec)
|
||||
usage(push_usage);
|
||||
|
||||
return do_push(repo);
|
||||
}
|
||||
|
2
cache.h
2
cache.h
@ -467,8 +467,6 @@ struct ref {
|
||||
extern pid_t git_connect(int fd[2], char *url, const char *prog, int flags);
|
||||
extern int finish_connect(pid_t pid);
|
||||
extern int path_match(const char *path, int nr, char **match);
|
||||
extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
||||
int nr_refspec, char **refspec, int all);
|
||||
extern int get_ack(int fd, unsigned char *result_sha1);
|
||||
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags);
|
||||
extern int server_supports(const char *feature);
|
||||
|
240
connect.c
240
connect.c
@ -4,6 +4,7 @@
|
||||
#include "quote.h"
|
||||
#include "refs.h"
|
||||
#include "run-command.h"
|
||||
#include "remote.h"
|
||||
|
||||
static char *server_capabilities;
|
||||
|
||||
@ -128,245 +129,6 @@ int path_match(const char *path, int nr, char **match)
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct refspec {
|
||||
char *src;
|
||||
char *dst;
|
||||
char force;
|
||||
};
|
||||
|
||||
/*
|
||||
* A:B means fast forward remote B with local A.
|
||||
* +A:B means overwrite remote B with local A.
|
||||
* +A is a shorthand for +A:A.
|
||||
* A is a shorthand for A:A.
|
||||
* :B means delete remote B.
|
||||
*/
|
||||
static struct refspec *parse_ref_spec(int nr_refspec, char **refspec)
|
||||
{
|
||||
int i;
|
||||
struct refspec *rs = xcalloc(sizeof(*rs), (nr_refspec + 1));
|
||||
for (i = 0; i < nr_refspec; i++) {
|
||||
char *sp, *dp, *ep;
|
||||
sp = refspec[i];
|
||||
if (*sp == '+') {
|
||||
rs[i].force = 1;
|
||||
sp++;
|
||||
}
|
||||
ep = strchr(sp, ':');
|
||||
if (ep) {
|
||||
dp = ep + 1;
|
||||
*ep = 0;
|
||||
}
|
||||
else
|
||||
dp = sp;
|
||||
rs[i].src = sp;
|
||||
rs[i].dst = dp;
|
||||
}
|
||||
rs[nr_refspec].src = rs[nr_refspec].dst = NULL;
|
||||
return rs;
|
||||
}
|
||||
|
||||
static int count_refspec_match(const char *pattern,
|
||||
struct ref *refs,
|
||||
struct ref **matched_ref)
|
||||
{
|
||||
int patlen = strlen(pattern);
|
||||
struct ref *matched_weak = NULL;
|
||||
struct ref *matched = NULL;
|
||||
int weak_match = 0;
|
||||
int match = 0;
|
||||
|
||||
for (weak_match = match = 0; refs; refs = refs->next) {
|
||||
char *name = refs->name;
|
||||
int namelen = strlen(name);
|
||||
int weak_match;
|
||||
|
||||
if (namelen < patlen ||
|
||||
memcmp(name + namelen - patlen, pattern, patlen))
|
||||
continue;
|
||||
if (namelen != patlen && name[namelen - patlen - 1] != '/')
|
||||
continue;
|
||||
|
||||
/* A match is "weak" if it is with refs outside
|
||||
* heads or tags, and did not specify the pattern
|
||||
* in full (e.g. "refs/remotes/origin/master") or at
|
||||
* least from the toplevel (e.g. "remotes/origin/master");
|
||||
* otherwise "git push $URL master" would result in
|
||||
* ambiguity between remotes/origin/master and heads/master
|
||||
* at the remote site.
|
||||
*/
|
||||
if (namelen != patlen &&
|
||||
patlen != namelen - 5 &&
|
||||
prefixcmp(name, "refs/heads/") &&
|
||||
prefixcmp(name, "refs/tags/")) {
|
||||
/* We want to catch the case where only weak
|
||||
* matches are found and there are multiple
|
||||
* matches, and where more than one strong
|
||||
* matches are found, as ambiguous. One
|
||||
* strong match with zero or more weak matches
|
||||
* are acceptable as a unique match.
|
||||
*/
|
||||
matched_weak = refs;
|
||||
weak_match++;
|
||||
}
|
||||
else {
|
||||
matched = refs;
|
||||
match++;
|
||||
}
|
||||
}
|
||||
if (!matched) {
|
||||
*matched_ref = matched_weak;
|
||||
return weak_match;
|
||||
}
|
||||
else {
|
||||
*matched_ref = matched;
|
||||
return match;
|
||||
}
|
||||
}
|
||||
|
||||
static void link_dst_tail(struct ref *ref, struct ref ***tail)
|
||||
{
|
||||
**tail = ref;
|
||||
*tail = &ref->next;
|
||||
**tail = NULL;
|
||||
}
|
||||
|
||||
static struct ref *try_explicit_object_name(const char *name)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
struct ref *ref;
|
||||
int len;
|
||||
|
||||
if (!*name) {
|
||||
ref = xcalloc(1, sizeof(*ref) + 20);
|
||||
strcpy(ref->name, "(delete)");
|
||||
hashclr(ref->new_sha1);
|
||||
return ref;
|
||||
}
|
||||
if (get_sha1(name, sha1))
|
||||
return NULL;
|
||||
len = strlen(name) + 1;
|
||||
ref = xcalloc(1, sizeof(*ref) + len);
|
||||
memcpy(ref->name, name, len);
|
||||
hashcpy(ref->new_sha1, sha1);
|
||||
return ref;
|
||||
}
|
||||
|
||||
static int match_explicit_refs(struct ref *src, struct ref *dst,
|
||||
struct ref ***dst_tail, struct refspec *rs)
|
||||
{
|
||||
int i, errs;
|
||||
for (i = errs = 0; rs[i].src; i++) {
|
||||
struct ref *matched_src, *matched_dst;
|
||||
|
||||
matched_src = matched_dst = NULL;
|
||||
switch (count_refspec_match(rs[i].src, src, &matched_src)) {
|
||||
case 1:
|
||||
break;
|
||||
case 0:
|
||||
/* The source could be in the get_sha1() format
|
||||
* not a reference name. :refs/other is a
|
||||
* way to delete 'other' ref at the remote end.
|
||||
*/
|
||||
matched_src = try_explicit_object_name(rs[i].src);
|
||||
if (matched_src)
|
||||
break;
|
||||
errs = 1;
|
||||
error("src refspec %s does not match any.",
|
||||
rs[i].src);
|
||||
break;
|
||||
default:
|
||||
errs = 1;
|
||||
error("src refspec %s matches more than one.",
|
||||
rs[i].src);
|
||||
break;
|
||||
}
|
||||
switch (count_refspec_match(rs[i].dst, dst, &matched_dst)) {
|
||||
case 1:
|
||||
break;
|
||||
case 0:
|
||||
if (!memcmp(rs[i].dst, "refs/", 5)) {
|
||||
int len = strlen(rs[i].dst) + 1;
|
||||
matched_dst = xcalloc(1, sizeof(*dst) + len);
|
||||
memcpy(matched_dst->name, rs[i].dst, len);
|
||||
link_dst_tail(matched_dst, dst_tail);
|
||||
}
|
||||
else if (!strcmp(rs[i].src, rs[i].dst) &&
|
||||
matched_src) {
|
||||
/* pushing "master:master" when
|
||||
* remote does not have master yet.
|
||||
*/
|
||||
int len = strlen(matched_src->name) + 1;
|
||||
matched_dst = xcalloc(1, sizeof(*dst) + len);
|
||||
memcpy(matched_dst->name, matched_src->name,
|
||||
len);
|
||||
link_dst_tail(matched_dst, dst_tail);
|
||||
}
|
||||
else {
|
||||
errs = 1;
|
||||
error("dst refspec %s does not match any "
|
||||
"existing ref on the remote and does "
|
||||
"not start with refs/.", rs[i].dst);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
errs = 1;
|
||||
error("dst refspec %s matches more than one.",
|
||||
rs[i].dst);
|
||||
break;
|
||||
}
|
||||
if (errs)
|
||||
continue;
|
||||
if (matched_dst->peer_ref) {
|
||||
errs = 1;
|
||||
error("dst ref %s receives from more than one src.",
|
||||
matched_dst->name);
|
||||
}
|
||||
else {
|
||||
matched_dst->peer_ref = matched_src;
|
||||
matched_dst->force = rs[i].force;
|
||||
}
|
||||
}
|
||||
return -errs;
|
||||
}
|
||||
|
||||
static struct ref *find_ref_by_name(struct ref *list, const char *name)
|
||||
{
|
||||
for ( ; list; list = list->next)
|
||||
if (!strcmp(list->name, name))
|
||||
return list;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
||||
int nr_refspec, char **refspec, int all)
|
||||
{
|
||||
struct refspec *rs = parse_ref_spec(nr_refspec, refspec);
|
||||
|
||||
if (nr_refspec)
|
||||
return match_explicit_refs(src, dst, dst_tail, rs);
|
||||
|
||||
/* pick the remainder */
|
||||
for ( ; src; src = src->next) {
|
||||
struct ref *dst_peer;
|
||||
if (src->peer_ref)
|
||||
continue;
|
||||
dst_peer = find_ref_by_name(dst, src->name);
|
||||
if ((dst_peer && dst_peer->peer_ref) || (!dst_peer && !all))
|
||||
continue;
|
||||
if (!dst_peer) {
|
||||
/* Create a new one and link it */
|
||||
int len = strlen(src->name) + 1;
|
||||
dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
|
||||
memcpy(dst_peer->name, src->name, len);
|
||||
hashcpy(dst_peer->new_sha1, src->new_sha1);
|
||||
link_dst_tail(dst_peer, dst_tail);
|
||||
}
|
||||
dst_peer->peer_ref = src;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum protocol {
|
||||
PROTO_LOCAL = 1,
|
||||
PROTO_SSH,
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include "diff.h"
|
||||
#include "revision.h"
|
||||
#include "exec_cmd.h"
|
||||
#include "remote.h"
|
||||
|
||||
#include <expat.h>
|
||||
|
||||
|
27
refs.c
27
refs.c
@ -603,15 +603,20 @@ int get_ref_sha1(const char *ref, unsigned char *sha1)
|
||||
|
||||
static inline int bad_ref_char(int ch)
|
||||
{
|
||||
return (((unsigned) ch) <= ' ' ||
|
||||
ch == '~' || ch == '^' || ch == ':' ||
|
||||
/* 2.13 Pattern Matching Notation */
|
||||
ch == '?' || ch == '*' || ch == '[');
|
||||
if (((unsigned) ch) <= ' ' ||
|
||||
ch == '~' || ch == '^' || ch == ':')
|
||||
return 1;
|
||||
/* 2.13 Pattern Matching Notation */
|
||||
if (ch == '?' || ch == '[') /* Unsupported */
|
||||
return 1;
|
||||
if (ch == '*') /* Supported at the end */
|
||||
return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int check_ref_format(const char *ref)
|
||||
{
|
||||
int ch, level;
|
||||
int ch, level, bad_type;
|
||||
const char *cp = ref;
|
||||
|
||||
level = 0;
|
||||
@ -622,13 +627,19 @@ int check_ref_format(const char *ref)
|
||||
return -1; /* should not end with slashes */
|
||||
|
||||
/* we are at the beginning of the path component */
|
||||
if (ch == '.' || bad_ref_char(ch))
|
||||
if (ch == '.')
|
||||
return -1;
|
||||
bad_type = bad_ref_char(ch);
|
||||
if (bad_type) {
|
||||
return (bad_type == 2 && !*cp) ? -3 : -1;
|
||||
}
|
||||
|
||||
/* scan the rest of the path component */
|
||||
while ((ch = *cp++) != 0) {
|
||||
if (bad_ref_char(ch))
|
||||
return -1;
|
||||
bad_type = bad_ref_char(ch);
|
||||
if (bad_type) {
|
||||
return (bad_type == 2 && !*cp) ? -3 : -1;
|
||||
}
|
||||
if (ch == '/')
|
||||
break;
|
||||
if (ch == '.' && *cp == '.')
|
||||
|
553
remote.c
Normal file
553
remote.c
Normal file
@ -0,0 +1,553 @@
|
||||
#include "cache.h"
|
||||
#include "remote.h"
|
||||
#include "refs.h"
|
||||
|
||||
static struct remote **remotes;
|
||||
static int allocated_remotes;
|
||||
|
||||
#define BUF_SIZE (2048)
|
||||
static char buffer[BUF_SIZE];
|
||||
|
||||
static void add_push_refspec(struct remote *remote, const char *ref)
|
||||
{
|
||||
int nr = remote->push_refspec_nr + 1;
|
||||
remote->push_refspec =
|
||||
xrealloc(remote->push_refspec, nr * sizeof(char *));
|
||||
remote->push_refspec[nr-1] = ref;
|
||||
remote->push_refspec_nr = nr;
|
||||
}
|
||||
|
||||
static void add_fetch_refspec(struct remote *remote, const char *ref)
|
||||
{
|
||||
int nr = remote->fetch_refspec_nr + 1;
|
||||
remote->fetch_refspec =
|
||||
xrealloc(remote->fetch_refspec, nr * sizeof(char *));
|
||||
remote->fetch_refspec[nr-1] = ref;
|
||||
remote->fetch_refspec_nr = nr;
|
||||
}
|
||||
|
||||
static void add_uri(struct remote *remote, const char *uri)
|
||||
{
|
||||
int nr = remote->uri_nr + 1;
|
||||
remote->uri =
|
||||
xrealloc(remote->uri, nr * sizeof(char *));
|
||||
remote->uri[nr-1] = uri;
|
||||
remote->uri_nr = nr;
|
||||
}
|
||||
|
||||
static struct remote *make_remote(const char *name, int len)
|
||||
{
|
||||
int i, empty = -1;
|
||||
|
||||
for (i = 0; i < allocated_remotes; i++) {
|
||||
if (!remotes[i]) {
|
||||
if (empty < 0)
|
||||
empty = i;
|
||||
} else {
|
||||
if (len ? (!strncmp(name, remotes[i]->name, len) &&
|
||||
!remotes[i]->name[len]) :
|
||||
!strcmp(name, remotes[i]->name))
|
||||
return remotes[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (empty < 0) {
|
||||
empty = allocated_remotes;
|
||||
allocated_remotes += allocated_remotes ? allocated_remotes : 1;
|
||||
remotes = xrealloc(remotes,
|
||||
sizeof(*remotes) * allocated_remotes);
|
||||
memset(remotes + empty, 0,
|
||||
(allocated_remotes - empty) * sizeof(*remotes));
|
||||
}
|
||||
remotes[empty] = xcalloc(1, sizeof(struct remote));
|
||||
if (len)
|
||||
remotes[empty]->name = xstrndup(name, len);
|
||||
else
|
||||
remotes[empty]->name = xstrdup(name);
|
||||
return remotes[empty];
|
||||
}
|
||||
|
||||
static void read_remotes_file(struct remote *remote)
|
||||
{
|
||||
FILE *f = fopen(git_path("remotes/%s", remote->name), "r");
|
||||
|
||||
if (!f)
|
||||
return;
|
||||
while (fgets(buffer, BUF_SIZE, f)) {
|
||||
int value_list;
|
||||
char *s, *p;
|
||||
|
||||
if (!prefixcmp(buffer, "URL:")) {
|
||||
value_list = 0;
|
||||
s = buffer + 4;
|
||||
} else if (!prefixcmp(buffer, "Push:")) {
|
||||
value_list = 1;
|
||||
s = buffer + 5;
|
||||
} else if (!prefixcmp(buffer, "Pull:")) {
|
||||
value_list = 2;
|
||||
s = buffer + 5;
|
||||
} else
|
||||
continue;
|
||||
|
||||
while (isspace(*s))
|
||||
s++;
|
||||
if (!*s)
|
||||
continue;
|
||||
|
||||
p = s + strlen(s);
|
||||
while (isspace(p[-1]))
|
||||
*--p = 0;
|
||||
|
||||
switch (value_list) {
|
||||
case 0:
|
||||
add_uri(remote, xstrdup(s));
|
||||
break;
|
||||
case 1:
|
||||
add_push_refspec(remote, xstrdup(s));
|
||||
break;
|
||||
case 2:
|
||||
add_fetch_refspec(remote, xstrdup(s));
|
||||
break;
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
static void read_branches_file(struct remote *remote)
|
||||
{
|
||||
const char *slash = strchr(remote->name, '/');
|
||||
int n = slash ? slash - remote->name : 1000;
|
||||
FILE *f = fopen(git_path("branches/%.*s", n, remote->name), "r");
|
||||
char *s, *p;
|
||||
int len;
|
||||
|
||||
if (!f)
|
||||
return;
|
||||
s = fgets(buffer, BUF_SIZE, f);
|
||||
fclose(f);
|
||||
if (!s)
|
||||
return;
|
||||
while (isspace(*s))
|
||||
s++;
|
||||
if (!*s)
|
||||
return;
|
||||
p = s + strlen(s);
|
||||
while (isspace(p[-1]))
|
||||
*--p = 0;
|
||||
len = p - s;
|
||||
if (slash)
|
||||
len += strlen(slash);
|
||||
p = xmalloc(len + 1);
|
||||
strcpy(p, s);
|
||||
if (slash)
|
||||
strcat(p, slash);
|
||||
add_uri(remote, p);
|
||||
}
|
||||
|
||||
static char *default_remote_name = NULL;
|
||||
static const char *current_branch = NULL;
|
||||
static int current_branch_len = 0;
|
||||
|
||||
static int handle_config(const char *key, const char *value)
|
||||
{
|
||||
const char *name;
|
||||
const char *subkey;
|
||||
struct remote *remote;
|
||||
if (!prefixcmp(key, "branch.") && current_branch &&
|
||||
!strncmp(key + 7, current_branch, current_branch_len) &&
|
||||
!strcmp(key + 7 + current_branch_len, ".remote")) {
|
||||
free(default_remote_name);
|
||||
default_remote_name = xstrdup(value);
|
||||
}
|
||||
if (prefixcmp(key, "remote."))
|
||||
return 0;
|
||||
name = key + 7;
|
||||
subkey = strrchr(name, '.');
|
||||
if (!subkey)
|
||||
return error("Config with no key for remote %s", name);
|
||||
if (*subkey == '/') {
|
||||
warning("Config remote shorthand cannot begin with '/': %s", name);
|
||||
return 0;
|
||||
}
|
||||
remote = make_remote(name, subkey - name);
|
||||
if (!value) {
|
||||
/* if we ever have a boolean variable, e.g. "remote.*.disabled"
|
||||
* [remote "frotz"]
|
||||
* disabled
|
||||
* is a valid way to set it to true; we get NULL in value so
|
||||
* we need to handle it here.
|
||||
*
|
||||
* if (!strcmp(subkey, ".disabled")) {
|
||||
* val = git_config_bool(key, value);
|
||||
* return 0;
|
||||
* } else
|
||||
*
|
||||
*/
|
||||
return 0; /* ignore unknown booleans */
|
||||
}
|
||||
if (!strcmp(subkey, ".url")) {
|
||||
add_uri(remote, xstrdup(value));
|
||||
} else if (!strcmp(subkey, ".push")) {
|
||||
add_push_refspec(remote, xstrdup(value));
|
||||
} else if (!strcmp(subkey, ".fetch")) {
|
||||
add_fetch_refspec(remote, xstrdup(value));
|
||||
} else if (!strcmp(subkey, ".receivepack")) {
|
||||
if (!remote->receivepack)
|
||||
remote->receivepack = xstrdup(value);
|
||||
else
|
||||
error("more than one receivepack given, using the first");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void read_config(void)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
const char *head_ref;
|
||||
int flag;
|
||||
if (default_remote_name) // did this already
|
||||
return;
|
||||
default_remote_name = xstrdup("origin");
|
||||
current_branch = NULL;
|
||||
head_ref = resolve_ref("HEAD", sha1, 0, &flag);
|
||||
if (head_ref && (flag & REF_ISSYMREF) &&
|
||||
!prefixcmp(head_ref, "refs/heads/")) {
|
||||
current_branch = head_ref + strlen("refs/heads/");
|
||||
current_branch_len = strlen(current_branch);
|
||||
}
|
||||
git_config(handle_config);
|
||||
}
|
||||
|
||||
static struct refspec *parse_ref_spec(int nr_refspec, const char **refspec)
|
||||
{
|
||||
int i;
|
||||
struct refspec *rs = xcalloc(sizeof(*rs), nr_refspec);
|
||||
for (i = 0; i < nr_refspec; i++) {
|
||||
const char *sp, *ep, *gp;
|
||||
sp = refspec[i];
|
||||
if (*sp == '+') {
|
||||
rs[i].force = 1;
|
||||
sp++;
|
||||
}
|
||||
gp = strchr(sp, '*');
|
||||
ep = strchr(sp, ':');
|
||||
if (gp && ep && gp > ep)
|
||||
gp = NULL;
|
||||
if (ep) {
|
||||
if (ep[1]) {
|
||||
const char *glob = strchr(ep + 1, '*');
|
||||
if (!glob)
|
||||
gp = NULL;
|
||||
if (gp)
|
||||
rs[i].dst = xstrndup(ep + 1,
|
||||
glob - ep - 1);
|
||||
else
|
||||
rs[i].dst = xstrdup(ep + 1);
|
||||
}
|
||||
} else {
|
||||
ep = sp + strlen(sp);
|
||||
}
|
||||
if (gp) {
|
||||
rs[i].pattern = 1;
|
||||
ep = gp;
|
||||
}
|
||||
rs[i].src = xstrndup(sp, ep - sp);
|
||||
}
|
||||
return rs;
|
||||
}
|
||||
|
||||
struct remote *remote_get(const char *name)
|
||||
{
|
||||
struct remote *ret;
|
||||
|
||||
read_config();
|
||||
if (!name)
|
||||
name = default_remote_name;
|
||||
ret = make_remote(name, 0);
|
||||
if (name[0] != '/') {
|
||||
if (!ret->uri)
|
||||
read_remotes_file(ret);
|
||||
if (!ret->uri)
|
||||
read_branches_file(ret);
|
||||
}
|
||||
if (!ret->uri)
|
||||
add_uri(ret, name);
|
||||
if (!ret->uri)
|
||||
return NULL;
|
||||
ret->fetch = parse_ref_spec(ret->fetch_refspec_nr, ret->fetch_refspec);
|
||||
ret->push = parse_ref_spec(ret->push_refspec_nr, ret->push_refspec);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int remote_has_uri(struct remote *remote, const char *uri)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < remote->uri_nr; i++) {
|
||||
if (!strcmp(remote->uri[i], uri))
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int remote_find_tracking(struct remote *remote, struct refspec *refspec)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < remote->fetch_refspec_nr; i++) {
|
||||
struct refspec *fetch = &remote->fetch[i];
|
||||
if (!fetch->dst)
|
||||
continue;
|
||||
if (fetch->pattern) {
|
||||
if (!prefixcmp(refspec->src, fetch->src)) {
|
||||
refspec->dst =
|
||||
xmalloc(strlen(fetch->dst) +
|
||||
strlen(refspec->src) -
|
||||
strlen(fetch->src) + 1);
|
||||
strcpy(refspec->dst, fetch->dst);
|
||||
strcpy(refspec->dst + strlen(fetch->dst),
|
||||
refspec->src + strlen(fetch->src));
|
||||
refspec->force = fetch->force;
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
if (!strcmp(refspec->src, fetch->src)) {
|
||||
refspec->dst = xstrdup(fetch->dst);
|
||||
refspec->force = fetch->force;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
refspec->dst = NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int count_refspec_match(const char *pattern,
|
||||
struct ref *refs,
|
||||
struct ref **matched_ref)
|
||||
{
|
||||
int patlen = strlen(pattern);
|
||||
struct ref *matched_weak = NULL;
|
||||
struct ref *matched = NULL;
|
||||
int weak_match = 0;
|
||||
int match = 0;
|
||||
|
||||
for (weak_match = match = 0; refs; refs = refs->next) {
|
||||
char *name = refs->name;
|
||||
int namelen = strlen(name);
|
||||
int weak_match;
|
||||
|
||||
if (namelen < patlen ||
|
||||
memcmp(name + namelen - patlen, pattern, patlen))
|
||||
continue;
|
||||
if (namelen != patlen && name[namelen - patlen - 1] != '/')
|
||||
continue;
|
||||
|
||||
/* A match is "weak" if it is with refs outside
|
||||
* heads or tags, and did not specify the pattern
|
||||
* in full (e.g. "refs/remotes/origin/master") or at
|
||||
* least from the toplevel (e.g. "remotes/origin/master");
|
||||
* otherwise "git push $URL master" would result in
|
||||
* ambiguity between remotes/origin/master and heads/master
|
||||
* at the remote site.
|
||||
*/
|
||||
if (namelen != patlen &&
|
||||
patlen != namelen - 5 &&
|
||||
prefixcmp(name, "refs/heads/") &&
|
||||
prefixcmp(name, "refs/tags/")) {
|
||||
/* We want to catch the case where only weak
|
||||
* matches are found and there are multiple
|
||||
* matches, and where more than one strong
|
||||
* matches are found, as ambiguous. One
|
||||
* strong match with zero or more weak matches
|
||||
* are acceptable as a unique match.
|
||||
*/
|
||||
matched_weak = refs;
|
||||
weak_match++;
|
||||
}
|
||||
else {
|
||||
matched = refs;
|
||||
match++;
|
||||
}
|
||||
}
|
||||
if (!matched) {
|
||||
*matched_ref = matched_weak;
|
||||
return weak_match;
|
||||
}
|
||||
else {
|
||||
*matched_ref = matched;
|
||||
return match;
|
||||
}
|
||||
}
|
||||
|
||||
static void link_dst_tail(struct ref *ref, struct ref ***tail)
|
||||
{
|
||||
**tail = ref;
|
||||
*tail = &ref->next;
|
||||
**tail = NULL;
|
||||
}
|
||||
|
||||
static struct ref *try_explicit_object_name(const char *name)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
struct ref *ref;
|
||||
int len;
|
||||
|
||||
if (!*name) {
|
||||
ref = xcalloc(1, sizeof(*ref) + 20);
|
||||
strcpy(ref->name, "(delete)");
|
||||
hashclr(ref->new_sha1);
|
||||
return ref;
|
||||
}
|
||||
if (get_sha1(name, sha1))
|
||||
return NULL;
|
||||
len = strlen(name) + 1;
|
||||
ref = xcalloc(1, sizeof(*ref) + len);
|
||||
memcpy(ref->name, name, len);
|
||||
hashcpy(ref->new_sha1, sha1);
|
||||
return ref;
|
||||
}
|
||||
|
||||
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++) {
|
||||
struct ref *matched_src, *matched_dst;
|
||||
|
||||
const char *dst_value = rs[i].dst;
|
||||
|
||||
if (rs[i].pattern)
|
||||
continue;
|
||||
|
||||
if (dst_value == NULL)
|
||||
dst_value = rs[i].src;
|
||||
|
||||
matched_src = matched_dst = NULL;
|
||||
switch (count_refspec_match(rs[i].src, src, &matched_src)) {
|
||||
case 1:
|
||||
break;
|
||||
case 0:
|
||||
/* The source could be in the get_sha1() format
|
||||
* not a reference name. :refs/other is a
|
||||
* way to delete 'other' ref at the remote end.
|
||||
*/
|
||||
matched_src = try_explicit_object_name(rs[i].src);
|
||||
if (matched_src)
|
||||
break;
|
||||
errs = 1;
|
||||
error("src refspec %s does not match any.",
|
||||
rs[i].src);
|
||||
break;
|
||||
default:
|
||||
errs = 1;
|
||||
error("src refspec %s matches more than one.",
|
||||
rs[i].src);
|
||||
break;
|
||||
}
|
||||
switch (count_refspec_match(dst_value, dst, &matched_dst)) {
|
||||
case 1:
|
||||
break;
|
||||
case 0:
|
||||
if (!memcmp(dst_value, "refs/", 5)) {
|
||||
int len = strlen(dst_value) + 1;
|
||||
matched_dst = xcalloc(1, sizeof(*dst) + len);
|
||||
memcpy(matched_dst->name, dst_value, len);
|
||||
link_dst_tail(matched_dst, dst_tail);
|
||||
}
|
||||
else if (!strcmp(rs[i].src, dst_value) &&
|
||||
matched_src) {
|
||||
/* pushing "master:master" when
|
||||
* remote does not have master yet.
|
||||
*/
|
||||
int len = strlen(matched_src->name) + 1;
|
||||
matched_dst = xcalloc(1, sizeof(*dst) + len);
|
||||
memcpy(matched_dst->name, matched_src->name,
|
||||
len);
|
||||
link_dst_tail(matched_dst, dst_tail);
|
||||
}
|
||||
else {
|
||||
errs = 1;
|
||||
error("dst refspec %s does not match any "
|
||||
"existing ref on the remote and does "
|
||||
"not start with refs/.", dst_value);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
errs = 1;
|
||||
error("dst refspec %s matches more than one.",
|
||||
dst_value);
|
||||
break;
|
||||
}
|
||||
if (errs)
|
||||
continue;
|
||||
if (matched_dst->peer_ref) {
|
||||
errs = 1;
|
||||
error("dst ref %s receives from more than one src.",
|
||||
matched_dst->name);
|
||||
}
|
||||
else {
|
||||
matched_dst->peer_ref = matched_src;
|
||||
matched_dst->force = rs[i].force;
|
||||
}
|
||||
}
|
||||
return -errs;
|
||||
}
|
||||
|
||||
static struct ref *find_ref_by_name(struct ref *list, const char *name)
|
||||
{
|
||||
for ( ; list; list = list->next)
|
||||
if (!strcmp(list->name, name))
|
||||
return list;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int check_pattern_match(struct refspec *rs, int rs_nr, struct ref *src)
|
||||
{
|
||||
int i;
|
||||
if (!rs_nr)
|
||||
return 1;
|
||||
for (i = 0; i < rs_nr; i++) {
|
||||
if (rs[i].pattern && !prefixcmp(src->name, rs[i].src))
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
||||
int nr_refspec, char **refspec, int all)
|
||||
{
|
||||
struct refspec *rs =
|
||||
parse_ref_spec(nr_refspec, (const char **) refspec);
|
||||
|
||||
if (match_explicit_refs(src, dst, dst_tail, rs, nr_refspec))
|
||||
return -1;
|
||||
|
||||
/* pick the remainder */
|
||||
for ( ; src; src = src->next) {
|
||||
struct ref *dst_peer;
|
||||
if (src->peer_ref)
|
||||
continue;
|
||||
if (!check_pattern_match(rs, nr_refspec, src))
|
||||
continue;
|
||||
|
||||
dst_peer = find_ref_by_name(dst, src->name);
|
||||
if (dst_peer && dst_peer->peer_ref)
|
||||
/* We're already sending something to this ref. */
|
||||
continue;
|
||||
if (!dst_peer && !nr_refspec && !all)
|
||||
/* Remote doesn't have it, and we have no
|
||||
* explicit pattern, and we don't have
|
||||
* --all. */
|
||||
continue;
|
||||
if (!dst_peer) {
|
||||
/* Create a new one and link it */
|
||||
int len = strlen(src->name) + 1;
|
||||
dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
|
||||
memcpy(dst_peer->name, src->name, len);
|
||||
hashcpy(dst_peer->new_sha1, src->new_sha1);
|
||||
link_dst_tail(dst_peer, dst_tail);
|
||||
}
|
||||
dst_peer->peer_ref = src;
|
||||
}
|
||||
return 0;
|
||||
}
|
41
remote.h
Normal file
41
remote.h
Normal file
@ -0,0 +1,41 @@
|
||||
#ifndef REMOTE_H
|
||||
#define REMOTE_H
|
||||
|
||||
struct remote {
|
||||
const char *name;
|
||||
|
||||
const char **uri;
|
||||
int uri_nr;
|
||||
|
||||
const char **push_refspec;
|
||||
struct refspec *push;
|
||||
int push_refspec_nr;
|
||||
|
||||
const char **fetch_refspec;
|
||||
struct refspec *fetch;
|
||||
int fetch_refspec_nr;
|
||||
|
||||
const char *receivepack;
|
||||
};
|
||||
|
||||
struct remote *remote_get(const char *name);
|
||||
|
||||
int remote_has_uri(struct remote *remote, const char *uri);
|
||||
|
||||
struct refspec {
|
||||
unsigned force : 1;
|
||||
unsigned pattern : 1;
|
||||
|
||||
const char *src;
|
||||
char *dst;
|
||||
};
|
||||
|
||||
int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
|
||||
int nr_refspec, char **refspec, int all);
|
||||
|
||||
/*
|
||||
* For the given remote, reads the refspec's src and sets the other fields.
|
||||
*/
|
||||
int remote_find_tracking(struct remote *remote, struct refspec *refspec);
|
||||
|
||||
#endif
|
57
send-pack.c
57
send-pack.c
@ -4,6 +4,7 @@
|
||||
#include "refs.h"
|
||||
#include "pkt-line.h"
|
||||
#include "run-command.h"
|
||||
#include "remote.h"
|
||||
|
||||
static const char send_pack_usage[] =
|
||||
"git-send-pack [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
|
||||
@ -176,7 +177,7 @@ static int receive_status(int in)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
|
||||
{
|
||||
struct ref *ref;
|
||||
int new_refs;
|
||||
@ -213,18 +214,19 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
new_refs = 0;
|
||||
for (ref = remote_refs; ref; ref = ref->next) {
|
||||
char old_hex[60], *new_hex;
|
||||
int delete_ref;
|
||||
int will_delete_ref;
|
||||
|
||||
if (!ref->peer_ref)
|
||||
continue;
|
||||
|
||||
delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
|
||||
if (delete_ref && !allow_deleting_refs) {
|
||||
|
||||
will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
|
||||
if (will_delete_ref && !allow_deleting_refs) {
|
||||
error("remote does not support deleting refs");
|
||||
ret = -2;
|
||||
continue;
|
||||
}
|
||||
if (!delete_ref &&
|
||||
if (!will_delete_ref &&
|
||||
!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
|
||||
if (verbose)
|
||||
fprintf(stderr, "'%s': up-to-date\n", ref->name);
|
||||
@ -251,7 +253,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
*/
|
||||
|
||||
if (!force_update &&
|
||||
!delete_ref &&
|
||||
!will_delete_ref &&
|
||||
!is_null_sha1(ref->old_sha1) &&
|
||||
!ref->force) {
|
||||
if (!has_sha1_file(ref->old_sha1) ||
|
||||
@ -275,7 +277,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
}
|
||||
}
|
||||
hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
|
||||
if (!delete_ref)
|
||||
if (!will_delete_ref)
|
||||
new_refs++;
|
||||
strcpy(old_hex, sha1_to_hex(ref->old_sha1));
|
||||
new_hex = sha1_to_hex(ref->new_sha1);
|
||||
@ -290,7 +292,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
else
|
||||
packet_write(out, "%s %s %s",
|
||||
old_hex, new_hex, ref->name);
|
||||
if (delete_ref)
|
||||
if (will_delete_ref)
|
||||
fprintf(stderr, "deleting '%s'\n", ref->name);
|
||||
else {
|
||||
fprintf(stderr, "updating '%s'", ref->name);
|
||||
@ -300,6 +302,28 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
||||
fprintf(stderr, "\n from %s\n to %s\n",
|
||||
old_hex, new_hex);
|
||||
}
|
||||
if (remote) {
|
||||
struct refspec rs;
|
||||
rs.src = ref->name;
|
||||
remote_find_tracking(remote, &rs);
|
||||
if (rs.dst) {
|
||||
struct ref_lock *lock;
|
||||
fprintf(stderr, " Also local %s\n", rs.dst);
|
||||
if (will_delete_ref) {
|
||||
if (delete_ref(rs.dst, NULL)) {
|
||||
error("Failed to delete");
|
||||
}
|
||||
} else {
|
||||
lock = lock_any_ref_for_update(rs.dst, NULL, 0);
|
||||
if (!lock)
|
||||
error("Failed to lock");
|
||||
else
|
||||
write_ref_sha1(lock, ref->new_sha1,
|
||||
"update by push");
|
||||
}
|
||||
free(rs.dst);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
packet_flush(out);
|
||||
@ -330,6 +354,7 @@ static void verify_remote_names(int nr_heads, char **heads)
|
||||
case -2: /* ok but a single level -- that is fine for
|
||||
* a match pattern.
|
||||
*/
|
||||
case -3: /* ok but ends with a pattern-match character */
|
||||
continue;
|
||||
}
|
||||
die("remote part of refspec is not a valid name in %s",
|
||||
@ -344,6 +369,8 @@ int main(int argc, char **argv)
|
||||
char **heads = NULL;
|
||||
int fd[2], ret;
|
||||
pid_t pid;
|
||||
char *remote_name = NULL;
|
||||
struct remote *remote = NULL;
|
||||
|
||||
setup_git_directory();
|
||||
git_config(git_default_config);
|
||||
@ -361,6 +388,10 @@ int main(int argc, char **argv)
|
||||
receivepack = arg + 7;
|
||||
continue;
|
||||
}
|
||||
if (!prefixcmp(arg, "--remote=")) {
|
||||
remote_name = arg + 9;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--all")) {
|
||||
send_all = 1;
|
||||
continue;
|
||||
@ -393,10 +424,18 @@ int main(int argc, char **argv)
|
||||
usage(send_pack_usage);
|
||||
verify_remote_names(nr_heads, heads);
|
||||
|
||||
if (remote_name) {
|
||||
remote = remote_get(remote_name);
|
||||
if (!remote_has_uri(remote, dest)) {
|
||||
die("Destination %s is not a uri for %s",
|
||||
dest, remote_name);
|
||||
}
|
||||
}
|
||||
|
||||
pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
|
||||
if (pid < 0)
|
||||
return 1;
|
||||
ret = send_pack(fd[0], fd[1], nr_heads, heads);
|
||||
ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
|
||||
close(fd[0]);
|
||||
close(fd[1]);
|
||||
ret |= finish_connect(pid);
|
||||
|
Loading…
Reference in New Issue
Block a user