Changeset 206283 in webkit

Timestamp:

Sep 22, 2016 6:14:59 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Add an API for getting the branch identifier from a Git or SVN checkout.
​https://bugs.webkit.org/show_bug.cgi?id=151570
rdar://problem/17959831

Reviewed by David Kilzer.

This patch adds a function called svnIdentifierForPath. This function returns either "trunk",
the name of the tag, or the name of the branch, as appropriate. This function is necessary for
a VCSUtils client that is not checked in to the WebKit project.

This patch also breaks up pathRelativeToSVNRepositoryRootForPath into four functions:

• pathRelativeToSVNRepositoryRootForPath
• svnInfoForPath
• svnURLForPath
• svnRepositoryRootForPath

This allows us to reuse logic from pathRelativeToSVNRepositoryRootForPath in svnIdentifierForPath and
allows clients of VCSUtils to extract what arbitrary information from the svn info command regardless
of SCM.

• Scripts/VCSUtils.pm:

(svnInfoForPath):
Copied logic that previously lived in pathRelativeToSVNRepositoryRootForPath.
Make code safe to use for a path, and not just for the CWD.

(svnURLForPath):
Calls svnInfoForPath and extracts the URL.

(svnRepositoryRootForPath):
Calls svnInfoForPath and extracts the Repository Root.

(svnIdentifierForPath):
Calls pathRelativeToSVNRepositoryRootForPath and extracts the repository identifier.

(pathRelativeToSVNRepositoryRootForPath):
Now uses svnURLForPath and svnRepositoryRootForPath instead of being responsible for
determining both values.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-22  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Add an API for getting the branch identifier from a Git or SVN checkout.
+        https://bugs.webkit.org/show_bug.cgi?id=151570
+        rdar://problem/17959831
+
+        Reviewed by David Kilzer.
+
+        This patch adds a function called svnIdentifierForPath. This function returns either "trunk",
+        the name of the tag, or the name of the branch, as appropriate. This function is necessary for
+        a VCSUtils client that is not checked in to the WebKit project.
+
+        This patch also breaks up pathRelativeToSVNRepositoryRootForPath into four functions:
+        - pathRelativeToSVNRepositoryRootForPath
+        - svnInfoForPath
+        - svnURLForPath
+        - svnRepositoryRootForPath
+
+        This allows us to reuse logic from pathRelativeToSVNRepositoryRootForPath in svnIdentifierForPath and
+        allows clients of VCSUtils to extract what arbitrary information from the `svn info` command regardless
+        of SCM.
+
+        * Scripts/VCSUtils.pm:
+        (svnInfoForPath):
+        Copied logic that previously lived in pathRelativeToSVNRepositoryRootForPath.
+        Make code safe to use for a path, and not just for the CWD.
+
+        (svnURLForPath):
+        Calls svnInfoForPath and extracts the URL.
+
+        (svnRepositoryRootForPath):
+        Calls svnInfoForPath and extracts the Repository Root.
+
+        (svnIdentifierForPath):
+        Calls pathRelativeToSVNRepositoryRootForPath and extracts the repository identifier.
+
+        (pathRelativeToSVNRepositoryRootForPath):
+        Now uses svnURLForPath and svnRepositoryRootForPath instead of being responsible for
+        determining both values.
+
 2016-09-22  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Tools/Scripts/VCSUtils.pm

@@ -88 +88 @@
         &scmToggleExecutableBit
         &setChangeLogDateAndReviewer
+        &svnIdentifierForPath
+        &svnInfoForPath
+        &svnRepositoryRootForPath
         &svnRevisionForDirectory
         &svnStatus
+        &svnURLForPath
         &toWindowsLineEndings
         &gitCommitForSVNRevision
@@ -445 +449 @@
 }
 
-sub pathRelativeToSVNRepositoryRootForPath($)
+sub svnInfoForPath($)
 {
     my ($file) = @_;
@@ -451 +455 @@
 
     my $svnInfo;
-    if (isSVN()) {
+    if (isSVNDirectory($file)) {
         my $escapedRelativePath = escapeSubversionPath($relativePath);
         my $command = "svn info $escapedRelativePath";
         $command = "LC_ALL=C $command" if !isWindows();
         $svnInfo = `$command`;
-    } elsif (isGit()) {
-        my $command = "git svn info $relativePath";
+    } elsif (isGitDirectory($file)) {
+        my $command = "git svn info";
         $command = "LC_ALL=C $command" if !isWindows();
-        $svnInfo = `$command`;
-    }
+        $svnInfo = `cd $relativePath && $command`;
+    }
+
+    return $svnInfo;
+}
+
+sub svnURLForPath($)
+{
+    my ($file) = @_;
+    my $svnInfo = svnInfoForPath($file);
 
     $svnInfo =~ /.*^URL: (.*?)$/m;
-    my $svnURL = $1;
+    return $1;
+}
+
+sub svnRepositoryRootForPath($)
+{
+    my ($file) = @_;
+    my $svnInfo = svnInfoForPath($file);
 
     $svnInfo =~ /.*^Repository Root: (.*?)$/m;
-    my $repositoryRoot = $1;
-
-    $svnURL =~ s/$repositoryRoot\///;
+    return $1;
+}
+
+sub pathRelativeToSVNRepositoryRootForPath($)
+{
+    my ($file) = @_;
+
+    my $svnURL = svnURLForPath($file);
+    my $svnRepositoryRoot = svnRepositoryRootForPath($file);
+
+    $svnURL =~ s/$svnRepositoryRoot\///;
     return $svnURL;
+}
+
+sub svnIdentifierForPath($)
+{
+    my ($file) = @_;
+    my $path = pathRelativeToSVNRepositoryRootForPath($file);
+
+    $path =~ /^(trunk)|tags\/([\w\.\-]*)|branches\/([\w\.\-]*).*$/m;
+    return $1 || $2 || $3;
 }