Changeset 102559 in webkit

Timestamp:

Dec 11, 2011 11:07:56 PM (12 years ago)

Author:

haraken@chromium.org

Message:

[Refactoring] Move top-level code to resolve conflicted ChangeLogs into a method
​https://bugs.webkit.org/show_bug.cgi?id=74257

Reviewed by Ryosuke Niwa.

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

• 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().
(getLatestChangeLogs):
(resolveConflictedChangeLogs):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/prepare-ChangeLog (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-11  Kentaro Hara  <haraken@chromium.org>
+
+        [Refactoring] Move top-level code to resolve conflicted ChangeLogs into a method
+        https://bugs.webkit.org/show_bug.cgi?id=74257
+
+        Reviewed by Ryosuke Niwa.
+
+        We are planning to write unit-tests for prepare-ChangeLog
+        in a run-leaks_unittest/ manner. This patch is one of the incremental
+        refactorings to remove all top-level code and global variables from
+        prepare-ChangeLog.
+
+        * 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().
+        (getLatestChangeLogs):
+        (resolveConflictedChangeLogs):
+
 2011-12-11  Kentaro Hara  <haraken@chromium.org>
 

trunk/Tools/Scripts/prepare-ChangeLog

@@ -70 +70 @@
 sub fetchBugDescriptionFromURL($);
 sub findChangeLogs(\%);
+sub getLatestChangeLogs($);
+sub resolveConflictedChangeLogs($);
 sub generateNewChangeLogs($$$\%);
 sub firstDirectoryOrCwd();
@@ -206 +208 @@
 
 # Get the latest ChangeLog files from svn.
-my @logs = ();
-foreach my $prefix (@$prefixes) {
-    push @logs, File::Spec->catfile($prefix || ".", "ChangeLog");
-}
-
-if (@logs && $updateChangeLogs && $isSVN) {
-    print STDERR "  Running 'svn update' to update ChangeLog files.\n";
-    open ERRORS, "-|", $SVN, "update", @logs
-        or die "The svn update of ChangeLog files failed: $!.\n";
-    my @conflictedChangeLogs;
-    while (my $line = <ERRORS>) {
-        print STDERR "    ", $line;
-        push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
-    }
-    close ERRORS;
-
-    if (@conflictedChangeLogs) {
-        print STDERR "  Attempting to merge conflicted ChangeLogs.\n";
-        my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
-        open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
-            or die "Could not open resolve-ChangeLogs script: $!.\n";
-        print STDERR "    $_" while <RESOLVE>;
-        close RESOLVE;
-    }
+my $changeLogs = getLatestChangeLogs($prefixes);
+
+if (@$changeLogs && $updateChangeLogs && $isSVN) {
+    resolveConflictedChangeLogs($changeLogs);
 }
 
@@ -248 +230 @@
 
 # Open ChangeLogs.
-if ($openChangeLogs && @logs) {
+if ($openChangeLogs && @$changeLogs) {
     print STDERR "  Opening the edited ChangeLog files.\n";
     my $editor = $ENV{CHANGE_LOG_EDITOR};
     if ($editor) {
-        system ((split ' ', $editor), @logs);
+        system ((split ' ', $editor), @$changeLogs);
     } else {
         $editor = $ENV{CHANGE_LOG_EDIT_APPLICATION};
         if ($editor) {
-            system "open", "-a", $editor, @logs;
+            system "open", "-a", $editor, @$changeLogs;
         } else {
-            system "open", "-e", @logs;
+            system "open", "-e", @$changeLogs;
         }
     }
@@ -447 +429 @@
     }
     return (\%filesInChangeLog, \@prefixes);
+}
+
+sub getLatestChangeLogs($)
+{
+    my ($prefixes) = @_;
+
+    my @changeLogs = ();
+    foreach my $prefix (@$prefixes) {
+        push @changeLogs, File::Spec->catfile($prefix || ".", "ChangeLog");
+    }
+    return \@changeLogs;
+}
+
+sub resolveConflictedChangeLogs($)
+{
+    my ($changeLogs) = @_;
+
+    print STDERR "  Running 'svn update' to update ChangeLog files.\n";
+    open ERRORS, "-|", $SVN, "update", @$changeLogs
+        or die "The svn update of ChangeLog files failed: $!.\n";
+    my @conflictedChangeLogs;
+    while (my $line = <ERRORS>) {
+        print STDERR "    ", $line;
+        push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
+    }
+    close ERRORS;
+
+    return if !@conflictedChangeLogs;
+
+    print STDERR "  Attempting to merge conflicted ChangeLogs.\n";
+    my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
+    open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
+        or die "Could not open resolve-ChangeLogs script: $!.\n";
+    print STDERR "    $_" while <RESOLVE>;
+    close RESOLVE;
 }