<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206283] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206283">206283</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-09-22 18:14:59 -0700 (Thu, 22 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsVCSUtilspm">trunk/Tools/Scripts/VCSUtils.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206282 => 206283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-09-22 23:53:33 UTC (rev 206282)
+++ trunk/Tools/ChangeLog        2016-09-23 01:14:59 UTC (rev 206283)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-09-22 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Add long press selection test
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (206282 => 206283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/VCSUtils.pm        2016-09-22 23:53:33 UTC (rev 206282)
+++ trunk/Tools/Scripts/VCSUtils.pm        2016-09-23 01:14:59 UTC (rev 206283)
</span><span class="lines">@@ -87,8 +87,12 @@
</span><span class="cx"> &scmMoveOrRenameFile
</span><span class="cx"> &scmToggleExecutableBit
</span><span class="cx"> &setChangeLogDateAndReviewer
</span><ins>+ &svnIdentifierForPath
+ &svnInfoForPath
+ &svnRepositoryRootForPath
</ins><span class="cx"> &svnRevisionForDirectory
</span><span class="cx"> &svnStatus
</span><ins>+ &svnURLForPath
</ins><span class="cx"> &toWindowsLineEndings
</span><span class="cx"> &gitCommitForSVNRevision
</span><span class="cx"> &listOfChangedFilesBetweenRevisions
</span><span class="lines">@@ -444,33 +448,64 @@
</span><span class="cx"> return $revision;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub pathRelativeToSVNRepositoryRootForPath($)
</del><ins>+sub svnInfoForPath($)
</ins><span class="cx"> {
</span><span class="cx"> my ($file) = @_;
</span><span class="cx"> my $relativePath = File::Spec->abs2rel($file);
</span><span class="cx">
</span><span class="cx"> my $svnInfo;
</span><del>- if (isSVN()) {
</del><ins>+ if (isSVNDirectory($file)) {
</ins><span class="cx"> my $escapedRelativePath = escapeSubversionPath($relativePath);
</span><span class="cx"> my $command = "svn info $escapedRelativePath";
</span><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><span class="cx"> $svnInfo = `$command`;
</span><del>- } elsif (isGit()) {
- my $command = "git svn info $relativePath";
</del><ins>+ } elsif (isGitDirectory($file)) {
+ my $command = "git svn info";
</ins><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><del>- $svnInfo = `$command`;
</del><ins>+ $svnInfo = `cd $relativePath && $command`;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ return $svnInfo;
+}
+
+sub svnURLForPath($)
+{
+ my ($file) = @_;
+ my $svnInfo = svnInfoForPath($file);
+
</ins><span class="cx"> $svnInfo =~ /.*^URL: (.*?)$/m;
</span><del>- my $svnURL = $1;
</del><ins>+ return $1;
+}
</ins><span class="cx">
</span><ins>+sub svnRepositoryRootForPath($)
+{
+ my ($file) = @_;
+ my $svnInfo = svnInfoForPath($file);
+
</ins><span class="cx"> $svnInfo =~ /.*^Repository Root: (.*?)$/m;
</span><del>- my $repositoryRoot = $1;
</del><ins>+ return $1;
+}
</ins><span class="cx">
</span><del>- $svnURL =~ s/$repositoryRoot\///;
</del><ins>+sub pathRelativeToSVNRepositoryRootForPath($)
+{
+ my ($file) = @_;
+
+ my $svnURL = svnURLForPath($file);
+ my $svnRepositoryRoot = svnRepositoryRootForPath($file);
+
+ $svnURL =~ s/$svnRepositoryRoot\///;
</ins><span class="cx"> return $svnURL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub svnIdentifierForPath($)
+{
+ my ($file) = @_;
+ my $path = pathRelativeToSVNRepositoryRootForPath($file);
+
+ $path =~ /^(trunk)|tags\/([\w\.\-]*)|branches\/([\w\.\-]*).*$/m;
+ return $1 || $2 || $3;
+}
+
</ins><span class="cx"> sub makeFilePathRelative($)
</span><span class="cx"> {
</span><span class="cx"> my ($path) = @_;
</span></span></pre>
</div>
</div>
</body>
</html>