git/git-p4.py, branch v2.26.3

git-p4: avoid leak of file handle when cloning

2020-01-30T20:21:13Z

Spotted by Eric Sunshine: https://public-inbox.org/git/CAPig+cRx3hG64nuDie69o_gdX39F=sR6D8LyA7J1rCErgu0aMA@mail.gmail.com/ Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: check for access to remote host earlier

2020-01-30T20:20:58Z

Check we can talk to the remote host before starting the git-fastimport subchild. Otherwise we fail to connect, and then exit, leaving git-fastimport still running since we did not wait() for it. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: cleanup better on error exit

2020-01-30T20:20:58Z

After an error, git-p4 calls die(). This just exits, and leaves child processes still running. Instead of calling die(), raise an exception and catch it where the child process(es) (git-fastimport) are created. This was analyzed in detail here: https://public-inbox.org/git/20190227094926.GE19739@szeder.dev/ This change does not address the particular issue of p4CmdList() invoking a subchild and not waiting for it on error. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: create helper function importRevisions()

2020-01-30T20:20:58Z

This makes it easier to try/catch around this block of code to ensure cleanup following p4 failures is handled properly. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: disable some pylint warnings, to get pylint output to something manageable

2020-01-30T20:20:58Z

pylint is incredibly useful for finding bugs, but git-p4 has never used it, so there are a lot of warnings that while important, don't actually result in bugs. Let's turn those off for now, so we can get some useful output. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: add P4CommandException to report errors talking to Perforce

2020-01-30T20:20:57Z

Currently when there is a P4 error, git-p4 calls die() which just exits. This then leaves the git-fast-import process still running, and can even leave p4 itself still running. As a result, git-p4 fails to exit cleanly. This is a particular problem for people running the unit tests in regression. Use this exception to report errors upwards, cleaning up as the error propagates. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

git-p4: make closeStreams() idempotent

2020-01-30T20:20:57Z

Ensure that we can safely call self.closeStreams() multiple times, and can also call it even if there is no git fast-import stream at all. Signed-off-by: Luke Diamand Signed-off-by: Junio C Hamano

Merge branch 'bk/p4-misc-usability'

2020-01-02T20:38:29Z

Miscellaneous small UX improvements on "git-p4". * bk/p4-misc-usability: git-p4: show detailed help when parsing options fail git-p4: yes/no prompts should sanitize user text

git-p4: show detailed help when parsing options fail

2019-12-16T20:32:13Z

When a user provides invalid parameters to git-p4, the program reports the failure but does not provide the correct command syntax. Add an exception handler to the command-line argument parser to display the command's specific command line parameter syntax when an exception is thrown. Rethrow the exception so the current behavior is retained. Signed-off-by: Ben Keene Signed-off-by: Junio C Hamano

git-p4: yes/no prompts should sanitize user text

2019-12-16T20:31:47Z

When prompting the user interactively for direction, the tests are not forgiving of user input format. For example, the first query asks for a yes/no response. If the user enters the full word "yes" or "no" or enters a capital "Y" the test will fail. Create a new function, prompt(prompt_text) where * prompt_text is the text prompt for the user * returns a single character where valid return values are found by inspecting prompt_text for single characters surrounded by square brackets 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 of choices. If it is, return the first letter. 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. Thanks-to: Denton Liu Signed-off-by: Ben Keene Signed-off-by: Junio C Hamano