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

[git-webkit] Prefer radar over bugzilla when cherry-picking #5243

Merged
merged 1 commit into from
Oct 11, 2022
Merged

[git-webkit] Prefer radar over bugzilla when cherry-picking #5243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion Tools/Scripts/libraries/webkitscmpy/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def readme():

setup(
name='webkitscmpy',
version='5.6.16',
version='5.6.17',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def _maybe_add_webkitcorepy_path():
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)

version = Version(5, 6, 16)
version = Version(5, 6, 17)

AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Expand Down
12 changes: 10 additions & 2 deletions Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/cherry_pick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from .branch import Branch
from .command import Command
from webkitbugspy import Tracker
from webkitbugspy import Tracker, radar
from webkitcorepy import run
from webkitscmpy import local

Expand Down Expand Up @@ -52,14 +52,22 @@ def main(cls, args, repository, **kwargs):
return 1

try:
commit = repository.find(args.argument[0], include_log=False)
commit = repository.find(args.argument[0], include_log=True)
except (local.Scm.Exception, TypeError, ValueError) as exception:
# ValueErrors and Scm exceptions usually contain enough information to be displayed
# to the user as an error
sys.stderr.write(str(exception) + '\n')
return 1

issue = Tracker.from_string(args.issue) if args.issue else None
if not issue and commit.issues:
issue = commit.issues[0]
if radar.Tracker.radarclient():
for candidate in commit.issues:
if isinstance(candidate.tracker, radar.Tracker):
issue = candidate
break

if str(commit) == commit.hash[:commit.HASH_LABEL_SIZE]:
cherry_pick_string = str(commit)
else:
Expand Down