Skip to content
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

Jump to bottom

Bubble up error message #112

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Bubble up error message #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c67105a
Bubble up error message
dpr-0 Jan 28, 2024
20d5f69
Revert "Bubble up error message"
dpr-0 Feb 5, 2024
4ce1793
Bubble up error message
dpr-0 Feb 5, 2024
6b817ca
fix E501
dpr-0 Feb 5, 2024
7298c14
reformat
dpr-0 Feb 5, 2024
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
4 changes: 2 additions & 2 deletions cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,8 +803,8 @@ def cherry_pick_cli(
config=config,
chosen_config_path=chosen_config_path,
)
except InvalidRepoException:
click.echo(f"You're not inside a {config['repo']} repo right now! \U0001F645")
except InvalidRepoException as ire:
click.echo(ire.args[0])
sys.exit(-1)
except ValueError as exc:
ctx.fail(exc)
Expand Down
6 changes: 5 additions & 1 deletion cherry_picker/test_cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,11 @@ def test_is_cpython_repo(subprocess_check_output):

def test_is_not_cpython_repo():
# use default CPython sha to fail on this repo
with pytest.raises(InvalidRepoException):
with pytest.raises(
InvalidRepoException,
match=r"The sha listed in the branch name, "
r"\w+, is not present in the repository",
):
CherryPicker("origin", "22a594a0047d7706537ff2ac676cdc0f1dcb329c", ["3.6"])


Expand Down
Loading