From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D445A1F42D for ; Fri, 18 May 2018 11:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751117AbeERLyY (ORCPT ); Fri, 18 May 2018 07:54:24 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:39603 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbeERLyX (ORCPT ); Fri, 18 May 2018 07:54:23 -0400 Received: by mail-ot0-f195.google.com with SMTP id l12-v6so8756915oth.6 for ; Fri, 18 May 2018 04:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=diamand.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=VIqzR43oe9uHnCaZQTYHbFwZPHT+jCCwuo/nugqzH5c=; b=hsSBDkRMMK2Af3eiG+xgZbmgFI+GtcgblgYvNZhsZmVHJWgla49ZtqKYFtuHCfTxMd xISbpPXIj7SqGapnJ0IQ/mWzoadw60R75heHvHdp2fyN4/63E0xABQX/QhlwBLhuhkue 5TqQd9auVREPCiMUswH3pQ/P1VcVLYjvBLmDo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=VIqzR43oe9uHnCaZQTYHbFwZPHT+jCCwuo/nugqzH5c=; b=UvF02LwAPca+lqo9TS6O9Ibn5iWfRacYwAleJ+HVSirxG2QGLQ/sZyj3CK08u0Z2gN z2t056NZusxP/T7M1vCsNO9AO3OUvLbNFgTLYT+aplq2b/fdCZOaSS3AtPoGmGqbEtwF xWLy3+XGPZRdZ/Qm4FqzGNkteSJnyMR6gYZdn99GOmeTvdYsfJyEnzpfOhMEVQ01HWOA bGY1tr+g50DBBYsy1m09Yq0EHZHJhVhL47DSPmij7cd7fiEpXuMBFgUXy642BGwGnpPU YPU5CtD7sVlJVMePspelCRP1BwMR1q2z9zf61WRjjHmaVaBUPe318vsbvf7cJrnuLZvX 128A== X-Gm-Message-State: ALKqPwc9Jz3WqjEIarfD0eI3wFif+JdfM2+VIONLdfrt37Docw2J5UQy vBzG1ub9q/FIjay7u6YryfATRDkNXHKiIPBhbNi4+Q== X-Google-Smtp-Source: AB8JxZqNxCOAN33P8Hy4wJQv61IlaiY6hxSx1ABdA7ziSqpKduH/lk5tqmWlTr6hS/K8HnGdxLr/xxbq8VnagsVRGfo= X-Received: by 2002:a9d:3f90:: with SMTP id r16-v6mr5757264otc.289.1526644462845; Fri, 18 May 2018 04:54:22 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a9d:3c57:0:0:0:0:0 with HTTP; Fri, 18 May 2018 04:54:22 -0700 (PDT) In-Reply-To: <20180509153212.2681-1-merlorom@yahoo.fr> References: <20180509153212.2681-1-merlorom@yahoo.fr> From: Luke Diamand Date: Fri, 18 May 2018 12:54:22 +0100 Message-ID: Subject: Re: [PATCH] git-p4: add options --commit and --disable-rebase To: Romain Merland Cc: Junio C Hamano , Git Users , Matthieu Moy , Vinicius Kursancew , Jeff King , Cedric Borgese , Fabien Boutantin Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 9 May 2018 at 16:32, Romain Merland wrote: > On a daily work with multiple local git branches, the usual way to submit only a > specified commit was to cherry-pick the commit on master then run git-p4 submit. > It can be very annoying to switch between local branches and master, only to > submit one commit. > The proposed new way is to select directly the commit you want to submit. > > add option --commit to command 'git-p4 submit' in order to submit only specified commit(s) in p4. > > On a daily work developping software with big compilation time, one may not want > to rebase on his local git tree, in order to avoid long recompilation. > > add option --disable-rebase to command 'git-p4 submit' in order to disable rebase after submission. I've been using this for real and it works well for me. Ack. Because of the way I'm using git-p4, the --disable-rebase option doesn't really help me - I really need a --disable-sync option but that's a different feature. Thanks Luke > --- > Documentation/git-p4.txt | 14 ++++++++++++++ > git-p4.py | 29 +++++++++++++++++++++++------ > t/t9807-git-p4-submit.sh | 40 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 77 insertions(+), 6 deletions(-) > > diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt > index d8c8f11c9..88d109deb 100644 > --- a/Documentation/git-p4.txt > +++ b/Documentation/git-p4.txt > @@ -149,6 +149,12 @@ To specify a branch other than the current one, use: > $ git p4 submit topicbranch > ------------ > > +To specify a single commit or a range of commits, use: > +------------ > +$ git p4 submit --commit > +$ git p4 submit --commit > +------------ > + > The upstream reference is generally 'refs/remotes/p4/master', but can > be overridden using the `--origin=` command-line option. > > @@ -330,6 +336,14 @@ These options can be used to modify 'git p4 submit' behavior. > p4/master. See the "Sync options" section above for more > information. > > +--commit |:: > + Submit only the specified commit or range of commits, instead of the full > + list of changes that are in the current Git branch. > + > +--disable-rebase:: > + Disable the automatic rebase after all commits have been successfully > + submitted. > + > Rebase options > ~~~~~~~~~~~~~~ > These options can be used to modify 'git p4 rebase' behavior. > diff --git a/git-p4.py b/git-p4.py > index 7bb9cadc6..f4a6f3b4c 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -1352,7 +1352,12 @@ class P4Submit(Command, P4UserMap): > optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int", > metavar="CHANGELIST", > help="update an existing shelved changelist, implies --shelve, " > - "repeat in-order for multiple shelved changelists") > + "repeat in-order for multiple shelved changelists"), > + optparse.make_option("--commit", dest="commit", metavar="COMMIT", > + help="submit only the specified commit(s), one commit or xxx..xxx"), > + optparse.make_option("--disable-rebase", dest="disable_rebase", action="store_true", > + help="Disable rebase after submit is completed. Can be useful if you " > + "work from a local git branch that is not master") > ] > self.description = "Submit changes from git to the perforce depot." > self.usage += " [name of git branch to submit into perforce depot]" > @@ -1362,6 +1367,8 @@ class P4Submit(Command, P4UserMap): > self.dry_run = False > self.shelve = False > self.update_shelve = list() > + self.commit = "" > + self.disable_rebase = False > self.prepare_p4_only = False > self.conflict_behavior = None > self.isWindows = (platform.system() == "Windows") > @@ -2103,9 +2110,18 @@ class P4Submit(Command, P4UserMap): > else: > commitish = 'HEAD' > > - for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, commitish)]): > - commits.append(line.strip()) > - commits.reverse() > + if self.commit != "": > + if self.commit.find("..") != -1: > + limits_ish = self.commit.split("..") > + for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (limits_ish[0], limits_ish[1])]): > + commits.append(line.strip()) > + commits.reverse() > + else: > + commits.append(self.commit) > + else: > + for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, commitish)]): > + commits.append(line.strip()) > + commits.reverse() > > if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"): > self.checkAuthorship = False > @@ -2215,8 +2231,9 @@ class P4Submit(Command, P4UserMap): > sync.branch = self.branch > sync.run([]) > > - rebase = P4Rebase() > - rebase.rebase() > + if self.disable_rebase is False: > + rebase = P4Rebase() > + rebase.rebase() > > else: > if len(applied) == 0: > diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh > index 71cae2874..2325599ee 100755 > --- a/t/t9807-git-p4-submit.sh > +++ b/t/t9807-git-p4-submit.sh > @@ -155,6 +155,46 @@ test_expect_success 'allow submit from branch with same revision but different n > ) > ' > > +# make two commits, but tell it to apply only one > + > +test_expect_success 'submit --commit one' ' > + test_when_finished cleanup_git && > + git p4 clone --dest="$git" //depot && > + ( > + cd "$git" && > + test_commit "file9" && > + test_commit "file10" && > + git config git-p4.skipSubmitEdit true && > + git p4 submit --commit HEAD > + ) && > + ( > + cd "$cli" && > + test_path_is_missing "file9.t" && > + test_path_is_file "file10.t" > + ) > +' > + > +# make three commits, but tell it to apply only range > + > +test_expect_success 'submit --commit range' ' > + test_when_finished cleanup_git && > + git p4 clone --dest="$git" //depot && > + ( > + cd "$git" && > + test_commit "file11" && > + test_commit "file12" && > + test_commit "file13" && > + git config git-p4.skipSubmitEdit true && > + git p4 submit --commit HEAD~2..HEAD > + ) && > + ( > + cd "$cli" && > + test_path_is_missing "file11.t" && > + test_path_is_file "file12.t" && > + test_path_is_file "file13.t" > + ) > +' > + > # > # Basic submit tests, the five handled cases > # > -- > 2.17.0 >