Context Navigation

Changeset 281023 in webkit

Timestamp:

Aug 13, 2021, 10:24:16 AM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Fix SVN relative URL parsing
https://bugs.webkit.org/show_bug.cgi?id=229075
<rdar://problem/81868773>

Reviewed by Aakash Jain.

(Svn.branch): Check if relative URL path contains local path before stripping local path.

Location:

trunk/Tools

Files:

-              r281015
+              r281023
+-08-13  Jonathan Bedard  <jbedard@apple.com>
+        [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.
 -08-13  Lauro Moura  <lmoura@igalia.com>

r280864	r281023
30	30	setup(
31	31	name='webkitscmpy',
32		version='1.1.1',
	32	version='1.1.2',
33	33	description='Library designed to interact with git and svn repositories.',
34	34	long_description=readme(),

r280864	r281023
47	47	)
48	48
49		version = Version(1, 1, 1)
	49	version = Version(1, 1, 2)
50	50
51	51	AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

-              r280440
+              r281023
     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):

Note: See TracChangeset for help on using the changeset viewer.