| Message ID | 20201205014945.1502660-9-emilyshaffer@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | use config-based hooks (config-based hooks part | expand |
On 2020.12.04 17:49, Emily Shaffer wrote: > diff --git a/git-p4.py b/git-p4.py > index 6ae5bbfe99..73161a56d9 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -208,70 +208,18 @@ def decode_path(path): > > def run_git_hook(cmd, param=[]): > """Execute a hook if the hook exists.""" > - if verbose: > - sys.stderr.write("Looking for hook: %s\n" % cmd) > - sys.stderr.flush() > - > - hooks_path = gitConfig("core.hooksPath") > - if len(hooks_path) <= 0: > - hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks") > - > - if not isinstance(param, list): > - param=[param] > - > - # resolve hook file name, OS depdenent > - hook_file = os.path.join(hooks_path, cmd) > - if platform.system() == 'Windows': > - if not os.path.isfile(hook_file): > - # look for the file with an extension > - files = glob.glob(hook_file + ".*") > - if not files: > - return True > - files.sort() > - hook_file = files.pop() > - while hook_file.upper().endswith(".SAMPLE"): > - # The file is a sample hook. We don't want it > - if len(files) > 0: > - hook_file = files.pop() > - else: > - return True > - > - if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK): > + print('ESS: entering run_git_hook') Looks like a stray debug message here? > + if not cmd: > return True > > - return run_hook_command(hook_file, param) == 0 > - > -def run_hook_command(cmd, param): > - """Executes a git hook command > - cmd = the command line file to be executed. This can be > - a file that is run by OS association. > - > - param = a list of parameters to pass to the cmd command > - > - On windows, the extension is checked to see if it should > - be run with the Git for Windows Bash shell. If there > - is no file extension, the file is deemed a bash shell > - and will be handed off to sh.exe. Otherwise, Windows > - will be called with the shell to handle the file assocation. > - > - For non Windows operating systems, the file is called > - as an executable. > - """ > - cli = [cmd] + param > - use_shell = False > - if platform.system() == 'Windows': > - (root,ext) = os.path.splitext(cmd) > - if ext == "": > - exe_path = os.environ.get("EXEPATH") > - if exe_path is None: > - exe_path = "" > - else: > - exe_path = os.path.join(exe_path, "bin") > - cli = [os.path.join(exe_path, "SH.EXE")] + cli > - else: > - use_shell = True > - return subprocess.call(cli, shell=use_shell) > + """args are specified with -a <arg> -a <arg> -a <arg>""" > + args = (['git', 'hook', 'run'] + > + ["-a" + arg for arg in param] + > + [cmd]) > + print ('ESS: args:') Here as well. > + print (args) > > + return subprocess.call(args) == 0 > > def write_pipe(c, stdin): > if verbose: > -- > 2.28.0.rc0.142.g3c755180ce-goog >
On Tue, Dec 15, 2020 at 04:27:12PM -0800, Josh Steadmon wrote: > > On 2020.12.04 17:49, Emily Shaffer wrote: > > + print('ESS: entering run_git_hook') > > Looks like a stray debug message here? > ... > > + print ('ESS: args:') > > Here as well. :X Have fixed locally and will include with a new reroll this week. Oops. :) - Emily
diff --git a/git-p4.py b/git-p4.py index 6ae5bbfe99..73161a56d9 100755 --- a/git-p4.py +++ b/git-p4.py @@ -208,70 +208,18 @@ def decode_path(path): def run_git_hook(cmd, param=[]): """Execute a hook if the hook exists.""" - if verbose: - sys.stderr.write("Looking for hook: %s\n" % cmd) - sys.stderr.flush() - - hooks_path = gitConfig("core.hooksPath") - if len(hooks_path) <= 0: - hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks") - - if not isinstance(param, list): - param=[param] - - # resolve hook file name, OS depdenent - hook_file = os.path.join(hooks_path, cmd) - if platform.system() == 'Windows': - if not os.path.isfile(hook_file): - # look for the file with an extension - files = glob.glob(hook_file + ".*") - if not files: - return True - files.sort() - hook_file = files.pop() - while hook_file.upper().endswith(".SAMPLE"): - # The file is a sample hook. We don't want it - if len(files) > 0: - hook_file = files.pop() - else: - return True - - if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK): + print('ESS: entering run_git_hook') + if not cmd: return True - return run_hook_command(hook_file, param) == 0 - -def run_hook_command(cmd, param): - """Executes a git hook command - cmd = the command line file to be executed. This can be - a file that is run by OS association. - - param = a list of parameters to pass to the cmd command - - On windows, the extension is checked to see if it should - be run with the Git for Windows Bash shell. If there - is no file extension, the file is deemed a bash shell - and will be handed off to sh.exe. Otherwise, Windows - will be called with the shell to handle the file assocation. - - For non Windows operating systems, the file is called - as an executable. - """ - cli = [cmd] + param - use_shell = False - if platform.system() == 'Windows': - (root,ext) = os.path.splitext(cmd) - if ext == "": - exe_path = os.environ.get("EXEPATH") - if exe_path is None: - exe_path = "" - else: - exe_path = os.path.join(exe_path, "bin") - cli = [os.path.join(exe_path, "SH.EXE")] + cli - else: - use_shell = True - return subprocess.call(cli, shell=use_shell) + """args are specified with -a <arg> -a <arg> -a <arg>""" + args = (['git', 'hook', 'run'] + + ["-a" + arg for arg in param] + + [cmd]) + print ('ESS: args:') + print (args) + return subprocess.call(args) == 0 def write_pipe(c, stdin): if verbose:
Instead of duplicating the behavior of run-command.h:run_hook_le() in Python, we can directly call 'git hook run'. As a bonus, this means git-p4 learns how to find hook specifications from the Git config as well as from the hookdir. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> --- Notes: Maybe there is a better way to do this - I had a hard time getting this to run locally, and Python is not my forte, so if anybody has a better approach I'd love to just take that patch instead :) git-p4.py | 70 +++++++------------------------------------------------ 1 file changed, 9 insertions(+), 61 deletions(-)