Skip to content

Adds the option to stash uncommitted changes before submitting PRs #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ZolotukhinM merged 2 commits into from
Feb 19, 2025
Merged

Adds the option to stash uncommitted changes before submitting PRs #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0a921
Adds the option to stash uncommitted changes before submitting PRs
kernhanda Feb 17, 2025
6662ea5
fixed
kernhanda Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ Options:
- `-d, --draft`: Submit PRs in draft mode (default: false)
- `--draft-bitmask`: Bitmask for setting draft status per PR
- `--reviewer`: List of reviewers for the PRs (default: from $STACK_PR_DEFAULT_REVIEWER or config)
- `-s, --stash`: Stash all uncommitted changes before submitting the PR

#### land

Expand Down Expand Up @@ -297,6 +298,7 @@ verbose=True
hyperlinks=True
draft=False
keep_body=False
stash=False
[repo]
remote=origin
target=main
Expand Down
13 changes: 13 additions & 0 deletions src/stack_pr/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,13 @@ def create_argparser(
),
help="List of reviewers for the PR",
)
parser_submit.add_argument(
"-s",
"--stash",
action="store_true",
default=config.getboolean("common", "stash", fallback=False),
help="Stash all uncommited changes before submitting the PR",
)

subparsers.add_parser(
"land",
Expand Down Expand Up @@ -1363,6 +1370,9 @@ def main():
current_branch = get_current_branch_name()
get_branch_name_base(common_args.branch_name_template)
try:
if args.stash:
run_shell_command(["git", "stash", "save"], quiet=not common_args.verbose)

if args.command != "view" and not is_repo_clean():
error(ERROR_REPO_DIRTY)
return
Expand Down Expand Up @@ -1392,6 +1402,9 @@ def main():
if isinstance(exc, SubprocessError):
print_cmd_failure_details(exc)
raise
finally:
if args.stash:
run_shell_command(["git", "stash", "pop"], quiet=not common_args.verbose)


if __name__ == "__main__":
Expand Down