⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 281031 in webkit


Ignore:
Timestamp:
Aug 13, 2021, 1:14:07 PM (5 years ago)
Author:
Alan Coon
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

Location:
branches/safari-612.1.27.0-branch/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-612.1.27.0-branch/Tools/ChangeLog

    r280576 r281031  
     12021-08-13  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r281023. rdar://problem/81868773
     4
     5    [webkitscmpy] Fix SVN relative URL parsing
     6    https://bugs.webkit.org/show_bug.cgi?id=229075
     7    <rdar://problem/81868773>
     8   
     9    Reviewed by Aakash Jain.
     10   
     11    * Scripts/libraries/webkitscmpy/setup.py: Bump version.
     12    * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
     13    * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
     14    (Svn.branch): Check if relative URL path contains local path before stripping local path.
     15   
     16    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     17
     18    2021-08-13  Jonathan Bedard  <jbedard@apple.com>
     19
     20            [webkitscmpy] Fix SVN relative URL parsing
     21            https://bugs.webkit.org/show_bug.cgi?id=229075
     22            <rdar://problem/81868773>
     23
     24            Reviewed by Aakash Jain.
     25
     26            * Scripts/libraries/webkitscmpy/setup.py: Bump version.
     27            * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
     28            * Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:
     29            (Svn.branch): Check if relative URL path contains local path before stripping local path.
     30
    1312021-08-02  Peng Liu  <peng.liu6@apple.com>
    232

  • branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/setup.py

    r280483 r281031  
    3030setup(
    3131    name='webkitscmpy',
    32     version='1.0.4',
     32    version='1.1.2',
    3333    description='Library designed to interact with git and svn repositories.',
    3434    long_description=readme(),

  • branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

    r280483 r281031  
    4747    )
    4848
    49 version = Version(1, 0, 4)
     49version = Version(1, 1, 2)
    5050
    5151AutoInstall.register(Package('fasteners', Version(0, 15, 0)))

  • branches/safari-612.1.27.0-branch/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py

    r280440 r281031  
    265265    def branch(self):
    266266        local_path = self.path[len(self.root_path):]
    267         if local_path:
    268             return self.info()['Relative URL'][2:-len(local_path)]
    269         return self.info()['Relative URL'][2:]
     267        relative_url = self.info()['Relative URL']
     268        if local_path and relative_url.endswith(local_path):
     269            return relative_url[2:-len(local_path)]
     270        return relative_url[2:]
    270271
    271272    def list(self, category):
Note: See TracChangeset for help on using the changeset viewer.