Changeset 45012 in webkit

Timestamp:

Jun 23, 2009 4:10:55 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-06-23 Joe Mason <​joe.mason@torchmobile.com>

Reviewed by Adam Treat.

​https://bugs.webkit.org/show_bug.cgi?id=26664

• Scripts/prepare-ChangeLog: Added --git-index mode to list only the changes which are already staged in the index. Useful to create an entry for what you're about to commit while ignoring unstaged changes.

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-06-23  Joe Mason  <joe.mason@torchmobile.com>
+
+        Reviewed by Adam Treat.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26664
+        * Scripts/prepare-ChangeLog: Added --git-index mode to list only the
+        changes which are already staged in the index.  Useful to create an
+        entry for what you're about to commit while ignoring unstaged changes.
+
 2009-06-23  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKitTools/Scripts/prepare-ChangeLog

@@ -5 +5 @@
 #  Copyright (C) 2000, 2001 Eazel, Inc.
 #  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Apple Inc.  All rights reserved.
+#  Copyright (C) 2009 Torchmobile, Inc.
 #
 #  prepare-ChangeLog is free software; you can redistribute it and/or
@@ -29 +30 @@
 # Objective-C, C++ and Objective-C++ support added by Maciej Stachowiak <mjs@apple.com>
 # Git support added by Adam Roben <aroben@apple.com>
+# --git-index flag added by Joe Mason <joe.mason@torchmobile.com>
 
 
@@ -94 +96 @@
 
 my $gitCommit = 0;
+my $gitIndex = "";
 my $gitReviewer = "";
 my $openChangeLogs = 0;
@@ -102 +105 @@
     GetOptions("diff|d!" => \$spewDiff,
                "git-commit:s" => \$gitCommit,
+               "git-index" => \$gitIndex,
                "git-reviewer:s" => \$gitReviewer,
                "help|h!" => \$showHelp,
@@ -110 +114 @@
     print STDERR "  -d|--diff      Spew diff to stdout when running\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";
     print STDERR "  --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
     print STDERR "                 This option is useful when the git commit lacks a Signed-Off-By: line\n";
@@ -117 +122 @@
     exit 1;
 }
+
+die "--git-commit and --git-index are incompatible." if ($gitIndex && $gitCommit);
 
 my %paths = processPaths(@ARGV);
@@ -1142 +1149 @@
     return $gitCommit if $gitCommit =~ m/.+\.\..+/;
     return "\"$gitCommit^\" \"$gitCommit\"" if $gitCommit;
+    return "--cached" if $gitIndex;
     return "HEAD" if $isGit;
 }
@@ -1226 +1234 @@
     print STDERR "  Running status to find changed, added, or removed files.\n";
     open STAT, "-|", statusCommand(keys %paths) or die "The status failed: $!.\n";
-    my $inGitCommitSection = 0;
     while (<STAT>) {
         my $status;
@@ -1337 +1344 @@
     );
 
-    return 0 if $gitCommit; # an existing commit cannot have conflicts
+    return 0 if ($gitCommit || $gitIndex); # an existing commit or staged change cannot have conflicts
     return $svn{$status} if $isSVN;
     return $git{$status} if $isGit;