From: Luke Diamand <luke@diamand.org>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCHv2 03/12] git p4: remove submit failure options [a]pply and [w]rite
Date: Sat, 15 Sep 2012 22:52:19 +0100 [thread overview]
Message-ID: <5054F893.3040704@diamand.org> (raw)
In-Reply-To: <1347221773-12773-4-git-send-email-pw@padd.com>
git-p4 won't be quite the same without these completely misleading and
confusing messages :-)
Ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
> When a patch failed to apply, these interactive options offered
> to:
>
> 1) apply the patch anyway, leaving reject (.rej) files around, or,
> 2) write the patch to a file (patch.txt)
>
> In both cases it suggested to invoke "git p4 submit --continue",
> an unimplemented option.
>
> While manually fixing the rejects and submitting the result might
> work, there are many steps that must be done to the job properly:
>
> * apply patch
> * invoke p4 add and delete
> * change executable bits
> * p4 sync -f renamed/copied files
> * extract commit message into p4 change description and
> move Jobs lines out of description section
> * set changelist owner for --preserve-user
>
> Plus the following manual sync/rebase will cause conflicts too,
> which must be resolved once again.
>
> Drop these workflows. Instead users should do a sync/rebase in
> git, fix the conflicts there, and do a clean "git p4 submit".
>
> Signed-off-by: Pete Wyckoff<pw@padd.com>
> ---
> git-p4.py | 20 ++------------------
> 1 file changed, 2 insertions(+), 18 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 2405f38..e08fea1 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -1200,9 +1200,8 @@ class P4Submit(Command, P4UserMap):
> if not patch_succeeded:
> print "What do you want to do?"
> response = "x"
> - while response != "s" and response != "a" and response != "w":
> - response = raw_input("[s]kip this patch / [a]pply the patch forcibly "
> - "and with .rej files / [w]rite the patch to a file (patch.txt) ")
> + while response != "s":
> + response = raw_input("[s]kip this patch ")
> if response == "s":
> print "Skipping! Good luck with the next patches..."
> for f in editedFiles:
> @@ -1210,21 +1209,6 @@ class P4Submit(Command, P4UserMap):
> for f in filesToAdd:
> os.remove(f)
> return False
> - elif response == "a":
> - os.system(applyPatchCmd)
> - if len(filesToAdd)> 0:
> - print "You may also want to call p4 add on the following files:"
> - print " ".join(filesToAdd)
> - if len(filesToDelete):
> - print "The following files should be scheduled for deletion with p4 delete:"
> - print " ".join(filesToDelete)
> - die("Please resolve and submit the conflict manually and "
> - + "continue afterwards with git p4 submit --continue")
> - elif response == "w":
> - system(diffcmd + "> patch.txt")
> - print "Patch saved to patch.txt in %s !" % self.clientPath
> - die("Please resolve and submit the conflict manually and "
> - "continue afterwards with git p4 submit --continue")
>
> system(applyPatchCmd)
>
next prev parent reply other threads:[~2012-09-15 21:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-09 20:16 [PATCHv2 00/12] git p4: submit conflict handling Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 01/12] git p4 test: remove bash-ism of combined export/assignment Pete Wyckoff
2012-09-15 21:25 ` Luke Diamand
2012-09-16 6:05 ` Junio C Hamano
2012-09-16 9:38 ` Luke Diamand
2012-09-17 4:50 ` Junio C Hamano
2012-09-17 8:13 ` Luke Diamand
2012-09-09 20:16 ` [PATCHv2 02/12] git p4: gracefully fail if some commits could not be applied Pete Wyckoff
2012-09-15 21:48 ` Luke Diamand
2012-09-09 20:16 ` [PATCHv2 03/12] git p4: remove submit failure options [a]pply and [w]rite Pete Wyckoff
2012-09-15 21:52 ` Luke Diamand [this message]
2012-09-09 20:16 ` [PATCHv2 04/12] git p4: move conflict prompt into run, add [q]uit input Pete Wyckoff
2012-09-15 21:56 ` Luke Diamand
2012-09-09 20:16 ` [PATCHv2 05/12] git p4: standardize submit cancel due to unchanged template Pete Wyckoff
2012-09-15 21:58 ` Luke Diamand
2012-09-09 20:16 ` [PATCHv2 06/12] git p4: test clean-up after failed submit, fix added files Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 07/12] git p4: rearrange submit template construction Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 08/12] git p4: revert deleted files after submit cancel Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 09/12] git p4: accept -v for --verbose Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 10/12] git p4: add submit --dry-run option Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 11/12] git p4: add submit --prepare-p4-only option Pete Wyckoff
2012-09-09 20:16 ` [PATCHv2 12/12] git-p4: add submit --conflict option and config varaiable Pete Wyckoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5054F893.3040704@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=pw@padd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).