push.c: add an --atomic argument

Add a command line argument to the git push command to request atomic
pushes.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 21b3f29c3bc603df74e07226d27ad63faa6fae24..4764fcfa7591f48dbe580e24e7347ff9cb93362f 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
+'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]

           [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose]
           [-u | --set-upstream] [--signed]
           [--force-with-lease[=<refname>[:<expect>]]]
           [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose]
           [-u | --set-upstream] [--signed]
           [--force-with-lease[=<refname>[:<expect>]]]


@@ -136,6 +136,11 @@ already exists on the remote side.
        logged.  See linkgit:git-receive-pack[1] for the details
        on the receiving end.
 
        logged.  See linkgit:git-receive-pack[1] for the details
        on the receiving end.
 

+--[no-]atomic::
+       Use an atomic transaction on the remote side if available.
+       Either all refs are updated, or on error, no refs are updated.
+       If the server does not support atomic pushes the push will fail.
+

 --receive-pack=<git-receive-pack>::
 --exec=<git-receive-pack>::
        Path to the 'git-receive-pack' program on the remote
 --receive-pack=<git-receive-pack>::
 --exec=<git-receive-pack>::
        Path to the 'git-receive-pack' program on the remote

diff --git a/builtin/push.c b/builtin/push.c
index a076b1964d6ac0ca96496eda4e88fd23409299a9..8f1d945d1a4a7ae51b11519b28660ff48a4c2fb5 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -487,6 +487,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
        int flags = 0;
        int tags = 0;
        int rc;
        int flags = 0;
        int tags = 0;
        int rc;

+       int atomic = 0;

        const char *repo = NULL;        /* default repository */
        struct option options[] = {
                OPT__VERBOSITY(&verbosity),
        const char *repo = NULL;        /* default repository */
        struct option options[] = {
                OPT__VERBOSITY(&verbosity),


@@ -518,6 +519,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
                        TRANSPORT_PUSH_FOLLOW_TAGS),
                OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT),
                OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
                        TRANSPORT_PUSH_FOLLOW_TAGS),
                OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT),

+               OPT_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")),

                OPT_END()
        };
 
                OPT_END()
        };
 


@@ -533,6 +535,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
        if (tags)
                add_refspec("refs/tags/*");
 
        if (tags)
                add_refspec("refs/tags/*");
 

+       if (atomic)
+               flags |= TRANSPORT_PUSH_ATOMIC;
+

        if (argc > 0) {
                repo = argv[0];
                set_refspecs(argv + 1, argc - 1, repo);
        if (argc > 0) {
                repo = argv[0];
                set_refspecs(argv + 1, argc - 1, repo);

diff --git a/transport.c b/transport.c
index c67feeeb26805e83195b4d705bf3f9bec2ec8247..1373152a93b281bdaa24b65c458a359d1ddfaf4f 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -830,6 +830,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
        args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
        args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
        args.push_cert = !!(flags & TRANSPORT_PUSH_CERT);
        args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
        args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
        args.push_cert = !!(flags & TRANSPORT_PUSH_CERT);

+       args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC);

        args.url = transport->url;
 
        ret = send_pack(&args, data->fd, data->conn, remote_refs,
        args.url = transport->url;
 
        ret = send_pack(&args, data->fd, data->conn, remote_refs,

diff --git a/transport.h b/transport.h
index 3e0091eaabe406759005bc24ce2ff39144caa72d..18d2cf8275e1f5f6ff3d18afde55d06ed7586af9 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -125,6 +125,7 @@ struct transport {
 #define TRANSPORT_PUSH_NO_HOOK 512
 #define TRANSPORT_PUSH_FOLLOW_TAGS 1024
 #define TRANSPORT_PUSH_CERT 2048
 #define TRANSPORT_PUSH_NO_HOOK 512
 #define TRANSPORT_PUSH_FOLLOW_TAGS 1024
 #define TRANSPORT_PUSH_CERT 2048

+#define TRANSPORT_PUSH_ATOMIC 4096

 
 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
 
 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
 #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)