Merge git://repo.or.cz/git-gui

diff --git a/builtin-push.c b/builtin-push.c
index 4b39ef3852a5dcb9b099527d4aafc33ba3bb6da1..c1ed68d938f67343c6938cfef54d5ff69a522a63 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -7,10 +7,14 @@
 #include "builtin.h"
 #include "remote.h"
 #include "transport.h"
+#include "parse-options.h"
 
-static const char push_usage[] = "git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]";
+static const char * const push_usage[] = {
+       "git push [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
+       NULL,
+};
 
-static int thin, verbose;
+static int thin;
 static const char *receivepack;
 
 static const char **refspec;
@@ -52,6 +56,17 @@ static int do_push(const char *repo, int flags)
        if (!remote)
                die("bad repository '%s'", repo);
 
+       if (remote->mirror)
+               flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
+
+       if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) && refspec)
+               return -1;
+
+       if ((flags & (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) ==
+                               (TRANSPORT_PUSH_ALL|TRANSPORT_PUSH_MIRROR)) {
+               return error("--all and --mirror are incompatible");
+       }
+
        if (!refspec
                && !(flags & TRANSPORT_PUSH_ALL)
                && remote->push_refspec_nr) {
@@ -69,7 +84,7 @@ static int do_push(const char *repo, int flags)
                if (thin)
                        transport_set_option(transport, TRANS_OPT_THIN, "yes");
 
-               if (verbose)
+               if (flags & TRANSPORT_PUSH_VERBOSE)
                        fprintf(stderr, "Pushing to %s\n", remote->url[i]);
                err = transport_push(transport, refspec_nr, refspec, flags);
                err |= transport_disconnect(transport);
@@ -77,7 +92,7 @@ static int do_push(const char *repo, int flags)
                if (!err)
                        continue;
 
-               error("failed to push to '%s'", remote->url[i]);
+               error("failed to push some refs to '%s'", remote->url[i]);
                errs++;
        }
        return !!errs;
@@ -85,63 +100,39 @@ static int do_push(const char *repo, int flags)
 
 int cmd_push(int argc, const char **argv, const char *prefix)
 {
-       int i;
        int flags = 0;
+       int tags = 0;
+       int rc;
        const char *repo = NULL;        /* default repository */
 
-       for (i = 1; i < argc; i++) {
-               const char *arg = argv[i];
+       struct option options[] = {
+               OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
+               OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
+               OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL),
+               OPT_BIT( 0 , "mirror", &flags, "mirror all refs",
+                           (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
+               OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
+               OPT_BIT( 0 , "dry-run", &flags, "dry run", TRANSPORT_PUSH_DRY_RUN),
+               OPT_BIT('f', "force", &flags, "force updates", TRANSPORT_PUSH_FORCE),
+               OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
+               OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
+               OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
+               OPT_END()
+       };
 
-               if (arg[0] != '-') {
-                       repo = arg;
-                       i++;
-                       break;
-               }
-               if (!strcmp(arg, "-v")) {
-                       verbose=1;
-                       continue;
-               }
-               if (!prefixcmp(arg, "--repo=")) {
-                       repo = arg+7;
-                       continue;
-               }
-               if (!strcmp(arg, "--all")) {
-                       flags |= TRANSPORT_PUSH_ALL;
-                       continue;
-               }
-               if (!strcmp(arg, "--dry-run")) {
-                       flags |= TRANSPORT_PUSH_DRY_RUN;
-                       continue;
-               }
-               if (!strcmp(arg, "--tags")) {
-                       add_refspec("refs/tags/*");
-                       continue;
-               }
-               if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
-                       flags |= TRANSPORT_PUSH_FORCE;
-                       continue;
-               }
-               if (!strcmp(arg, "--thin")) {
-                       thin = 1;
-                       continue;
-               }
-               if (!strcmp(arg, "--no-thin")) {
-                       thin = 0;
-                       continue;
-               }
-               if (!prefixcmp(arg, "--receive-pack=")) {
-                       receivepack = arg + 15;
-                       continue;
-               }
-               if (!prefixcmp(arg, "--exec=")) {
-                       receivepack = arg + 7;
-                       continue;
-               }
-               usage(push_usage);
+       argc = parse_options(argc, argv, options, push_usage, 0);
+
+       if (tags)
+               add_refspec("refs/tags/*");
+
+       if (argc > 0) {
+               repo = argv[0];
+               set_refspecs(argv + 1, argc - 1);
        }
-       set_refspecs(argv + i, argc - i);
-       if ((flags & TRANSPORT_PUSH_ALL) && refspec)
-               usage(push_usage);
 
-       return do_push(repo, flags);
+       rc = do_push(repo, flags);
+       if (rc == -1)
+               usage_with_options(push_usage, options);
+       else
+               return rc;
 }