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

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>

diff --git a/Makefile b/Makefile
index 14f25ff8ecb828198ee3384525a4340a537d0387..3ec1876cbbb2c554a71ed076e011622a25b1700d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -358,6 +358,7 @@ BUILTIN_OBJS = \
        builtin-push.o \
        builtin-read-tree.o \
        builtin-reflog.o \
+       builtin-send-pack.o \
        builtin-config.o \
        builtin-rerere.o \
        builtin-reset.o \

diff --git a/send-pack.c b/builtin-send-pack.c
similarity index 88%
rename from send-pack.c
rename to builtin-send-pack.c
index 456fe4f125f4c2b56301f8b1b8c62b6807e10d3b..aedef09ef078db6722e0762d7c14f2d08d953945 100644 (file)
--- a/send-pack.c
+++ b/builtin-send-pack.c
@@ -5,16 +5,15 @@
 #include "pkt-line.h"
 #include "run-command.h"
 #include "remote.h"
+#include "send-pack.h"
 
 static const char send_pack_usage[] =
 "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.";
-static const char *receivepack = "git-receive-pack";
-static int verbose;
-static int send_all;
-static int force_update;
-static int use_thin_pack;
-static int dry_run;
+
+static struct send_pack_args args = {
+       /* .receivepack = */ "git-receive-pack",
+};
 
 /*
  * 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
         * let its stdout go back to the other end.
         */
-       const char *args[] = {
+       const char *argv[] = {
                "pack-objects",
                "--all-progress",
                "--revs",
@@ -36,10 +35,10 @@ static int pack_objects(int fd, struct ref *refs)
        };
        struct child_process po;
 
-       if (use_thin_pack)
-               args[4] = "--thin";
+       if (args.use_thin_pack)
+               argv[4] = "--thin";
        memset(&po, 0, sizeof(po));
-       po.argv = args;
+       po.argv = argv;
        po.in = -1;
        po.out = fd;
        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;
        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)
                remote_tail = &remote_refs;
        if (match_refs(local_refs, remote_refs, &remote_tail,
-                      nr_refspec, refspec, send_all))
+                      nr_refspec, refspec, args.send_all))
                return -1;
 
        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 &&
                    !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
-                       if (verbose)
+                       if (args.verbose)
                                fprintf(stderr, "'%s': up-to-date\n", ref->name);
                        continue;
                }
@@ -283,7 +282,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
                 *     always allowed.
                 */
 
-               if (!force_update &&
+               if (!args.force_update &&
                    !will_delete_ref &&
                    !is_null_sha1(ref->old_sha1) &&
                    !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));
                new_hex = sha1_to_hex(ref->new_sha1);
 
-               if (!dry_run) {
+               if (!args.dry_run) {
                        if (ask_for_status_report) {
                                packet_write(out, "%s %s %s%c%s",
                                        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);
-       if (new_refs && !dry_run)
+       if (new_refs && !args.dry_run)
                ret = pack_objects(out, remote_refs);
        close(out);
 
@@ -347,7 +346,7 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, con
                        ret = -4;
        }
 
-       if (!dry_run && remote && ret == 0) {
+       if (!args.dry_run && remote && ret == 0) {
                for (ref = remote_refs; ref; ref = ref->next)
                        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;
-       char *dest = NULL;
        const char **heads = NULL;
-       int fd[2], ret;
-       struct child_process *conn;
-       char *remote_name = NULL;
+       const char *remote_name = NULL;
        struct remote *remote = NULL;
-
-       setup_git_directory();
-       git_config(git_default_config);
+       const char *dest = NULL;
 
        argv++;
        for (i = 1; i < argc; i++, argv++) {
-               char *arg = *argv;
+               const char *arg = *argv;
 
                if (*arg == '-') {
                        if (!prefixcmp(arg, "--receive-pack=")) {
-                               receivepack = arg + 15;
+                               args.receivepack = arg + 15;
                                continue;
                        }
                        if (!prefixcmp(arg, "--exec=")) {
-                               receivepack = arg + 7;
+                               args.receivepack = arg + 7;
                                continue;
                        }
                        if (!prefixcmp(arg, "--remote=")) {
@@ -409,23 +403,23 @@ int main(int argc, char **argv)
                                continue;
                        }
                        if (!strcmp(arg, "--all")) {
-                               send_all = 1;
+                               args.send_all = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--dry-run")) {
-                               dry_run = 1;
+                               args.dry_run = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--force")) {
-                               force_update = 1;
+                               args.force_update = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--verbose")) {
-                               verbose = 1;
+                               args.verbose = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--thin")) {
-                               use_thin_pack = 1;
+                               args.use_thin_pack = 1;
                                continue;
                        }
                        usage(send_pack_usage);
@@ -440,9 +434,8 @@ int main(int argc, char **argv)
        }
        if (!dest)
                usage(send_pack_usage);
-       if (heads && send_all)
+       if (heads && args.send_all)
                usage(send_pack_usage);
-       verify_remote_names(nr_heads, heads);
 
        if (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);
-       ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
+       return send_pack(&args, dest, 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[1]);
        ret |= finish_connect(conn);

diff --git a/builtin.h b/builtin.h
index 62ee5373dc27e408bf8729de72b6b0715900edc8..2335c01b0262df2f47800cf54b17f26316048c5a 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -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_rm(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_show(int argc, const char **argv, const char *prefix);
 extern int cmd_show_branch(int argc, const char **argv, const char *prefix);

diff --git a/git.c b/git.c
index c55a13de17eb563edd1d8ba2f6309bc5720257c2..19a2172a10d905dbe0975d1d8db42a65e3183a24 100644 (file)
--- a/git.c
+++ b/git.c
@@ -348,6 +348,7 @@ static void handle_internal_command(int argc, const char **argv)
                { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
                { "rm", cmd_rm, 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 },
                { "show-branch", cmd_show_branch, RUN_SETUP },
                { "show", cmd_show, RUN_SETUP | USE_PAGER },

diff --git a/send-pack.h b/send-pack.h
new file mode 100644 (file)
index 0000000..7a24f71
--- /dev/null
+++ b/send-pack.h
@@ -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