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

Build-in send-pack, with an API for other programs to call.

Browse Source 
Also marks some more things as const, as needed.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2007-10-29 22:03:39 -04:00 committed by Junio C Hamano
parent 18f7c51cf9
commit 96249c04c0
5 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -358,6 +358,7 @@ BUILTIN_OBJS = \
builtin-push.o \ builtin-push.o \
builtin-read-tree.o \ builtin-read-tree.o \
builtin-reflog.o \ builtin-reflog.o \
builtin-send-pack.o \
builtin-config.o \ builtin-config.o \
builtin-rerere.o \ builtin-rerere.o \
builtin-reset.o \ builtin-reset.o \

81
send-pack.c → builtin-send-pack.c
View File

@ -5,16 +5,15 @@
#include "pkt-line.h" #include "pkt-line.h"
#include "run-command.h" #include "run-command.h"
#include "remote.h" #include "remote.h"
#include "send-pack.h"
static const char send_pack_usage[] = static const char send_pack_usage[] =
"git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n" "git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."; " --all and explicit <ref> specification are mutually exclusive.";
static const char *receivepack = "git-receive-pack";
static int verbose; static struct send_pack_args args = {
static int send_all; /* .receivepack = */ "git-receive-pack",
static int force_update; };
static int use_thin_pack;
static int dry_run;
/* /*
* Make a pack stream and spit it out into file descriptor fd * Make a pack stream and spit it out into file descriptor fd
@ -26,7 +25,7 @@ static int pack_objects(int fd, struct ref *refs)
* the revision parameters to it via its stdin and * the revision parameters to it via its stdin and
* let its stdout go back to the other end. * let its stdout go back to the other end.
*/ */
const char *args[] = { const char *argv[] = {
"pack-objects", "pack-objects",
"--all-progress", "--all-progress",
"--revs", "--revs",
@ -36,10 +35,10 @@ static int pack_objects(int fd, struct ref *refs)
}; };
struct child_process po; struct child_process po;
if (use_thin_pack) if (args.use_thin_pack)
args[4] = "--thin"; argv[4] = "--thin";
memset(&po, 0, sizeof(po)); memset(&po, 0, sizeof(po));
po.argv = args; po.argv = argv;
po.in = -1; po.in = -1;
po.out = fd; po.out = fd;
po.git_cmd = 1; po.git_cmd = 1;
@ -207,7 +206,7 @@ static void update_tracking_ref(struct remote *remote, struct ref *ref)
} }
} }
static int send_pack(int in, int out, struct remote *remote, int nr_refspec, const char **refspec) static int do_send_pack(int in, int out, struct remote *remote, int nr_refspec, const char **refspec)
{ {
struct ref *ref; struct ref *ref;
int new_refs; int new_refs;
@ -230,7 +229,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
if (!remote_tail) if (!remote_tail)
remote_tail = &remote_refs; remote_tail = &remote_refs;
if (match_refs(local_refs, remote_refs, &remote_tail, if (match_refs(local_refs, remote_refs, &remote_tail,
nr_refspec, refspec, send_all)) nr_refspec, refspec, args.send_all))
return -1; return -1;
if (!remote_refs) { if (!remote_refs) {
@ -259,7 +258,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
} }
if (!will_delete_ref && if (!will_delete_ref &&
!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
if (verbose) if (args.verbose)
fprintf(stderr, "'%s': up-to-date\n", ref->name); fprintf(stderr, "'%s': up-to-date\n", ref->name);
continue; continue;
} }
@ -283,7 +282,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
* always allowed. * always allowed.
*/ */
if (!force_update && if (!args.force_update &&
!will_delete_ref && !will_delete_ref &&
!is_null_sha1(ref->old_sha1) && !is_null_sha1(ref->old_sha1) &&
!ref->force) { !ref->force) {
@ -313,7 +312,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
strcpy(old_hex, sha1_to_hex(ref->old_sha1)); strcpy(old_hex, sha1_to_hex(ref->old_sha1));
new_hex = sha1_to_hex(ref->new_sha1); new_hex = sha1_to_hex(ref->new_sha1);
if (!dry_run) { if (!args.dry_run) {
if (ask_for_status_report) { if (ask_for_status_report) {
packet_write(out, "%s %s %s%c%s", packet_write(out, "%s %s %s%c%s",
old_hex, new_hex, ref->name, 0, old_hex, new_hex, ref->name, 0,
@ -338,7 +337,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
} }
packet_flush(out); packet_flush(out);
if (new_refs && !dry_run) if (new_refs && !args.dry_run)
ret = pack_objects(out, remote_refs); ret = pack_objects(out, remote_refs);
close(out); close(out);
@ -347,7 +346,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
ret = -4; ret = -4;
} }
if (!dry_run && remote && ret == 0) { if (!args.dry_run && remote && ret == 0) {
for (ref = remote_refs; ref; ref = ref->next) for (ref = remote_refs; ref; ref = ref->next)
update_tracking_ref(remote, ref); update_tracking_ref(remote, ref);
} }
@ -378,30 +377,25 @@ static void verify_remote_names(int nr_heads, const char **heads)
} }
} }
int main(int argc, char **argv) int cmd_send_pack(int argc, const char **argv, const char *prefix)
{ {
int i, nr_heads = 0; int i, nr_heads = 0;
char *dest = NULL;
const char **heads = NULL; const char **heads = NULL;
int fd[2], ret; const char *remote_name = NULL;
struct child_process *conn;
char *remote_name = NULL;
struct remote *remote = NULL; struct remote *remote = NULL;
const char *dest = NULL;
setup_git_directory();
git_config(git_default_config);
argv++; argv++;
for (i = 1; i < argc; i++, argv++) { for (i = 1; i < argc; i++, argv++) {
char *arg = *argv; const char *arg = *argv;
if (*arg == '-') { if (*arg == '-') {
if (!prefixcmp(arg, "--receive-pack=")) { if (!prefixcmp(arg, "--receive-pack=")) {
receivepack = arg + 15; args.receivepack = arg + 15;
continue; continue;
} }
if (!prefixcmp(arg, "--exec=")) { if (!prefixcmp(arg, "--exec=")) {
receivepack = arg + 7; args.receivepack = arg + 7;
continue; continue;
} }
if (!prefixcmp(arg, "--remote=")) { if (!prefixcmp(arg, "--remote=")) {
@ -409,23 +403,23 @@ int main(int argc, char **argv)
continue; continue;
} }
if (!strcmp(arg, "--all")) { if (!strcmp(arg, "--all")) {
send_all = 1; args.send_all = 1;
continue; continue;
} }
if (!strcmp(arg, "--dry-run")) { if (!strcmp(arg, "--dry-run")) {
dry_run = 1; args.dry_run = 1;
continue; continue;
} }
if (!strcmp(arg, "--force")) { if (!strcmp(arg, "--force")) {
force_update = 1; args.force_update = 1;
continue; continue;
} }
if (!strcmp(arg, "--verbose")) { if (!strcmp(arg, "--verbose")) {
verbose = 1; args.verbose = 1;
continue; continue;
} }
if (!strcmp(arg, "--thin")) { if (!strcmp(arg, "--thin")) {
use_thin_pack = 1; args.use_thin_pack = 1;
continue; continue;
} }
usage(send_pack_usage); usage(send_pack_usage);
@ -440,9 +434,8 @@ int main(int argc, char **argv)
} }
if (!dest) if (!dest)
usage(send_pack_usage); usage(send_pack_usage);
if (heads && send_all) if (heads && args.send_all)
usage(send_pack_usage); usage(send_pack_usage);
verify_remote_names(nr_heads, heads);
if (remote_name) { if (remote_name) {
remote = remote_get(remote_name); remote = remote_get(remote_name);
@ -452,8 +445,22 @@ int main(int argc, char **argv)
} }
} }
conn = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0); return send_pack(&args, dest, remote, nr_heads, heads);
ret = send_pack(fd[0], fd[1], remote, nr_heads, heads); }
int send_pack(struct send_pack_args *my_args,
const char *dest, struct remote *remote,
int nr_heads, const char **heads)
{
int fd[2], ret;
struct child_process *conn;
memcpy(&args, my_args, sizeof(args));
verify_remote_names(nr_heads, heads);
conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
ret = do_send_pack(fd[0], fd[1], remote, nr_heads, heads);
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
ret |= finish_connect(conn); ret |= finish_connect(conn);

1
builtin.h
View File

@ -70,6 +70,7 @@ extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
extern int cmd_revert(int argc, const char **argv, const char *prefix); extern int cmd_revert(int argc, const char **argv, const char *prefix);
extern int cmd_rm(int argc, const char **argv, const char *prefix); extern int cmd_rm(int argc, const char **argv, const char *prefix);
extern int cmd_runstatus(int argc, const char **argv, const char *prefix); extern int cmd_runstatus(int argc, const char **argv, const char *prefix);
extern int cmd_send_pack(int argc, const char **argv, const char *prefix);
extern int cmd_shortlog(int argc, const char **argv, const char *prefix); extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
extern int cmd_show(int argc, const char **argv, const char *prefix); extern int cmd_show(int argc, const char **argv, const char *prefix);
extern int cmd_show_branch(int argc, const char **argv, const char *prefix); extern int cmd_show_branch(int argc, const char **argv, const char *prefix);

1
git.c
View File

@ -348,6 +348,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
{ "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE }, { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE },
{ "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE }, { "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE },
{ "send-pack", cmd_send_pack, RUN_SETUP },
{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER }, { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
{ "show-branch", cmd_show_branch, RUN_SETUP }, { "show-branch", cmd_show_branch, RUN_SETUP },
{ "show", cmd_show, RUN_SETUP | USE_PAGER }, { "show", cmd_show, RUN_SETUP | USE_PAGER },

17
send-pack.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef SEND_PACK_H
#define SEND_PACK_H
struct send_pack_args {
const char *receivepack;
unsigned verbose:1,
send_all:1,
force_update:1,
use_thin_pack:1,
dry_run:1;
};
int send_pack(struct send_pack_args *args,
const char *dest, struct remote *remote,
int nr_heads, const char **heads);
#endif