From: Ben Keene <seraphire@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Ben Keene via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 2/5] git-p4: create new function run_git_hook
Date: Mon, 10 Feb 2020 14:03:08 -0500 [thread overview]
Message-ID: <2ab5f3cf-51f4-21d9-5741-0ec53f3035dd@gmail.com> (raw)
In-Reply-To: <xmqqo8ubec4n.fsf@gitster-ct.c.googlers.com>
On 2/6/2020 2:42 PM, Junio C Hamano wrote:
> "Ben Keene via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> +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).
Looking back through the original discussion, I see that it was decided that
the application uses "rev-parse --git-dir" and "rev-parse --show-cdup"
to find
the top directory of the git repo. At least for testing, being able to
resolve
the .git directory directly is useful. I will modify the code to throw an
exception if neither GIT_DIR or .git resolve correctly.
>
>> + 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 = True
> Please ask somebody familiar with Windows to review this "if
> Windows" and the other one in run_git_hook().
>
>> + 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())
next prev parent reply other threads:[~2020-02-10 19:03 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 21:17 [PATCH] git-p4: Add hook p4-pre-pedit-changelist Ben Keene via GitGitGadget
2020-01-21 23:05 ` Junio C Hamano
2020-01-29 10:13 ` Luke Diamand
2020-01-29 19:05 ` Junio C Hamano
2020-01-29 21:23 ` Luke Diamand
2020-01-30 1:37 ` Junio C Hamano
2020-01-30 14:20 ` Ben Keene
2020-01-30 18:39 ` Junio C Hamano
2020-01-30 1:51 ` Bryan Turner
2020-01-30 13:45 ` Ben Keene
2020-01-31 21:58 ` [PATCH v2 0/4] git-p4: add hook p4-pre-edit-changelist Ben Keene via GitGitGadget
2020-01-31 21:58 ` [PATCH v2 1/4] git-p4: rewrite prompt to be Windows compatible Ben Keene via GitGitGadget
2020-01-31 21:58 ` [PATCH v2 2/4] git-p4: create new method gitRunHook Ben Keene via GitGitGadget
2020-02-04 20:40 ` Junio C Hamano
2020-02-05 19:56 ` Ben Keene
2020-02-05 21:42 ` Junio C Hamano
2020-02-06 14:00 ` Ben Keene
2020-02-06 18:26 ` Junio C Hamano
2020-01-31 21:58 ` [PATCH v2 3/4] git-p4: add hook p4-pre-edit-changelist Ben Keene via GitGitGadget
2020-01-31 21:58 ` [PATCH v2 4/4] git-p4: add p4 submit hooks Ben Keene via GitGitGadget
2020-02-04 20:50 ` Junio C Hamano
2020-02-06 15:15 ` [PATCH v3 0/5] git-p4: add hook p4-pre-edit-changelist Ben Keene via GitGitGadget
2020-02-06 15:15 ` [PATCH v3 1/5] git-p4: rewrite prompt to be Windows compatible Ben Keene via GitGitGadget
2020-02-06 19:28 ` Junio C Hamano
2020-02-10 15:49 ` Ben Keene
2020-02-06 15:15 ` [PATCH v3 2/5] git-p4: create new function run_git_hook Ben Keene via GitGitGadget
2020-02-06 19:42 ` Junio C Hamano
2020-02-10 19:03 ` Ben Keene [this message]
2020-02-06 15:15 ` [PATCH v3 3/5] git-p4: add --no-verify option Ben Keene via GitGitGadget
2020-02-06 19:42 ` Junio C Hamano
2020-02-10 16:21 ` Ben Keene
2020-02-06 15:15 ` [PATCH v3 4/5] git-p4: restructure code in submit Ben Keene via GitGitGadget
2020-02-06 15:15 ` [PATCH v3 5/5] git-p4: add p4 submit hooks Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 0/6] git-p4: add hooks for p4-changelist Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 1/6] git-p4: rewrite prompt to be Windows compatible Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 2/6] git-p4: create new function run_git_hook Ben Keene via GitGitGadget
2020-02-10 22:24 ` Junio C Hamano
2020-02-10 22:06 ` [PATCH v4 3/6] git-p4: add --no-verify option Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 4/6] git-p4: restructure code in submit Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 5/6] git-p4: add p4 submit hooks Ben Keene via GitGitGadget
2020-02-10 22:06 ` [PATCH v4 6/6] git-4: add RCS keyword status message Ben Keene via GitGitGadget
2020-02-11 18:57 ` [PATCH v5 0/7] git-p4: add hooks for p4-changelist Ben Keene via GitGitGadget
2020-02-11 18:57 ` [PATCH v5 1/7] git-p4: rewrite prompt to be Windows compatible Ben Keene via GitGitGadget
2020-02-11 18:57 ` [PATCH v5 2/7] git-p4: create new function run_git_hook Ben Keene via GitGitGadget
2020-02-11 18:58 ` [PATCH v5 3/7] git-p4: add p4-pre-submit exit text Ben Keene via GitGitGadget
2020-02-11 18:58 ` [PATCH v5 4/7] git-p4: add --no-verify option Ben Keene via GitGitGadget
2020-02-11 18:58 ` [PATCH v5 5/7] git-p4: restructure code in submit Ben Keene via GitGitGadget
2020-02-11 18:58 ` [PATCH v5 6/7] git-p4: add p4 submit hooks Ben Keene via GitGitGadget
2020-02-11 18:58 ` [PATCH v5 7/7] git-p4: add RCS keyword status message Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 0/7] git-p4: add hooks for p4-changelist Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 1/7] git-p4: rewrite prompt to be Windows compatible Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 2/7] git-p4: create new function run_git_hook Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 3/7] git-p4: add p4-pre-submit exit text Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 4/7] git-p4: add --no-verify option Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 5/7] git-p4: restructure code in submit Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 6/7] git-p4: add p4 submit hooks Ben Keene via GitGitGadget
2020-02-14 14:44 ` [PATCH v6 7/7] git-p4: add RCS keyword status message Ben Keene via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2ab5f3cf-51f4-21d9-5741-0ec53f3035dd@gmail.com \
--to=seraphire@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).