@matheusbsbs / matheus-bagliano / commits / 94c89ba662
Fork 0

git-push: plumb in --mirror mode

Plumb in the --mirror mode for git-push. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Andy Whitcroft committed Nov 9, 2007 at 23:32 UTC 94c89ba662e964c544fdb171dc8dd33f95b97942
3 files changed +20 -2
builtin-push.c
+12 -2
@@ -10,7 +10,7 @@
10 #include "parse-options.h"
11
12 static const char * const push_usage[] = {
13 - "git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
13 + "git-push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
14 NULL,
15 };
16
@@ -91,6 +91,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
91 {
92 int flags = 0;
93 int all = 0;
94 + int mirror = 0;
95 int dry_run = 0;
96 int force = 0;
97 int tags = 0;
@@ -100,6 +101,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
101 OPT__VERBOSE(&verbose),
102 OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
103 OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
104 + OPT_BOOLEAN( 0 , "mirror", &mirror, "mirror all refs"),
105 OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
106 OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
107 OPT_BOOLEAN('f', "force", &force, "force updates"),
@@ -119,13 +121,21 @@ int cmd_push(int argc, const char **argv, const char *prefix)
121 add_refspec("refs/tags/*");
122 if (all)
123 flags |= TRANSPORT_PUSH_ALL;
124 + if (mirror)
125 + flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
126
127 if (argc > 0) {
128 repo = argv[0];
129 set_refspecs(argv + 1, argc - 1);
130 }
127 - if ((flags & TRANSPORT_PUSH_ALL) && refspec)
131 + if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) && refspec)
132 usage_with_options(push_usage, options);
133
134 + if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
135 + (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
136 + error("--all and --mirror are incompatible");
137 + usage_with_options(push_usage, options);
138 + }
139 +
140 return do_push(repo, flags);
141 }
transport.c
+7
@@ -284,6 +284,9 @@ static int rsync_transport_push(struct transport *transport,
284 struct child_process rsync;
285 const char *args[10];
286
287 + if (flags & TRANSPORT_PUSH_MIRROR)
288 + return error("rsync transport does not support mirror mode");
289 +
290 /* first push the objects */
291
292 strbuf_addstr(&buf, transport->url);
@@ -387,6 +390,9 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons
390 int argc;
391 int err;
392
393 + if (flags & TRANSPORT_PUSH_MIRROR)
394 + return error("http transport does not support mirror mode");
395 +
396 argv = xmalloc((refspec_nr + 11) * sizeof(char *));
397 argv[0] = "http-push";
398 argc = 1;
@@ -655,6 +661,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const
661
662 args.receivepack = data->receivepack;
663 args.send_all = !!(flags & TRANSPORT_PUSH_ALL);
664 + args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR);
665 args.force_update = !!(flags & TRANSPORT_PUSH_FORCE);
666 args.use_thin_pack = data->thin;
667 args.verbose = transport->verbose;
transport.h
+1
@@ -30,6 +30,7 @@ struct transport {
30 #define TRANSPORT_PUSH_ALL 1
31 #define TRANSPORT_PUSH_FORCE 2
32 #define TRANSPORT_PUSH_DRY_RUN 4
33 +#define TRANSPORT_PUSH_MIRROR 8
34
35 /* Returns a transport suitable for the url */
36 struct transport *transport_get(struct remote *, const char *);