<!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>[213986] 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/213986">213986</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 10:21:00 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use git's -C flag when possible in VCSUtils.pm
https://bugs.webkit.org/show_bug.cgi?id=169003
Patch by Kocsen Chung <kocsen_chung@apple.com> on 2017-03-15
Reviewed by Sam Weinig.
Use the git -C flag where appropriate to perform the
operation on a target directory and avoid unnecessary logic
to `cd` in and out of the target directory.
* Scripts/VCSUtils.pm:
(isGitDirectory):
(isGitSVNDirectory):
(svnRevisionForDirectory):
(svnInfoForPath):
For all four subroutines, use git's -C flag and strip `cd` logic.</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 (213985 => 213986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-15 17:06:55 UTC (rev 213985)
+++ trunk/Tools/ChangeLog 2017-03-15 17:21:00 UTC (rev 213986)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-15 Kocsen Chung <kocsen_chung@apple.com>
+
+ Use git's -C flag when possible in VCSUtils.pm
+ https://bugs.webkit.org/show_bug.cgi?id=169003
+
+ Reviewed by Sam Weinig.
+
+ Use the git -C flag where appropriate to perform the
+ operation on a target directory and avoid unnecessary logic
+ to `cd` in and out of the target directory.
+
+ * Scripts/VCSUtils.pm:
+ (isGitDirectory):
+ (isGitSVNDirectory):
+ (svnRevisionForDirectory):
+ (svnInfoForPath):
+ For all four subroutines, use git's -C flag and strip `cd` logic.
+
</ins><span class="cx"> 2017-03-14 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> start-queue-mac.sh should create logs directory if it doesn't exist
</span></span></pre></div>
<a id="trunkToolsScriptsVCSUtilspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/VCSUtils.pm (213985 => 213986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/VCSUtils.pm 2017-03-15 17:06:55 UTC (rev 213985)
+++ trunk/Tools/Scripts/VCSUtils.pm 2017-03-15 17:21:00 UTC (rev 213986)
</span><span class="lines">@@ -222,8 +222,8 @@
</span><span class="cx">
</span><span class="cx"> sub isGitDirectory($)
</span><span class="cx"> {
</span><del>- my ($dir) = @_;
- return system("cd $dir && git rev-parse > " . File::Spec->devnull() . " 2>&1") == 0;
</del><ins>+ my ($directory) = @_;
+ return system("git -C '$directory' rev-parse > " . File::Spec->devnull() . " 2>&1") == 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isGit()
</span><span class="lines">@@ -238,15 +238,11 @@
</span><span class="cx"> {
</span><span class="cx"> my ($directory) = @_;
</span><span class="cx">
</span><del>- my $savedWorkingDirectory = Cwd::getcwd();
- chdir($directory);
-
</del><span class="cx"> # There doesn't seem to be an officially documented way to determine
</span><span class="cx"> # if you're in a git-svn checkout. The best suggestions seen so far
</span><span class="cx"> # all use something like the following:
</span><del>- my $output = `git config --get svn-remote.svn.fetch 2>& 1`;
</del><ins>+ my $output = `git -C '$directory' config --get svn-remote.svn.fetch 2>&1`;
</ins><span class="cx"> $isGitSVN = exitStatus($?) == 0 && $output ne "";
</span><del>- chdir($savedWorkingDirectory);
</del><span class="cx"> return $isGitSVN;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -426,25 +422,24 @@
</span><span class="cx">
</span><span class="cx"> sub svnRevisionForDirectory($)
</span><span class="cx"> {
</span><del>- my ($dir) = @_;
</del><ins>+ my ($directory) = @_;
</ins><span class="cx"> my $revision;
</span><span class="cx">
</span><del>- if (isSVNDirectory($dir)) {
- my $escapedDir = escapeSubversionPath($dir);
</del><ins>+ if (isSVNDirectory($directory)) {
+ my $escapedDir = escapeSubversionPath($directory);
</ins><span class="cx"> my $command = "svn info $escapedDir | grep Revision:";
</span><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><span class="cx"> my $svnInfo = `$command`;
</span><span class="cx"> ($revision) = ($svnInfo =~ m/Revision: (\d+).*/g);
</span><del>- } elsif (isGitDirectory($dir)) {
- my $command = "git log --grep=\"git-svn-id: \" -n 1 | grep git-svn-id:";
</del><ins>+ } elsif (isGitDirectory($directory)) {
+ my $command = "git -C '$directory' log --grep=\"git-svn-id: \" -n 1 | grep git-svn-id:";
</ins><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><del>- $command = "cd $dir && $command";
</del><span class="cx"> my $gitLog = `$command`;
</span><span class="cx"> ($revision) = ($gitLog =~ m/ +git-svn-id: .+@(\d+) /g);
</span><span class="cx"> }
</span><span class="cx"> if (!defined($revision)) {
</span><span class="cx"> $revision = "unknown";
</span><del>- warn "Unable to determine current SVN revision in $dir";
</del><ins>+ warn "Unable to determine current SVN revision in $directory";
</ins><span class="cx"> }
</span><span class="cx"> return $revision;
</span><span class="cx"> }
</span><span class="lines">@@ -461,9 +456,9 @@
</span><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><span class="cx"> $svnInfo = `$command`;
</span><span class="cx"> } elsif (isGitDirectory($file)) {
</span><del>- my $command = "git svn info";
</del><ins>+ my $command = "git -C '$file' svn info";
</ins><span class="cx"> $command = "LC_ALL=C $command" if !isWindows();
</span><del>- $svnInfo = `cd $relativePath && $command`;
</del><ins>+ $svnInfo = `$command`;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $svnInfo;
</span></span></pre>
</div>
</div>
</body>
</html>