Title: [281031] branches/safari-612.1.27.0-branch/Tools
- Revision
- 281031
- Author
- [email protected]
- Date
- 2021-08-13 13:14:07 -0700 (Fri, 13 Aug 2021)
Log Message
Cherry-pick r281023. rdar://problem/81868773
[webkitscmpy] Fix SVN relative URL parsing
https://bugs.webkit.org/show_bug.cgi?id=229075
<rdar://problem/81868773>
Reviewed by Aakash Jain.
* Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
(Svn.branch): Check if relative URL path contains local path before stripping local path.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.27.0-branch/Tools/ChangeLog (281030 => 281031)
--- branches/safari-612.1.27.0-branch/Tools/ChangeLog 2021-08-13 19:30:44 UTC (rev 281030)
+++ branches/safari-612.1.27.0-branch/Tools/ChangeLog 2021-08-13 20:14:07 UTC (rev 281031)
@@ -1,3 +1,33 @@
+2021-08-13 Alan Coon <[email protected]>
+
+ Cherry-pick r281023. rdar://problem/81868773
+
+ [webkitscmpy] Fix SVN relative URL parsing
+ https://bugs.webkit.org/show_bug.cgi?id=229075
+ <rdar://problem/81868773>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+ (Svn.branch): Check if relative URL path contains local path before stripping local path.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-13 Jonathan Bedard <[email protected]>
+
+ [webkitscmpy] Fix SVN relative URL parsing
+ https://bugs.webkit.org/show_bug.cgi?id=229075
+ <rdar://problem/81868773>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitscmpy/setup.py: Bump version.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
+ * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
+ (Svn.branch): Check if relative URL path contains local path before stripping local path.
+
2021-08-02 Peng Liu <[email protected]>
[GPUP] RemoteAudioSession::setPreferredBufferSize() does not change its preferredBufferSize
Modified: branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/setup.py (281030 => 281031)
--- branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-13 19:30:44 UTC (rev 281030)
+++ branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/setup.py 2021-08-13 20:14:07 UTC (rev 281031)
@@ -29,7 +29,7 @@
setup(
name='webkitscmpy',
- version='1.0.4',
+ version='1.1.2',
description='Library designed to interact with git and svn repositories.',
long_description=readme(),
classifiers=[
Modified: branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (281030 => 281031)
--- branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-13 19:30:44 UTC (rev 281030)
+++ branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py 2021-08-13 20:14:07 UTC (rev 281031)
@@ -46,7 +46,7 @@
"Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
)
-version = Version(1, 0, 4)
+version = Version(1, 1, 2)
AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
AutoInstall.register(Package('monotonic', Version(1, 5)))
Modified: branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py (281030 => 281031)
--- branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py 2021-08-13 19:30:44 UTC (rev 281030)
+++ branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py 2021-08-13 20:14:07 UTC (rev 281031)
@@ -264,9 +264,10 @@
@property
def branch(self):
local_path = self.path[len(self.root_path):]
- if local_path:
- return self.info()['Relative URL'][2:-len(local_path)]
- return self.info()['Relative URL'][2:]
+ relative_url = self.info()['Relative URL']
+ if local_path and relative_url.endswith(local_path):
+ return relative_url[2:-len(local_path)]
+ return relative_url[2:]
def list(self, category):
list_result = run([self.executable(), 'list', '^/{}'.format(category)], cwd=self.root_path, capture_output=True, encoding='utf-8')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
