Bug 183184 - [webkitpy] Remove concept of 'future' versions
Summary: [webkitpy] Remove concept of 'future' versions
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jonathan Bedard
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-02-27 15:01 PST by Jonathan Bedard
Modified: 2018-02-28 18:09 PST (History)
10 users (show)

See Also:


Attachments
Patch (16.96 KB, patch)
2018-02-27 15:07 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Patch (20.05 KB, patch)
2018-02-27 16:58 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Patch for landing (20.10 KB, patch)
2018-02-27 17:28 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Follow-up fix (3.67 KB, patch)
2018-02-28 11:26 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Follow-up fix 2 (4.64 KB, patch)
2018-02-28 17:09 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff
Patch (4.66 KB, patch)
2018-02-28 17:29 PST, Jonathan Bedard
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jonathan Bedard 2018-02-27 15:01:29 PST
Remove the idea of 'future' from Mac and iOS versions. Instead, use decrementing version numbers and inserted apple_additions() to handle this.
Comment 1 Radar WebKit Bug Importer 2018-02-27 15:03:45 PST
<rdar://problem/37958594>
Comment 2 Jonathan Bedard 2018-02-27 15:07:02 PST
Created attachment 334709 [details]
Patch
Comment 3 Jonathan Bedard 2018-02-27 16:58:36 PST
Created attachment 334715 [details]
Patch
Comment 4 Aakash Jain 2018-02-27 17:21:42 PST
Comment on attachment 334715 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=334715&action=review

> Tools/Scripts/webkitpy/port/mac.py:78
> +            while temp_version != self.CURRENT_VERSION:

This will become infinite loop if someone incorrectly set self._os_version.major to anything other than 10. Please add an assert to make sure that for macos major version is always 10.
Comment 5 Aakash Jain 2018-02-27 17:27:29 PST
Comment on attachment 334715 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=334715&action=review

Looks good.

> Tools/ChangeLog:3
> +        Remove concept of 'future'

Can make the bug title more descriptive, like "Remove concept of 'future' from TestExpectations".
Comment 6 Jonathan Bedard 2018-02-27 17:28:44 PST
Created attachment 334718 [details]
Patch for landing
Comment 7 WebKit Commit Bot 2018-02-27 18:06:03 PST
Comment on attachment 334718 [details]
Patch for landing

Clearing flags on attachment: 334718

Committed r229085: <https://trac.webkit.org/changeset/229085>
Comment 8 WebKit Commit Bot 2018-02-27 18:06:05 PST
All reviewed patches have been landed.  Closing bug.
Comment 9 Simon Fraser (smfr) 2018-02-27 18:20:32 PST
This bug could have had a more descriptive title.
Comment 10 Daniel Bates 2018-02-27 21:07:49 PST
(In reply to Simon Fraser (smfr) from comment #9)
> This bug could have had a more descriptive title.

You’re not the only one to point this out. It was pointed out in comment 5.
Comment 11 Aakash Jain 2018-02-28 07:43:17 PST
I think it was my oversight. I was doing over the shoulder code review with Jonathan and he incorporated all my verbal review comments. I commented about bug title here but forgot to tell Jonathan. He was using webkit-patch command to upload patch so probably didn't notice my bugzilla comment.
Comment 12 Jonathan Bedard 2018-02-28 11:26:05 PST
Reopening to attach new patch.
Comment 13 Jonathan Bedard 2018-02-28 11:26:06 PST
Created attachment 334753 [details]
Follow-up fix
Comment 14 Jonathan Bedard 2018-02-28 11:27:16 PST
(In reply to Jonathan Bedard from comment #13)
> Created attachment 334753 [details]
> Follow-up fix

Missed a non-obvious dependency on future in the factory.
Comment 15 David Kilzer (:ddkilzer) 2018-02-28 11:30:40 PST
Comment on attachment 334753 [details]
Follow-up fix

View in context: https://bugs.webkit.org/attachment.cgi?id=334753&action=review

r=me

> Tools/ChangeLog:9
> +        The factory also relies off of future in a non-obvious way.

Nit:  "off of" => "on"
Comment 16 Jonathan Bedard 2018-02-28 11:35:41 PST
Follow-up fix committed <https://trac.webkit.org/changeset/229099>.
Comment 17 Jonathan Bedard 2018-02-28 17:09:55 PST
Created attachment 334787 [details]
Follow-up fix 2
Comment 18 Jonathan Bedard 2018-02-28 17:29:40 PST
Created attachment 334789 [details]
Patch
Comment 19 WebKit Commit Bot 2018-02-28 18:09:44 PST
Comment on attachment 334789 [details]
Patch

Clearing flags on attachment: 334789

Committed r229116: <https://trac.webkit.org/changeset/229116>
Comment 20 WebKit Commit Bot 2018-02-28 18:09:45 PST
All reviewed patches have been landed.  Closing bug.