Changeset 196097 in webkit

Timestamp:

Feb 3, 2016 4:35:33 PM (8 years ago)

Author:

BJ Burg

Message:

git-add-reviewer should work when run from a subdirectory within the repository
​https://bugs.webkit.org/show_bug.cgi?id=153842

Reviewed by David Kilzer.

There are two problems that needed to be fixed:

• We can't assume .git is in $PWD/.git
• We can't specify absolute paths to git commit

Fix these problems using the helpers in VCSUtils that were added to
fix this same issue for prepare-changeCogs.

• Scripts/VCSUtils.pm: Export gitDirectory()
• Scripts/git-add-reviewer:

(nonInteractive): Cache gitDirectory() result.
(addReviewer):
(commit):
(changeLogsForCommit): Make paths relative.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (1 diff)
• Scripts/git-add-reviewer (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-02-03  Brian Burg  <bburg@apple.com>
+
+        git-add-reviewer should work when run from a subdirectory within the repository
+        https://bugs.webkit.org/show_bug.cgi?id=153842
+
+        Reviewed by David Kilzer.
+
+        There are two problems that needed to be fixed:
+
+         - We can't assume .git is in $PWD/.git
+         - We can't specify absolute paths to `git commit`
+
+        Fix these problems using the helpers in VCSUtils that were added to
+        fix this same issue for prepare-changeCogs.
+
+        * Scripts/VCSUtils.pm: Export gitDirectory()
+        * Scripts/git-add-reviewer:
+        (nonInteractive): Cache gitDirectory() result.
+        (addReviewer):
+        (commit):
+        (changeLogsForCommit): Make paths relative.
+
 2016-02-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -61 +61 @@
         &fixChangeLogPatch
         &gitBranch
+        &gitDirectory
         &gitTreeDirectory
         &gitdiff2svndiff

trunk/Tools/Scripts/git-add-reviewer

@@ -32 +32 @@
 use IPC::Open2;
 
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
+use VCSUtils;
+
 my $defaultReviewer = "NOBODY";
 
@@ -82 +87 @@
 );
 
+my $gitDirectory = gitDirectory();
+
 usage() if !$getOptionsResult || $showHelp;
 
@@ -182 +189 @@
 
     unless ((($commit eq $headCommit) or checkout($commit))
-            # FIXME: We need to use $ENV{GIT_DIR}/.git/MERGE_MSG
-            && writeCommitMessageToFile(".git/MERGE_MSG")
+            && writeCommitMessageToFile("$gitDirectory/MERGE_MSG")
             && addReviewer(%item)
             && commit(1)
@@ -234 +240 @@
     }
 
-    addReviewerToCommitMessage($item->{reviewer}, $item->{rubberstamp}, ".git/MERGE_MSG") or return fail();
+    addReviewerToCommitMessage($item->{reviewer}, $item->{rubberstamp}, "$gitDirectory/MERGE_MSG") or return fail();
 
     return 1;
@@ -243 +249 @@
     my ($amend) = @_;
 
-    my @command = qw(git commit -F .git/MERGE_MSG);
+    my @command = qw(git commit -F);
+    push @command, "$gitDirectory/MERGE_MSG";
     push @command, "--amend" if $amend;
     my $result = system @command;
@@ -330 +337 @@
     @files or return fail("Couldn't determine changed files for $commit.");
 
-    my @changeLogs = map { /^[ACMR]\s*(.*)/; $1 } grep { /^[ACMR].*[^-]ChangeLog/ } @files;
+    my @changeLogs = map { /^[ACMR]\s*(.*)/; makeFilePathRelative($1) } grep { /^[ACMR].*[^-]ChangeLog/ } @files;
     return \@changeLogs;
 }