From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pete Wyckoff Subject: [PATCHv2 05/12] git p4: standardize submit cancel due to unchanged template Date: Sun, 9 Sep 2012 16:16:06 -0400 Message-ID: <1347221773-12773-6-git-send-email-pw@padd.com> References: <1347221773-12773-1-git-send-email-pw@padd.com> Cc: Junio C Hamano , Luke Diamand , Johannes Sixt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Sep 09 22:18:05 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TAnxF-0004bx-0z for gcvg-git-2@plane.gmane.org; Sun, 09 Sep 2012 22:18:05 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754790Ab2IIUR5 (ORCPT ); Sun, 9 Sep 2012 16:17:57 -0400 Received: from honk.padd.com ([74.3.171.149]:52998 "EHLO honk.padd.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752589Ab2IIUR5 (ORCPT ); Sun, 9 Sep 2012 16:17:57 -0400 Received: from arf.padd.com (unknown [50.55.149.165]) by honk.padd.com (Postfix) with ESMTPSA id AC19D5AF2; Sun, 9 Sep 2012 13:17:56 -0700 (PDT) Received: by arf.padd.com (Postfix, from userid 7770) id 24C9332112; Sun, 9 Sep 2012 16:17:54 -0400 (EDT) X-Mailer: git-send-email 1.7.12.176.gc22bed1 In-Reply-To: <1347221773-12773-1-git-send-email-pw@padd.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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 ) -- 1.7.12.rc2.111.g96f7c73