<!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>[172728] 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/172728">172728</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-08-18 14:44:24 -0700 (Mon, 18 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added an update-webkit option to override the ../Internal check.
Part of https://bugs.webkit.org/show_bug.cgi?id=135815
Reviewed by Tim Horton.
* Scripts/update-webkit:
Added an explicit --internal option to control updating ../Internal, defaulting to whether
../Internal exists.
(runSvnUpdate): Moved to webkitdirs.pm.
(runGitUpdate): Ditto.
* Scripts/webkitdirs.pm:
(runSvnUpdateAndResolveChangeLogs): Moved runSvnUpdate from update-webkit and renamed to this.
(runGitUpdate): Moved from update-webkit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsupdatewebkit">trunk/Tools/Scripts/update-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172727 => 172728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-18 21:33:01 UTC (rev 172727)
+++ trunk/Tools/ChangeLog 2014-08-18 21:44:24 UTC (rev 172728)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-18 Dan Bernstein <mitz@apple.com>
+
+ Added an update-webkit option to override the ../Internal check.
+ Part of https://bugs.webkit.org/show_bug.cgi?id=135815
+
+ Reviewed by Tim Horton.
+
+ * Scripts/update-webkit:
+ Added an explicit --internal option to control updating ../Internal, defaulting to whether
+ ../Internal exists.
+ (runSvnUpdate): Moved to webkitdirs.pm.
+ (runGitUpdate): Ditto.
+ * Scripts/webkitdirs.pm:
+ (runSvnUpdateAndResolveChangeLogs): Moved runSvnUpdate from update-webkit and renamed to this.
+ (runGitUpdate): Moved from update-webkit.
+
</ins><span class="cx"> 2014-08-18 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Make update-webkit more lenient for pure git svn repositories
</span></span></pre></div>
<a id="trunkToolsScriptsupdatewebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/update-webkit (172727 => 172728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/update-webkit 2014-08-18 21:33:01 UTC (rev 172727)
+++ trunk/Tools/Scripts/update-webkit 2014-08-18 21:44:24 UTC (rev 172728)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2005-2009, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2009 Google Inc. All rights reserved.
</span><span class="cx"> # Copyright (C) 2011 Brent Fulgham. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -39,9 +39,6 @@
</span><span class="cx"> use VCSUtils;
</span><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><del>-sub runSvnUpdate();
-sub runGitUpdate();
-
</del><span class="cx"> # Handle options
</span><span class="cx"> my $quiet = '';
</span><span class="cx"> my $showHelp;
</span><span class="lines">@@ -52,12 +49,15 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Remove the check for ../Internal once Apple-internal users of this script pass --no-auxiliary-libs
</span><span class="cx"> my $auxiliaryLibs = ! -d "../Internal";
</span><ins>+# FIXME: http://webkit.org/b/135815 update-webkit should not check for the presence of Apple's Internal directory
+my $internal = -d "../Internal";
</ins><span class="cx">
</span><span class="cx"> my $getOptionsResult = GetOptions(
</span><span class="cx"> 'h|help' => \$showHelp,
</span><span class="cx"> 'q|quiet' => \$quiet,
</span><span class="cx"> 'auxiliary-libs!' => \$auxiliaryLibs,
</span><del>-);
</del><ins>+ 'internal!' => \$internal,
+);
</ins><span class="cx">
</span><span class="cx"> if (!$getOptionsResult || $showHelp) {
</span><span class="cx"> print STDERR <<__END__;
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> -h|--help show the help message
</span><span class="cx"> -q|--quiet pass -q to svn update for quiet updates
</span><span class="cx"> --[no-]auxiliary-libs [don\'t] update the auxiliary libraries for Windows (default: update)
</span><del>- --wincairo also update dependencies of the WinCairo port
</del><ins>+ --[no-]internal [don\'t] update ../Internal (default: update if it exists)
</ins><span class="cx"> __END__
</span><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="lines">@@ -77,13 +77,13 @@
</span><span class="cx"> push @svnOptions, qw(--accept postpone) if isSVNVersion16OrNewer();
</span><span class="cx">
</span><span class="cx"> print "Updating OpenSource\n" unless $quiet;
</span><del>-runSvnUpdate() if isSVN();
</del><ins>+runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVN();
</ins><span class="cx"> runGitUpdate() if isGit();
</span><span class="cx">
</span><del>-if (-d "../Internal") {
</del><ins>+if ($internal) {
</ins><span class="cx"> chdir("../Internal");
</span><span class="cx"> print "Updating Internal\n" unless $quiet;
</span><del>- runSvnUpdate() if isSVNDirectory(".");
</del><ins>+ runSvnUpdateAndResolveChangeLogs(@svnOptions) if isSVNDirectory(".");
</ins><span class="cx"> runGitUpdate() if isGitDirectory(".");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -98,39 +98,3 @@
</span><span class="cx"> setupAppleWinEnv() if isAppleWinWebKit();
</span><span class="cx">
</span><span class="cx"> exit 0;
</span><del>-
-sub runSvnUpdate()
-{
- open UPDATE, "-|", "svn", "update", @svnOptions or die;
- my @conflictedChangeLogs;
- while (my $line = <UPDATE>) {
- print $line;
- $line =~ m/^C\s+(.+?)[\r\n]*$/;
- if ($1) {
- my $filename = normalizePath($1);
- push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
- }
- }
- close UPDATE or die;
-
- if (@conflictedChangeLogs) {
- print "Attempting to merge conflicted ChangeLogs.\n";
- my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
- (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
- or die "Could not open resolve-ChangeLogs script: $!.\n";
- }
-}
-
-sub runGitUpdate()
-{
- # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
- # to perform the rebase much much faster.
- system("git", "fetch");
- if (isGitSVN()) {
- system("git", "svn", "rebase") == 0 or die;
- } else {
- # This will die if branch.$BRANCHNAME.merge isn't set, which is
- # almost certainly what we want.
- system("git", "pull") == 0 or die;
- }
-}
</del></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (172727 => 172728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-08-18 21:33:01 UTC (rev 172727)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-08-18 21:44:24 UTC (rev 172728)
</span><span class="lines">@@ -2520,4 +2520,41 @@
</span><span class="cx"> return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub runSvnUpdateAndResolveChangeLogs(@)
+{
+ my @svnOptions = @_;
+ open UPDATE, "-|", "svn", "update", @svnOptions or die;
+ my @conflictedChangeLogs;
+ while (my $line = <UPDATE>) {
+ print $line;
+ $line =~ m/^C\s+(.+?)[\r\n]*$/;
+ if ($1) {
+ my $filename = normalizePath($1);
+ push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
+ }
+ }
+ close UPDATE or die;
+
+ if (@conflictedChangeLogs) {
+ print "Attempting to merge conflicted ChangeLogs.\n";
+ my $resolveChangeLogsPath = File::Spec->catfile(dirname($0), "resolve-ChangeLogs");
+ (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
+ or die "Could not open resolve-ChangeLogs script: $!.\n";
+ }
+}
+
+sub runGitUpdate()
+{
+ # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master
+ # to perform the rebase much much faster.
+ system("git", "fetch");
+ if (isGitSVN()) {
+ system("git", "svn", "rebase") == 0 or die;
+ } else {
+ # This will die if branch.$BRANCHNAME.merge isn't set, which is
+ # almost certainly what we want.
+ system("git", "pull") == 0 or die;
+ }
+}
+
</ins><span class="cx"> 1;
</span></span></pre>
</div>
</div>
</body>
</html>