* Re: [PATCH] git-p4: add options --commit and --disable-rebase [not found] <20180509153212.2681-1-merlorom@yahoo.fr> @ 2018-05-18 11:54 ` Luke Diamand 2018-05-21 7:01 ` Junio C Hamano 0 siblings, 1 reply; 3+ messages in thread From: Luke Diamand @ 2018-05-18 11:54 UTC (permalink / raw) To: Romain Merland Cc: Junio C Hamano, Git Users, Matthieu Moy, Vinicius Kursancew, Jeff King, Cedric Borgese, Fabien Boutantin On 9 May 2018 at 16:32, Romain Merland <merlorom@yahoo.fr> 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 <sha1> > +$ git p4 submit --commit <sha1..sha1> > +------------ > + > 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 <sha1>|<sha1..sha1>:: > + 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 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-p4: add options --commit and --disable-rebase 2018-05-18 11:54 ` [PATCH] git-p4: add options --commit and --disable-rebase Luke Diamand @ 2018-05-21 7:01 ` Junio C Hamano 0 siblings, 0 replies; 3+ messages in thread From: Junio C Hamano @ 2018-05-21 7:01 UTC (permalink / raw) To: Luke Diamand Cc: Romain Merland, Git Users, Matthieu Moy, Vinicius Kursancew, Jeff King, Cedric Borgese, Fabien Boutantin Luke Diamand <luke@diamand.org> writes: > On 9 May 2018 at 16:32, Romain Merland <merlorom@yahoo.fr> 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. These sound like two separate issues that deserve two separate patches, but I'll take it as-is with your Reviewed-by: The original patch I couldn't find in the public inbox archive, so here is based on what I saw in my spambox (where pieces of e-mail addressed to gitster@ but do not appear on the public archive are sent). ... goes and notices the lack of sign-off Oh, I take it back; I cannot use it as-is, as Romain's sign-off is missing X-<. Romain, could you sign it off after understanding what it means by checking https://git.github.io/htmldocs/SubmittingPatches.html#sign-off Thanks. -- >8 -- From: Romain Merland <merlorom@yahoo.fr> Date: Wed, 9 May 2018 17:32:12 +0200 Subject: [PATCH] git-p4: add options --commit and --disable-rebase 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. Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 d8c8f11c9f..88d109debb 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 <sha1> +$ git p4 submit --commit <sha1..sha1> +------------ + 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 <sha1>|<sha1..sha1>:: + 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 7bb9cadc69..f4a6f3b4c3 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 71cae2874d..2325599ee6 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-582-gccdcbd54c4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <569077545.8373111.1525739857273.ref@mail.yahoo.com>]
[parent not found: <569077545.8373111.1525739857273@mail.yahoo.com>]
* Re: [PATCH] git-p4: add options --commit and --disable-rebase [not found] ` <569077545.8373111.1525739857273@mail.yahoo.com> @ 2018-05-09 8:20 ` Luke Diamand 0 siblings, 0 replies; 3+ messages in thread From: Luke Diamand @ 2018-05-09 8:20 UTC (permalink / raw) To: Merland Romain Cc: git@vger.kernel.org, Junio C Hamano, Matthieu Moy, Vinicius Kursancew, Jeff King, Fabien Boutantin, Cedric Borgese On 8 May 2018 at 01:37, Merland Romain <merlorom@yahoo.fr> wrote: > From f5229be8e2a3340af853227929818940323a8062 Mon Sep 17 00:00:00 2001 > From: Romain Merland <merlorom@yahoo.fr> > Date: Tue, 8 May 2018 02:03:11 +0200 > Subject: [PATCH] git-p4: add options --commit and --disable-rebase > To: git@vger.kernel.org > Cc: Luke Diamand <luke@diamand.org>, > Junio C Hamano <gitster@pobox.com>, > Matthieu Moy <Matthieu.Moy@imag.fr>, > Vinicius Kursancew <viniciusalexandre@gmail.com>, > Jeff King <peff@peff.net>, > Cedric Borgese <cedric.borgese@pdgm.com>, > Fabien Boutantin <fabien.boutantin@pdgm.com> > Thanks-to: Cedric Borgese > Signed-off-by: Romain Merland > > 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. Looks good to me. I just tried it (shelving a change about 3 commits down) and it works like a charm! The "--disable-rebase" will also be very useful (I wonder whether a git-config option might be a useful addition at a later date). (You might need to resubmit your change as plain text via "git format-patch" and "git send-email" as I'm not sure if Junio will accept a mime-encoded patch). 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 <sha1> > +$ git p4 submit --commit <sha1..sha1> > +------------ > + > 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 <sha1>|<sha1..sha1>:: > + 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 > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-21 7:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180509153212.2681-1-merlorom@yahoo.fr>
2018-05-18 11:54 ` [PATCH] git-p4: add options --commit and --disable-rebase Luke Diamand
2018-05-21 7:01 ` Junio C Hamano
[not found] <569077545.8373111.1525739857273.ref@mail.yahoo.com>
[not found] ` <569077545.8373111.1525739857273@mail.yahoo.com>
2018-05-09 8:20 ` Luke Diamand
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).