From: Ben Keene <seraphire@xxxxxxxxx>
Issue: when prompting the user with raw_input, the tests are not forgiving of user input. For example, on the first query asks for a yes/no response. If the user enters the full word "yes" or "no" the test will fail. Additionally, offer the suggestion of setting git-p4.attemptRCSCleanup when applying a commit fails because of RCS keywords. Both of these changes are usability enhancement suggestions.
Change the code prompting the user for input to sanitize the user input before checking the response by asking the response as a lower case string, trimming leading/trailing spaces, and returning the first character.
Change the applyCommit() method that when applying a commit fails becasue of the P4 RCS Keywords, the user should consider setting git-p4.attemptRCSCleanup.
Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
(cherry picked from commit 1fab571664f5b6ad4ef321199f52615a32a9f8c7)
---
git-p4.py | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index f7c0ef0c53..f13e4645a3 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1909,7 +1909,8 @@ def edit_template(self, template_file):
return True
while True:
- response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
+ response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ").lower() \
+ .strip()[0]
if response == 'y':
return True
if response == 'n':
@@ -2069,8 +2070,23 @@ def applyCommit(self, id):
# disable the read-only bit on windows.
if self.isWindows and file not in editedFiles:
os.chmod(file, stat.S_IWRITE)
- self.patchRCSKeywords(file, kwfiles[file])
- fixed_rcs_keywords = True
+
+ try:
+ self.patchRCSKeywords(file, kwfiles[file])
+ fixed_rcs_keywords = True
+ except:
+ # We are throwing an exception, undo all open edits
+ for f in editedFiles:
+ p4_revert(f)
+ raise
+ else:
+ # They do not have attemptRCSCleanup set, this might be the fail point
+ # Check to see if the file has RCS keywords and suggest setting the property.
+ for file in editedFiles | filesToDelete:
+ if p4_keywords_regexp_for_file(file) != None:
+ print("At least one file in this commit has RCS Keywords that may be causing problems. ")
+ print("Consider:\ngit config git-p4.attemptRCSCleanup true")
+ break
if fixed_rcs_keywords:
print("Retrying the patch with RCS keywords cleaned up")
@@ -2481,7 +2497,7 @@ def run(self, args):
if self.conflict_behavior == "ask":
print("What do you want to do?")
response = raw_input("[s]kip this commit but apply"
- " the rest, or [q]uit? ")
+ " the rest, or [q]uit? ").lower().strip()[0]
if not response:
continue
elif self.conflict_behavior == "skip":
@@ -4327,7 +4343,12 @@ def main():
description = cmd.description,
formatter = HelpFormatter())
- (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+ try:
+ (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+ except:
+ parser.print_help()
+ raise
+
global verbose
verbose = cmd.verbose
if cmd.needsGit:
--
gitgitgadget
