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 05/12] git p4: standardize submit cancel due to unchanged template
Date: Sat, 15 Sep 2012 22:58:03 +0100 [thread overview]
Message-ID: <5054F9EB.7060708@diamand.org> (raw)
In-Reply-To: <1347221773-12773-6-git-send-email-pw@padd.com>
Ack.
On 09/09/12 21:16, Pete Wyckoff wrote:
> When editing the submit template, if no change was made to it,
> git p4 offers a prompt "Submit anyway?". Answering "no" cancels
> the submit.
>
> Previously, a "no" answer behaves like a "[s]kip" answer to the
> failed-patch prompt, in that it proceeded to try to apply the
> rest of the commits. Instead, put users back into the new
> "[s]kip / [c]ontinue" loop so that they can decide. This makes
> both cases of patch failure behave identically.
>
> The return code of git p4 after a "no" answer is now the same
> as that for a "skip" due to failed patch; update a test to
> understand this.
>
> Signed-off-by: Pete Wyckoff<pw@padd.com>
> ---
> git-p4.py | 4 +++-
> t/t9805-git-p4-skip-submit-edit.sh | 2 +-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/git-p4.py b/git-p4.py
> index 479f1fc..39fa2e1 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -1262,6 +1262,7 @@ class P4Submit(Command, P4UserMap):
>
> if self.edit_template(fileName):
> # read the edited message and submit
> + ret = True
> tmpFile = open(fileName, "rb")
> message = tmpFile.read()
> tmpFile.close()
> @@ -1285,6 +1286,7 @@ class P4Submit(Command, P4UserMap):
>
> else:
> # skip this patch
> + ret = False
> print "Submission cancelled, undoing p4 changes."
> for f in editedFiles:
> p4_revert(f)
> @@ -1293,7 +1295,7 @@ class P4Submit(Command, P4UserMap):
> os.remove(f)
>
> os.remove(fileName)
> - return True # success
> + return ret
>
> # Export git tags as p4 labels. Create a p4 label and then tag
> # with that.
> diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
> index fb3c8ec..ff2cc79 100755
> --- a/t/t9805-git-p4-skip-submit-edit.sh
> +++ b/t/t9805-git-p4-skip-submit-edit.sh
> @@ -38,7 +38,7 @@ test_expect_success 'no config, unedited, say no' '
> cd "$git"&&
> echo line>>file1&&
> git commit -a -m "change 3 (not really)"&&
> - printf "bad response\nn\n" | git p4 submit&&
> + printf "bad response\nn\n" | test_expect_code 1 git p4 submit&&
> p4 changes //depot/...>wc&&
> test_line_count = 2 wc
> )
next prev parent reply other threads:[~2012-09-15 21:58 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
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 [this message]
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=5054F9EB.7060708@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).