Bug 74257

Summary: [Refactoring] In prepare-ChangeLog, move top-level code to resolve conflicted ChangeLogs into a method
Product: WebKit Reporter: Kentaro Hara <haraken>
Component: Tools / TestsAssignee: Kentaro Hara <haraken>
Status: RESOLVED FIXED    
Severity: Normal CC: aroben, ddkilzer, rniwa, webkit.review.bot
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 73531    
Attachments:
Description Flags
Patch
rniwa: review+
rebased patch for commit none

Description Kentaro Hara 2011-12-11 15:56:22 PST
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.
Comment 1 Kentaro Hara 2011-12-11 16:04:53 PST
Created attachment 118716 [details]
Patch
Comment 2 Ryosuke Niwa 2011-12-11 20:51:46 PST
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.
Comment 3 Kentaro Hara 2011-12-11 21:09:53 PST
Created attachment 118728 [details]
rebased patch for commit
Comment 4 Kentaro Hara 2011-12-11 21:11:19 PST
(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.
Comment 5 WebKit Review Bot 2011-12-11 23:08:12 PST
Comment on attachment 118728 [details]
rebased patch for commit

Clearing flags on attachment: 118728

Committed r102559: <http://trac.webkit.org/changeset/102559>
Comment 6 David Kilzer (:ddkilzer) 2011-12-12 08:47:41 PST
Manually marking as RESOLVED/FIXED since the bot didn't seem to do it.