Attachment 422847 Details for Bug 223031 – Patch

[patch] Patch

bug-223031-20210310105101.patch (text/plain), 4.34 KB, created by Jonathan Bedard on 2021-03-10 10:51:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2021-03-10 10:51:02 PST

Size: 4.34 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 274219)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2021-03-10  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [git-webkit] Make identifier last string in 'find'
>+        https://bugs.webkit.org/show_bug.cgi?id=223031
>+        <rdar://problem/75272100>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/libraries/webkitscmpy/setup.py: Bump version.
>+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
>+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/find.py:
>+        (Info.main):
>+        * Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py:
>+
> 2021-03-10  Sam Sneddon  <gsnedders@apple.com>
> 
>         Mark myself as a committer.
>Index: Tools/Scripts/libraries/webkitscmpy/setup.py
>===================================================================
>--- Tools/Scripts/libraries/webkitscmpy/setup.py	(revision 274215)
>+++ Tools/Scripts/libraries/webkitscmpy/setup.py	(working copy)
>@@ -29,7 +29,7 @@ def readme():
> 
> setup(
>     name='webkitscmpy',
>-    version='0.13.0',
>+    version='0.13.1',
>     description='Library designed to interact with git and svn repositories.',
>     long_description=readme(),
>     classifiers=[
>Index: Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
>===================================================================
>--- Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	(revision 274215)
>+++ Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py	(working copy)
>@@ -46,7 +46,7 @@ except ImportError:
>         "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
>     )
> 
>-version = Version(0, 13, 0)
>+version = Version(0, 13, 1)
> 
> AutoInstall.register(Package('fasteners', Version(0, 15, 0)))
> AutoInstall.register(Package('monotonic', Version(1, 5)))
>Index: Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/find.py
>===================================================================
>--- Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/find.py	(revision 274215)
>+++ Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/find.py	(working copy)
>@@ -85,12 +85,12 @@ class Info(Command):
>         if commit.message:
>             print(u'Title: {}'.format(commit.message.splitlines()[0]))
>         print(u'Author: {}'.format(commit.author))
>-        print(u'Identifier: {}'.format(commit))
>         print(datetime.fromtimestamp(commit.timestamp).strftime('Date: %a %b %d %H:%M:%S %Y'))
>         if args.verbose > 0 or commit.revision:
>             print('Revision: {}'.format(commit.revision or 'N/A'))
>         if args.verbose > 0 or commit.hash:
>             print('Hash: {}'.format(commit.hash[:Commit.HASH_LABEL_SIZE] if commit.hash else 'N/A'))
>+        print(u'Identifier: {}'.format(commit))
> 
>         if args.verbose > 0:
>             for line in commit.message.splitlines():
>Index: Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py
>===================================================================
>--- Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py	(revision 274215)
>+++ Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/find_unittest.py	(working copy)
>@@ -136,10 +136,10 @@ class TestFind(unittest.TestCase):
>             captured.stdout.getvalue(),
>             '''Title: 4th commit
> Author: Jonathan Bedard <jbedard@apple.com>
>-Identifier: 3@main
> Date: {}
> Revision: 4
> Hash: 1abe25b443e9
>+Identifier: 3@main
> '''.format(datetime.fromtimestamp(1601663000).strftime('%a %b %d %H:%M:%S %Y')),
>         )
> 
>@@ -153,10 +153,10 @@ Hash: 1abe25b443e9
>             captured.stdout.getvalue(),
>             '''Title: 4th commit
> Author: Jonathan Bedard <jbedard@apple.com>
>-Identifier: 3@main
> Date: {}
> Revision: 4
> Hash: 1abe25b443e9
>+Identifier: 3@main
>     4th commit
>     svn-id: https://svn.example.org/repository/repository/trunk@4 268f45cc-cd09-0410-ab3c-d52691b4dbfc
> '''.format(datetime.fromtimestamp(1601663000).strftime('%a %b %d %H:%M:%S %Y')),
>@@ -228,9 +228,9 @@ Hash: 1abe25b443e9
>             captured.stdout.getvalue(),
>             '''Title: 4th commit
> Author: jbedard@apple.com <jbedard@apple.com>
>-Identifier: 3@trunk
> Date: {}
> Revision: 4
>+Identifier: 3@trunk
> '''.format(datetime.fromtimestamp(1601686700).strftime('%a %b %d %H:%M:%S %Y')),
>         )
>

Actions: View | Formatted Diff | Diff

Attachments on bug 223031: 422847