From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Beller Subject: [PATCHv8 8/9] push.c: add an --atomic argument Date: Mon, 29 Dec 2014 18:36:46 -0800 Message-ID: <1419907007-19387-9-git-send-email-sbeller@google.com> References: <1419907007-19387-1-git-send-email-sbeller@google.com> Cc: git@vger.kernel.org, Ronnie Sahlberg , Stefan Beller To: ronniesahlberg@gmail.com, mhagger@alum.mit.edu, jrnieder@gmail.com, gitster@pobox.com, sunshine@sunshineco.com X-From: git-owner@vger.kernel.org Tue Dec 30 03:37:29 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y5mgZ-00020N-Kr for gcvg-git-2@plane.gmane.org; Tue, 30 Dec 2014 03:37:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbaL3ChO (ORCPT ); Mon, 29 Dec 2014 21:37:14 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:64507 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751967AbaL3ChM (ORCPT ); Mon, 29 Dec 2014 21:37:12 -0500 Received: by mail-ie0-f173.google.com with SMTP id y20so13019753ier.18 for ; Mon, 29 Dec 2014 18:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i3ZK5BkUmNJCqDQ5lO1fR/KUBJQr+6shWue6NrNMLtY=; b=XAPFf2ZXlR/ieC0us+sMO9fsLzoDAwU3nyLlc+0GyzoR0OcdjS1QpnSy22iGLWtRLT LarjcRntOE5Ccd2BQNtHuwX/LRv92kCq7EvIRWsW3oLFzEvd8CP3zsyKGilM0c2MzGiR bMj4X4j7O0ejHbTJY/A4IcaugaJbu/JyXWAZP6GAFXb6VIbDsy5SfStw5Nwc50aTe2hm jSEWLsYXVVAA14lOz3WmIuIvae1qbDcJkC/MN9+XBb1DPjxjjn+1LELZaW6trIQPagCU RTYhXKy7kC9xDTrkELfRzDLUNrisgbk4mfYe7Il3AbemLw9AU8aqeqAIwxEXYydCZAJU 7GIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i3ZK5BkUmNJCqDQ5lO1fR/KUBJQr+6shWue6NrNMLtY=; b=J16nXbOH1HO+7WApAlvh8GQQc80qAsc15OqOryWcoQ8jHc2ECyKLTIJEEJWXSYirwZ quntcaTAM/8oaD6xdUpIC0MUuz9RtOEm91QZ1v7FkOXSK+01+6OhRK2dY8SVqynroVXk UoUS2xBUg/VhES6G/fmVCQ1fSTg+S24D+mp1uZj7XmNK6MjDIAFWW+UTA5R2HqlmwLEf K9AfuWFoY3uY0Ub9Dmj1FTjQujMMVLOL5s+ZowirwfnjIBn2D4WuLiIkYgeprAnIOUO4 DteVQYT/KNftSgFxtDGtg0S8n38owGndJZk7dRrrZZjKUynxzBY+8IEnzE2FA5zGSINE +Lzg== X-Gm-Message-State: ALoCoQkJm//Rkmyd5Qtr7hDcRUEyCc/+pb+x3cBQFwx2ANYIy+aSqVBLdAGKomuft+oVW4NmahMq X-Received: by 10.50.171.201 with SMTP id aw9mr19186892igc.2.1419907031688; Mon, 29 Dec 2014 18:37:11 -0800 (PST) Received: from localhost ([2620:0:1000:5b00:5860:dcf1:88a4:141b]) by mx.google.com with ESMTPSA id r12sm18499308ioe.43.2014.12.29.18.37.11 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 29 Dec 2014 18:37:11 -0800 (PST) X-Mailer: git-send-email 2.2.1.62.g3f15098 In-Reply-To: <1419907007-19387-1-git-send-email-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Ronnie Sahlberg Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg Signed-off-by: Stefan Beller --- Notes: v8: no changes v7: Use OPT_BOOL instead of OPT_BIT. This allows for --no-atomic option on the command line. v6: - OPT_BIT(0, "atomic", &flags, N_("use an atomic transaction remote"), + OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), skipped v4 v5 v2->v3: * s/atomic-push/atomic/ * s/the an/an/ * no serverside, but just remote instead * TRANSPORT_PUSH_ATOMIC instead of TRANSPORT_ATOMIC_PUSH Changes v1 -> v2 It's --atomic now! (dropping the -push) Documentation/git-push.txt | 7 ++++++- builtin/push.c | 5 +++++ transport.c | 1 + transport.h | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 21b3f29..4764fcf 100644 --- 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] -'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=] +'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=] [--repo=] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream] [--signed] [--force-with-lease[=[:]]] @@ -136,6 +136,11 @@ already exists on the remote side. 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=:: --exec=:: Path to the 'git-receive-pack' program on the remote diff --git a/builtin/push.c b/builtin/push.c index a076b19..8f1d945 100644 --- 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 atomic = 0; 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_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")), OPT_END() }; @@ -533,6 +535,9 @@ int cmd_push(int argc, const char **argv, const char *prefix) 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); diff --git a/transport.c b/transport.c index c67feee..1373152 100644 --- 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.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); args.url = transport->url; ret = send_pack(&args, data->fd, data->conn, remote_refs, diff --git a/transport.h b/transport.h index 3e0091e..18d2cf8 100644 --- 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_ATOMIC 4096 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x) -- 2.2.1.62.g3f15098