Skip to content

Commit

Permalink
Cherry-pick 263906@main (6aa59a4). rdar://109155059
Browse files Browse the repository at this point in the history
    [git-webkit] Don't redact bug title in commit message
    https://bugs.webkit.org/show_bug.cgi?id=256588
    rdar://109155059

    Reviewed by Chris Dumez.

    * Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
    * Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
    * Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/commit.py:
    (Commit.main): Stop scrubbing commit titles of redacted bugs.

    Canonical link: https://commits.webkit.org/263906@main

Canonical link: https://commits.webkit.org/259548.756@safari-7615-branch
  • Loading branch information
JonWBedard committed May 12, 2023
1 parent e7bdd0a commit f8d50fa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Tools/Scripts/libraries/webkitscmpy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def readme():

setup(
name='webkitscmpy',
version='6.4.4',
version='6.4.5',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Expand Down
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(6, 4, 4)
version = Version(6, 4, 5)

AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,7 @@ def main(cls, args, repository, command=None, representation=None, **kwargs):
additional_args += ['--amend']

env = os.environ
if issue and issue.redacted:
env['COMMIT_MESSAGE_TITLE'] = '*' * 20
else:
env['COMMIT_MESSAGE_TITLE'] = issue.title if issue else ''
env['COMMIT_MESSAGE_TITLE'] = issue.title if issue else ''
env['COMMIT_MESSAGE_BUG'] = '\n'.join(cls.bug_urls(issue))
return run(
[repository.executable(), 'commit', '--date=now'] + additional_args + args.args,
Expand Down

0 comments on commit f8d50fa

Please sign in to comment.