Changeset 267895 in webkit
- Timestamp:
- Oct 2, 2020 1:44:34 PM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r267892 r267895 1 2020-10-02 Jonathan Bedard <jbedard@apple.com> 2 3 [webkitscmpy] Remove "i" from canonical identifier 4 https://bugs.webkit.org/show_bug.cgi?id=217238 5 <rdar://problem/69888017> 6 7 Reviewed by Dewei Zhu. 8 9 * Scripts/libraries/webkitscmpy/webkitscmpy/commit.py: 10 (Commit): 11 (Commit.pretty_print): Remove "i" from canonical identifier, add branch point. 12 (Commit.__repr__): Remove "i" from canonical identifier. 13 * Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py: 14 (TestCommit.test_parse_revision): 15 (TestCommit.test_parse_identifier): 16 (TestCommit.test_parse): 17 (TestCommit.test_pretty_print): 18 1 19 2020-10-02 Philippe Normand <pnormand@igalia.com> 2 20 -
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
r267853 r267895 47 47 ) 48 48 49 version = Version(0, 0, 7)49 version = Version(0, 0, 8) 50 50 51 51 from webkitscmpy.contributor import Contributor -
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/commit.py
r267815 r267895 31 31 HASH_RE = re.compile(r'^[a-f0-9A-F]+$') 32 32 REVISION_RE = re.compile(r'^[Rr]?(?P<revision>\d+)$') 33 IDENTIFIER_RE = re.compile(r'^ [Ii]?((?P<branch_point>\d+)\.)?(?P<identifier>-?\d+)(@(?P<branch>\S+))?$')33 IDENTIFIER_RE = re.compile(r'^((?P<branch_point>\d+)\.)?(?P<identifier>-?\d+)(@(?P<branch>\S+))?$') 34 34 NUMBER_RE = re.compile(r'^-?\d*$') 35 35 … … 196 196 result += '\n' 197 197 if self.identifier: 198 result += ' identifier: i{}'.format(self.identifier)199 if self. identifier:198 result += ' identifier: {}'.format(self.identifier) 199 if self.branch: 200 200 result += ' on {}'.format(self.branch) 201 if self.branch_point: 202 result += ' branched from {}'.format(self.branch_point) 201 203 result += '\n' 202 204 if self.author: … … 214 216 def __repr__(self): 215 217 if self.branch_point and self.identifier and self.branch: 216 return ' i{}.{}@{}'.format(self.branch_point, self.identifier, self.branch)218 return '{}.{}@{}'.format(self.branch_point, self.identifier, self.branch) 217 219 if self.identifier and self.branch: 218 return ' i{}@{}'.format(self.identifier, self.branch)220 return '{}@{}'.format(self.identifier, self.branch) 219 221 if self.revision: 220 222 return 'r{}'.format(self.revision) … … 222 224 return self.hash[:12] 223 225 if self.identifier: 224 return 'i{}'.format(self.identifier)226 return str(self.identifier) 225 227 raise ValueError('Incomplete commit format') 226 228 -
trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/commit_unittest.py
r267815 r267895 47 47 self.assertEqual(266896, Commit._parse_revision(266896)) 48 48 49 self.assertEqual(None, Commit._parse_revision('i1234'))50 49 self.assertEqual(None, Commit._parse_revision('c3bd784f8b88bd03')) 51 50 self.assertEqual(None, Commit._parse_revision('0')) … … 55 54 56 55 def test_parse_identifier(self): 57 self.assertEqual((None, 1234, None), Commit._parse_identifier('i1234'))58 self.assertEqual((None, 1234, None), Commit._parse_identifier('I1234'))59 56 self.assertEqual((None, 1234, None), Commit._parse_identifier('1234')) 60 57 self.assertEqual((None, 1234, None), Commit._parse_identifier(1234)) 61 58 62 self.assertEqual((None, 1234, 'main'), Commit._parse_identifier('i1234@main'))63 self.assertEqual((None, 1234, 'main'), Commit._parse_identifier('I1234@main'))64 59 self.assertEqual((None, 1234, 'main'), Commit._parse_identifier('1234@main')) 65 66 self.assertEqual((None, 1234, 'eng/bug'), Commit._parse_identifier('i1234@eng/bug'))67 self.assertEqual((None, 1234, 'eng/bug'), Commit._parse_identifier('I1234@eng/bug'))68 60 self.assertEqual((None, 1234, 'eng/bug'), Commit._parse_identifier('1234@eng/bug')) 69 70 self.assertEqual((1234, 1, 'eng/bug'), Commit._parse_identifier('i1234.1@eng/bug'))71 self.assertEqual((1234, 1, 'eng/bug'), Commit._parse_identifier('I1234.1@eng/bug'))72 61 self.assertEqual((1234, 1, 'eng/bug'), Commit._parse_identifier('1234.1@eng/bug')) 73 62 … … 75 64 self.assertEqual((None, -1, None), Commit._parse_identifier('-1')) 76 65 77 self.assertEqual((None, 0, 'eng/bug'), Commit._parse_identifier('i0@eng/bug'))78 self.assertEqual((None, 0, 'eng/bug'), Commit._parse_identifier('I0@eng/bug'))79 66 self.assertEqual((None, 0, 'eng/bug'), Commit._parse_identifier('0@eng/bug')) 80 81 self.assertEqual((None, -1, 'eng/bug'), Commit._parse_identifier('i-1@eng/bug'))82 self.assertEqual((None, -1, 'eng/bug'), Commit._parse_identifier('I-1@eng/bug'))83 67 self.assertEqual((None, -1, 'eng/bug'), Commit._parse_identifier('-1@eng/bug')) 84 68 85 self.assertEqual(None, Commit._parse_identifier(' i1234-invalid'))69 self.assertEqual(None, Commit._parse_identifier('1234-invalid')) 86 70 self.assertEqual(None, Commit._parse_identifier('r266896')) 87 71 self.assertEqual(None, Commit._parse_identifier('c3bd784f8b88bd03')) … … 89 73 90 74 def test_parse(self): 91 self.assertEqual(Commit.parse('i123@main'), Commit(identifier=123, branch='main')) 92 self.assertEqual(Commit.parse('i123'), Commit(identifier=123)) 75 self.assertEqual(Commit.parse('123@main'), Commit(identifier=123, branch='main')) 93 76 self.assertEqual(Commit.parse('123'), Commit(identifier=123)) 94 77 … … 103 86 self.assertEqual( 104 87 Commit( 105 identifier=' i123@master',88 identifier='123@master', 106 89 hash='c3bd784f8b88bd03f64467ddd3304ed8be28acbe', 107 90 author=Contributor('Jonathan Bedard', ['jbedard@apple.com']), 108 91 message='NOT PRINTED', 109 92 ).pretty_print(), 110 ''' i123@master93 '''123@master 111 94 git hash: c3bd784f8b88 on master 112 identifier: i123 on master95 identifier: 123 on master 113 96 by Jonathan Bedard <jbedard@apple.com> 114 97 ''', … … 117 100 self.assertEqual( 118 101 Commit( 119 identifier=' i123@trunk',102 identifier='123@trunk', 120 103 revision='r123', 121 104 author=Contributor('Jonathan Bedard', ['jbedard@apple.com']), … … 123 106 message='NOT PRINTED', 124 107 ).pretty_print(), 125 ''' i123@trunk108 '''123@trunk 126 109 SVN revision: r123 on trunk 127 identifier: i123 on trunk110 identifier: 123 on trunk 128 111 by Jonathan Bedard <jbedard@apple.com> @ {} 129 112 '''.format(datetime.utcfromtimestamp(1000)), … … 132 115 self.assertEqual( 133 116 Commit( 134 identifier='i123@trunk', 117 identifier='123.1@branch-a', 118 revision='r124', 119 author=Contributor('Jonathan Bedard', ['jbedard@apple.com']), 120 timestamp=1000, 121 message='NOT PRINTED', 122 ).pretty_print(), 123 '''123.1@branch-a 124 SVN revision: r124 on branch-a 125 identifier: 1 on branch-a branched from 123 126 by Jonathan Bedard <jbedard@apple.com> @ {} 127 '''.format(datetime.utcfromtimestamp(1000)), 128 ) 129 130 self.assertEqual( 131 Commit( 132 identifier='123@trunk', 135 133 revision='r123', 136 134 author=Contributor('Jonathan Bedard', ['jbedard@apple.com']), … … 138 136 message='PRINTED\n', 139 137 ).pretty_print(message=True), 140 ''' i123@trunk138 '''123@trunk 141 139 SVN revision: r123 on trunk 142 identifier: i123 on trunk140 identifier: 123 on trunk 143 141 by Jonathan Bedard <jbedard@apple.com> @ {} 144 142 … … 148 146 149 147 def test_repr(self): 150 self.assertEqual(str(Commit(identifier=123, branch='main')), ' i123@main')151 self.assertEqual(str(Commit(branch_point=1234, identifier=1, branch='eng/1234')), ' i1234.1@eng/1234')152 self.assertEqual(str(Commit(identifier=123)), ' i123')148 self.assertEqual(str(Commit(identifier=123, branch='main')), '123@main') 149 self.assertEqual(str(Commit(branch_point=1234, identifier=1, branch='eng/1234')), '1234.1@eng/1234') 150 self.assertEqual(str(Commit(identifier=123)), '123') 153 151 154 152 self.assertEqual(str(Commit(revision=123)), 'r123')
Note: See TracChangeset
for help on using the changeset viewer.