Some user interaction with git-p4 is not as user-friendly as the rest of the Git ecosystem. Here are three areas that can be improved on: 1) When a patch fails and the user is prompted, there is no sanitization of the user input so for a "yes/no" question, if the user enters "YES" instead of a lowercase "y", they will be re-prompted to enter their answer. Commit 1 addresses this by sanitizing the user text by trimming and lowercasing their input before testing. Now "YES" will succeed! 2) Git can handle scraping the RCS Keyword expansions out of source files when it is preparing to submit them to P4. However, if the config value "git-p4.attemptRCSCleanup" isn't set, it will just report that it fails. Commit 2 adds a helpful suggestion, that the user might want to set git-p4.attemptRCSCleanup. 3) If the command line arguments are incorrect for git-p4, the program reports that there was a syntax error, but doesn't show what the correct syntax is. Commit 3 displays the context help for the failed command. Ben Keene (4): git-p4: yes/no prompts should sanitize user text git-p4: show detailed help when parsing options fail git-p4: wrap patchRCSKeywords test to revert changes on failure git-p4: failure because of RCS keywords should show help git-p4.py | 94 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 34 deletions(-) base-commit: ad05a3d8e5a6a06443836b5e40434262d992889a Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-675%2Fseraphire%2Fseraphire%2Fp4-usability-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-675/seraphire/seraphire/p4-usability-v3 Pull-Request: https://github.com/git/git/pull/675 Range-diff vs v2: 1: 527b7b8f8a ! 1: fff93acf44 git-p4: yes/no prompts should sanitize user text @@ -9,9 +9,12 @@ enters the full word "yes" or "no" or enters a capital "Y" the test will fail. - Create a new function, prompt(prompt_text, choices) where + Create a new function, prompt(prompt_text) where * promt_text is the text prompt for the user - * is a list of lower-case, single letter choices. + * choices are extracted from the prompt text [.] + a single letter surrounded by square brackets + is selected as a valid choice. + This new function must prompt the user for input and sanitize it by converting the response to a lower case string, trimming leading and trailing spaces, and checking if the first character is in the list @@ -19,6 +22,10 @@ Change the current references to raw_input() to use this new function. + Since the method requires the returned text to be one of the available + choices, remove the loop from the calling code that handles response + verification. + Signed-off-by: Ben Keene <seraphire@xxxxxxxxx> diff --git a/git-p4.py b/git-p4.py @@ -28,12 +35,16 @@ sys.stderr.write(msg + "\n") sys.exit(1) -+def prompt(prompt_text, choices = []): ++def prompt(prompt_text): + """ Prompt the user to choose one of the choices ++ ++ Choices are identified in the prompt_text by square brackets around ++ a single letter option. + """ ++ choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)) + while True: + response = raw_input(prompt_text).strip().lower() -+ if len(response) == 0: ++ if not response: + continue + response = response[0] + if response in choices: @@ -43,22 +54,73 @@ if verbose: sys.stderr.write('Writing pipe: %s\n' % str(c)) @@ + if os.stat(template_file).st_mtime > mtime: return True - while True: +- while True: - response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") -+ response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ", ["y", "n"]) - if response == 'y': - return True - if response == 'n': +- if response == 'y': +- return True +- if response == 'n': +- return False ++ response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") ++ if response == 'y': ++ return True ++ if response == 'n': ++ return False + + def get_diff_description(self, editedFiles, filesToAdd, symlinks): + # diff @@ - # prompt for what to do, or use the option/variable - if self.conflict_behavior == "ask": - print("What do you want to do?") + " --prepare-p4-only") + break + if i < last: +- quit = False +- while True: +- # prompt for what to do, or use the option/variable +- 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? ") -+ response = prompt("[s]kip this commit but apply" -+ " the rest, or [q]uit? ", ["s", "q"]) - if not response: - continue - elif self.conflict_behavior == "skip": +- if not response: +- continue +- elif self.conflict_behavior == "skip": +- response = "s" +- elif self.conflict_behavior == "quit": +- response = "q" +- else: +- die("Unknown conflict_behavior '%s'" % +- self.conflict_behavior) +- +- if response[0] == "s": +- print("Skipping this commit, but applying the rest") +- break +- if response[0] == "q": +- print("Quitting") +- quit = True +- break +- if quit: ++ # prompt for what to do, or use the option/variable ++ if self.conflict_behavior == "ask": ++ print("What do you want to do?") ++ response = prompt("[s]kip this commit but apply the rest, or [q]uit? ") ++ elif self.conflict_behavior == "skip": ++ response = "s" ++ elif self.conflict_behavior == "quit": ++ response = "q" ++ else: ++ die("Unknown conflict_behavior '%s'" % ++ self.conflict_behavior) ++ ++ if response == "s": ++ print("Skipping this commit, but applying the rest") ++ if response == "q": ++ print("Quitting") + break + + chdir(self.oldWorkingDirectory) +@@ + + if __name__ == '__main__': + main() ++ 2: 1d4f4e210b = 2: 5c5c981632 git-p4: show detailed help when parsing options fail 3: 20aa557193 = 3: c466e79148 git-p4: wrap patchRCSKeywords test to revert changes on failure 4: 50e9a175c3 ! 4: 00307c3951 git-p4: failure because of RCS keywords should show help @@ -23,7 +23,7 @@ + # 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: ++ if p4_keywords_regexp_for_file(file) is not 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 -- gitgitgadget
