Changeset 43601 in webkit

Timestamp:

May 12, 2009 5:31:47 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

Bug 21418: resolve-ChangeLogs should have a --continue option which does git rebase --continue

<​https://bugs.webkit.org/show_bug.cgi?id=21418>

Reviewed by Darin Adler.

Scripts/resolve-ChangeLogs: Added -ccontinue switch that

runs "git rebase --continue" before exiting the script.
(hasGitUnmergedFiles): Added. Returns true if there are
unmerged files in the git repository.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/resolve-ChangeLogs (modified) (6 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-05-12  David Kilzer  <ddkilzer@apple.com>
+
+        Bug 21418: resolve-ChangeLogs should have a --continue option which does git rebase --continue
+
+        <https://bugs.webkit.org/show_bug.cgi?id=21418>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/resolve-ChangeLogs: Added -c|--continue switch that
+        runs "git rebase --continue" before exiting the script.
+        (hasGitUnmergedFiles): Added.  Returns true if there are
+        unmerged files in the git repository.
+
 2009-05-11  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebKitTools/Scripts/resolve-ChangeLogs

@@ -47 +47 @@
 sub fixMergedChangeLogs($;@);
 sub fixOneMergedChangeLog($);
+sub hasGitUnmergedFiles();
 sub mergeChanges($$$);
 sub parseFixMerged($$;$);
@@ -62 +63 @@
 
 my $fixMerged;
+my $gitRebaseContinue = 0;
 my $printWarnings = 1;
 my $showHelp;
 
 my $getOptionsResult = GetOptions(
+    'c|continue!'    => \$gitRebaseContinue,
     'f|fix-merged:s' => \&parseFixMerged,
     'h|help'         => \$showHelp,
@@ -83 +86 @@
     print STDERR "ERROR: No ChangeLog files listed on command-line or found unmerged.\n";
     undef $getOptionsResult;
+} elsif (defined $gitRebaseContinue && !$isGit) {
+    print STDERR "ERROR: --continue may only be used with a git repository\n";
+    undef $getOptionsResult;
 } elsif (defined $fixMerged && !$isGit) {
     print STDERR "ERROR: --fix-merged may only be used with a git repository\n";
@@ -92 +98 @@
     print STDERR <<__END__;
 Usage: @{[ basename($0) ]} [options] [path/to/ChangeLog] [path/to/another/ChangeLog ...]
+  -c|--[no-]continue               run "git rebase --continue" after fixing ChangeLog
+                                   entries (default: --no-continue)
   -f|--fix-merged [revision-range] fix git-merged ChangeLog entries; if a revision-range
                                    is specified, run git filter-branch on the range
@@ -119 +127 @@
     print STDERR "ERROR: Unknown combination of switches and arguments.\n";
     usageAndExit();
+}
+
+if ($gitRebaseContinue) {
+    if (hasGitUnmergedFiles()) {
+        print "Unmerged files; skipping '$GIT rebase --continue'.";
+    } else {
+        print "Running '$GIT rebase --continue'...\n";
+        print `$GIT rebase --continue`;
+    }
 }
 
@@ -381 +398 @@
 }
 
+sub hasGitUnmergedFiles()
+{
+    my $output = `$GIT ls-files --unmerged`;
+    return $output ne "";
+}
+
 sub mergeChanges($$$)
 {