Changeset 185710 in webkit

Timestamp:

Jun 18, 2015 11:00:11 AM (9 years ago)

Author:

dbates@webkit.org

Message:

Make webkitdirs::runGitUpdate() work when invoked in more than one Git checkout
​https://bugs.webkit.org/show_bug.cgi?id=146082

Reviewed by Darin Adler.

The function webkitdirs::runGitUpdate may not update the Git checkout in the current
working directory after being invoked in a different Git checkout. In particular,
calling runGitUpdate() inside a Git SVN checkout and subsequently calling it inside
a pure Git checkout g will fail to update g.

Currently webkitdirs::runGitUpdate() calls VCSUtils::isGitSVN() to determine whether
the current working directory is a Git SVN checkout. And isGitSVN() caches its result
to speed up subsequent queries. This prevents runGitUpdate() from being used to update
an arbitrary Git checkout (since isGitSVN() may return a cached result for a directory
different than the current working directory). Instead runGitUpdate() should check
whether the current working directory is a Git SVN checkout on each invocation.

• Scripts/VCSUtils.pm: Export function isGitSVNDirectory so that it can be used from webkitdirs::runGitUpdate().

(isGitSVNDirectory): Extracted logic to determine whether a directory is a Git
SVN directory from isGitSVN().
(isGitSVN): Implemented in terms of isGitSVNDirectory().

• Scripts/webkitdirs.pm:

(runGitUpdate): Modified to use isGitSVNDirectory().

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/VCSUtils.pm (modified) (3 diffs)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-18  Daniel Bates  <dabates@apple.com>
+
+        Make webkitdirs::runGitUpdate() work when invoked in more than one Git checkout
+        https://bugs.webkit.org/show_bug.cgi?id=146082
+
+        Reviewed by Darin Adler.
+
+        The function webkitdirs::runGitUpdate may not update the Git checkout in the current
+        working directory after being invoked in a different Git checkout. In particular,
+        calling runGitUpdate() inside a Git SVN checkout and subsequently calling it inside
+        a pure Git checkout g will fail to update g.
+
+        Currently webkitdirs::runGitUpdate() calls VCSUtils::isGitSVN() to determine whether
+        the current working directory is a Git SVN checkout. And isGitSVN() caches its result
+        to speed up subsequent queries. This prevents runGitUpdate() from being used to update
+        an arbitrary Git checkout (since isGitSVN() may return a cached result for a directory
+        different than the current working directory). Instead runGitUpdate() should check
+        whether the current working directory is a Git SVN checkout on each invocation.
+
+        * Scripts/VCSUtils.pm: Export function isGitSVNDirectory so that it can be used from webkitdirs::runGitUpdate().
+        (isGitSVNDirectory): Extracted logic to determine whether a directory is a Git
+        SVN directory from isGitSVN().
+        (isGitSVN): Implemented in terms of isGitSVNDirectory().
+        * Scripts/webkitdirs.pm:
+        (runGitUpdate): Modified to use isGitSVNDirectory().
+
 2015-06-18  Mark Lam  <mark.lam@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -67 +67 @@
         &isGitBranchBuild
         &isGitDirectory
+        &isGitSVNDirectory
         &isSVN
         &isSVNDirectory
@@ -225 +226 @@
 }
 
-sub isGitSVN()
-{
-    return $isGitSVN if defined $isGitSVN;
+sub isGitSVNDirectory($)
+{
+    my ($directory) = @_;
+
+    my $savedWorkingDirectory = Cwd::getcwd();
+    chdir($directory);
 
     # There doesn't seem to be an officially documented way to determine
@@ -234 +238 @@
     my $output = `git config --get svn-remote.svn.fetch 2>& 1`;
     $isGitSVN = $output ne '';
+    chdir($savedWorkingDirectory);
+    return $isGitSVN;
+}
+
+sub isGitSVN()
+{
+    return $isGitSVN if defined $isGitSVN;
+
+    $isGitSVN = isGitSVNDirectory(".");
     return $isGitSVN;
 }

trunk/Tools/Scripts/webkitdirs.pm

@@ -2495 +2495 @@
     # to perform the rebase much much faster.
     system("git", "fetch");
-    if (isGitSVN()) {
+    if (isGitSVNDirectory(".")) {
         system("git", "svn", "rebase") == 0 or die;
     } else {