Diff
Modified: trunk/Tools/ChangeLog (284965 => 284966)
--- trunk/Tools/ChangeLog 2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/ChangeLog 2021-10-28 00:31:42 UTC (rev 284966)
@@ -1,3 +1,17 @@
+2021-10-27 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitscmpy] Generate commit message template
+ https://bugs.webkit.org/show_bug.cgi?id=231023
+ <rdar://problem/83722871>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/git-webkit: Match repository base, not folder containing repository.
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py:
+ (Setup.git): Mark hook as executable.
+
2021-10-27 Alexey Proskuryakov <a...@apple.com>
AutoInstall should have separate install directories per CPU architecture
Modified: trunk/Tools/Scripts/git-webkit (284965 => 284966)
--- trunk/Tools/Scripts/git-webkit 2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/git-webkit 2021-10-28 00:31:42 UTC (rev 284966)
@@ -55,7 +55,7 @@
repository.executable(),
'config', 'merge.changelog.driver',
'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
- os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))),
+ os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))),
'Tools', 'Scripts', 'resolve-ChangeLogs',
)),
], capture_output=True, cwd=repository.root_path).returncode:
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/setup.py (284965 => 284966)
--- trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-10-28 00:31:42 UTC (rev 284966)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='2.2.17',
+ version='2.2.18',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (284965 => 284966)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-10-28 00:31:42 UTC (rev 284966)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(2, 2, 17)
+version = Version(2, 2, 18)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
Modified: trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (284965 => 284966)
--- trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2021-10-27 23:30:06 UTC (rev 284965)
+++ trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py 2021-10-28 00:31:42 UTC (rev 284966)
@@ -167,6 +167,7 @@
with open(target, 'w') as f:
f.write(contents)
f.write('\n')
+ os.chmod(target, 0o775)
log.warning('Setting git editor for {}...'.format(repository.root_path))
editor_name = 'default' if args.defaults else Terminal.choose(
