Bug 74257 – [Refactoring] In prepare-ChangeLog, move top-level code to resolve conflicted ChangeLogs into a method

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Kentaro Hara]

We are planning to write unit-tests for prepare-ChangeLog in a run-leaks_unittest/ manner. This bug is one of the incremental refactorings to remove all top-level code and global variables from prepare-ChangeLog.

[Kentaro Hara]

Created attachment 118716 [details]
Patch

[Ryosuke Niwa]

Comment on attachment 118716 [details]
Patch

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

> Tools/ChangeLog:13
> +        * Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs into resolveConflictedChangeLogs().

This line seems too long. Please add line breaks as needed.

> Tools/Scripts/prepare-ChangeLog:458
> +    if (@conflictedChangeLogs) {

It seems like we can exit early here.

[Kentaro Hara]

Created attachment 118728 [details]
rebased patch for commit

[Kentaro Hara]

(In reply to comment #2)
> (From update of attachment 118716 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=118716&action=review
> 
> > Tools/ChangeLog:13
> > +        * Scripts/prepare-ChangeLog: Moved top-level code to get the latest ChangeLogs into getLatestChangeLogs(), and moved top-level code to resolve conflicted ChangeLogs into resolveConflictedChangeLogs().
> 
> This line seems too long. Please add line breaks as needed.

Done.

> > Tools/Scripts/prepare-ChangeLog:458
> > +    if (@conflictedChangeLogs) {
> 
> It seems like we can exit early here.

Done.

[WebKit Review Bot]

Comment on attachment 118728 [details]
rebased patch for commit

Clearing flags on attachment: 118728

Committed r102559: <http://trac.webkit.org/changeset/102559>

[David Kilzer (:ddkilzer)]

Manually marking as RESOLVED/FIXED since the bot didn't seem to do it.