Changeset 57084 in webkit

Timestamp:

Apr 5, 2010 10:55:14 AM (14 years ago)

Author:

ojan@chromium.org

Message:

2010-04-05 Ojan Vafai <​ojan@chromium.org>

Reviewed by Eric Seidel.

prepare-ChangeLog should take a merge-base for which git branch to diff against.
​https://bugs.webkit.org/show_bug.cgi?id=36394

• Scripts/prepare-ChangeLog:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-05  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        prepare-ChangeLog should take a merge-base for which git branch to diff against.
+        https://bugs.webkit.org/show_bug.cgi?id=36394
+
+        * Scripts/prepare-ChangeLog:
+
 2010-04-05  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog

@@ -103 +103 @@
 my $name;
 my $emailAddress;
+my $mergeBase = 0;
 my $gitCommit = 0;
 my $gitIndex = "";
@@ -116 +117 @@
                "name:s" => \$name,
                "email:s" => \$emailAddress,
+               "merge-base:s" => \$mergeBase,
                "git-commit:s" => \$gitCommit,
                "git-index" => \$gitIndex,
@@ -127 +129 @@
     print STDERR "  --bug          Fill in the ChangeLog bug information from the given bug.\n";
     print STDERR "  -d|--diff      Spew diff to stdout when running\n";
+    print STDERR "  --merge-base   Populate the ChangeLogs with the diff to this branch\n";
     print STDERR "  --git-commit   Populate the ChangeLogs from the specified git commit\n";
     print STDERR "  --git-index    Populate the ChangeLogs from the git index only\n";
@@ -1255 +1258 @@
     return "\"$gitCommit^\" \"$gitCommit\"" if $gitCommit;
     return "--cached" if $gitIndex;
+    return $mergeBase if $mergeBase;
     return "HEAD" if $isGit;
 }
@@ -1269 +1273 @@
     } elsif ($isGit) {
         $command = "$GIT diff --no-ext-diff -U0 " . diffFromToString();
-        $command .= " -- $pathsString" unless $gitCommit;
+        $command .= " -- $pathsString" unless $gitCommit or $mergeBase;
     }