On 12 June 2018 at 18:10, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Luke Diamand <luke@xxxxxxxxxxx> writes: > >> This is an updated version of the set of changes I posted recently, >> following comments on the list: >> >> disable automatic sync after git-p4 submit: >> https://marc.info/?l=git&m=152818734814838&w=2 >> >> better handling of being logged out by Perforce: >> https://marc.info/?l=git&m=152818893815326&w=2 >> >> adapt the block size automatically on git-p4 submit: >> https://marc.info/?l=git&m=152819004315688&w=2 >> >> - Spelling corrections (Eric) >> - Improved comments (Eric) >> - Exception class hierarchy fix (Merland) >> - test simplification (Eric) >> > > That reminds me of one thing. > > This 6-patch series depends on the rm/p4-submit-with-commit-option > that came without and still waiting for a sign-off by the original > author. Also I do not think the original patch reached the public > list, so I'm attaching the patch to make sure people know which > patch I am talking about. > > Romain, can we get your sign-off on the patch you sent earlier? Wasn't it already sent in this message: https://marc.info/?l=git&m=152783923418317&w=2 Luke > > Thanks. > > -- >8 -- > From: Romain Merland <merlorom@xxxxxxxx> > 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@xxxxxxxxxxx> > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > 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 @@ def __init__(self): > 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 @@ def __init__(self): > 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 @@ def run(self, args): > 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 @@ def run(self, args): > 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.18.0-rc1-1-g6f333ff2fb >
