feat(cli): add --no-verify option to bypass git hooks during commit
This commit is contained in:
2 files changed
+40
-4
No files matched your search
@@ -53,6 +53,7 @@ def cli():
|
|||||||
default=True,
|
default=True,
|
||||||
help="Smartly group multiple file changes into one commit (disable to commit per-file)",
|
help="Smartly group multiple file changes into one commit (disable to commit per-file)",
|
||||||
)
|
)
|
||||||
|
@click.option("--no-verify", is_flag=True, help="Bypass git hooks when committing")
|
||||||
def generate(
|
def generate(
|
||||||
files: tuple,
|
files: tuple,
|
||||||
repo: str,
|
repo: str,
|
||||||
@@ -64,6 +65,7 @@ def generate(
|
|||||||
temperature: float,
|
temperature: float,
|
||||||
emoji: bool,
|
emoji: bool,
|
||||||
smart_group: bool,
|
smart_group: bool,
|
||||||
|
no_verify: bool,
|
||||||
):
|
):
|
||||||
"""Generate commit messages for staged changes"""
|
"""Generate commit messages for staged changes"""
|
||||||
try:
|
try:
|
||||||
@@ -131,14 +133,21 @@ def generate(
|
|||||||
# Assumes files are already staged; git commit -- <file> will include only that path
|
# Assumes files are already staged; git commit -- <file> will include only that path
|
||||||
for fp, msg in messages_by_file.items():
|
for fp, msg in messages_by_file.items():
|
||||||
ok, out, err, code = git_service.commit_paths_verbose(
|
ok, out, err, code = git_service.commit_paths_verbose(
|
||||||
msg, [fp], sign=sign
|
msg, [fp], sign=sign, no_verify=no_verify
|
||||||
)
|
)
|
||||||
if not ok:
|
if not ok:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
f"Failed to commit {fp}: {err or out or code}"
|
f"Failed to commit {fp}: {err or out or code}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
git_service.commit_changes(commit_message, sign=sign)
|
if no_verify:
|
||||||
|
ok, out, err, code = git_service.commit_verbose(
|
||||||
|
commit_message, sign=sign, no_verify=True
|
||||||
|
)
|
||||||
|
if not ok:
|
||||||
|
raise Exception(f"Failed to commit: {err or out or code}")
|
||||||
|
else:
|
||||||
|
git_service.commit_changes(commit_message, sign=sign)
|
||||||
progress.update(task, completed=True)
|
progress.update(task, completed=True)
|
||||||
|
|
||||||
if push:
|
if push:
|
||||||
|
|||||||
+29
-2
@@ -70,17 +70,19 @@ class GitService:
|
|||||||
files = self.get_staged_files() if staged else self.get_unstaged_files()
|
files = self.get_staged_files() if staged else self.get_unstaged_files()
|
||||||
return {file: self.get_diff(file, staged) for file in files}
|
return {file: self.get_diff(file, staged) for file in files}
|
||||||
|
|
||||||
def commit(self, message: str, sign: bool = False) -> bool:
|
def commit(self, message: str, sign: bool = False, no_verify: bool = False) -> bool:
|
||||||
"""Create a commit with the given message."""
|
"""Create a commit with the given message."""
|
||||||
args = ["commit"]
|
args = ["commit"]
|
||||||
if sign:
|
if sign:
|
||||||
args.append("-S")
|
args.append("-S")
|
||||||
|
if no_verify:
|
||||||
|
args.append("--no-verify")
|
||||||
args.extend(["-m", message])
|
args.extend(["-m", message])
|
||||||
stdout, stderr, returncode = self._run_git_command(args)
|
stdout, stderr, returncode = self._run_git_command(args)
|
||||||
return returncode == 0
|
return returncode == 0
|
||||||
|
|
||||||
def commit_verbose(
|
def commit_verbose(
|
||||||
self, message: str, sign: bool = False
|
self, message: str, sign: bool = False, no_verify: bool = False
|
||||||
) -> Tuple[bool, str, str, int]:
|
) -> Tuple[bool, str, str, int]:
|
||||||
"""Create a commit and return success and raw outputs.
|
"""Create a commit and return success and raw outputs.
|
||||||
|
|
||||||
@@ -90,10 +92,35 @@ class GitService:
|
|||||||
args = ["commit"]
|
args = ["commit"]
|
||||||
if sign:
|
if sign:
|
||||||
args.append("-S")
|
args.append("-S")
|
||||||
|
if no_verify:
|
||||||
|
args.append("--no-verify")
|
||||||
args.extend(["-m", message])
|
args.extend(["-m", message])
|
||||||
stdout, stderr, returncode = self._run_git_command(args)
|
stdout, stderr, returncode = self._run_git_command(args)
|
||||||
return returncode == 0, stdout, stderr, returncode
|
return returncode == 0, stdout, stderr, returncode
|
||||||
|
|
||||||
|
def commit_paths_verbose(
|
||||||
|
self,
|
||||||
|
message: str,
|
||||||
|
files: List[str],
|
||||||
|
sign: bool = False,
|
||||||
|
no_verify: bool = False,
|
||||||
|
) -> Tuple[bool, str, str, int]:
|
||||||
|
"""Create a commit including only the specified files.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
(ok, stdout, stderr, returncode)
|
||||||
|
"""
|
||||||
|
if not files:
|
||||||
|
return False, "", "no files specified", 1
|
||||||
|
args = ["commit"]
|
||||||
|
if sign:
|
||||||
|
args.append("-S")
|
||||||
|
if no_verify:
|
||||||
|
args.append("--no-verify")
|
||||||
|
args.extend(["-m", message, "--"] + list(files))
|
||||||
|
stdout, stderr, returncode = self._run_git_command(args)
|
||||||
|
return returncode == 0, stdout, stderr, returncode
|
||||||
|
|
||||||
def commit_paths_verbose(
|
def commit_paths_verbose(
|
||||||
self, message: str, files: List[str], sign: bool = False
|
self, message: str, files: List[str], sign: bool = False
|
||||||
) -> Tuple[bool, str, str, int]:
|
) -> Tuple[bool, str, str, int]:
|
||||||
|
|||||||
Reference in new issue
Block a user