Re: [PATCH v3 2/5] git-p4: create new function run_git_hook
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 6, 2020, 19:42 UTC
- Message-ID
- <xmqqo8ubec4n.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <85918a7edb6482cc1c555917075f8cfd2f18ba32.1581002149.git.gitgitgadget@gmail.com>
"Ben Keene via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 9 quoted lines
> +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.get("GIT_DIR", ".git"), "hooks")Using the .get() with default is misleading, I think (see an earlier reply).
Show 48 quoted lines
> + 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[0]
> +
> + if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK):
> + 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 = TruePlease ask somebody familiar with Windows to review this "if Windows" and the other one in run_git_hook().
Show 14 quoted lines
> + return subprocess.call(cli, shell=use_shell)
> +
> +
> def write_pipe(c, stdin):
> if verbose:
> sys.stderr.write('Writing pipe: %s\n' % str(c))
> @@ -4125,7 +4187,6 @@ def printUsage(commands):
> "unshelve" : P4Unshelve,
> }
>
> -
> def main():
> if len(sys.argv[1:]) == 0:
> printUsage(commands.keys())