<!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>[154455] </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 { white-space: pre-line; 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="https://trac.macports.org/changeset/154455">154455</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-10-30 01:06:26 +0200 (Sun, 30 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/154451">r154451</a> from trunk:
sync: warn on obsolete Subversion repository
Conflicts resolved during merge.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3basesrcmacports10macportstcl">branches/release_2_3/base/src/macports1.0/macports.tcl</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
<li><a href="#branchesrelease_2_3basesrc">branches/release_2_3/base/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/release_2_3/base
</span><span class="cx">===================================================================
</span><del>--- branches/release_2_3/base 2016-10-29 23:02:53 UTC (rev 154454)
</del><ins>+++ branches/release_2_3/base 2016-10-29 23:06:26 UTC (rev 154455)
</ins><a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/gsoc13-tests:106692-111324
</span><span class="cx"> /branches/universal-sanity/base:51872-52323
</span><span class="cx"> /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><del>-/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073,154110,154184
</del><ins>+/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073,154110,154184,154451
</ins><span class="cx"> /users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx"> /users/perry/base-select:44044-44692
</span><span class="cx">\ No newline at end of property
</span><span class="cx">Index: branches/release_2_3/base/src
</span><span class="cx">===================================================================
</span><del>--- branches/release_2_3/base/src 2016-10-29 23:02:53 UTC (rev 154454)
</del><ins>+++ branches/release_2_3/base/src 2016-10-29 23:06:26 UTC (rev 154455)
</ins><a id="branchesrelease_2_3basesrc"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/gsoc13-tests/src:106692-111324
</span><span class="cx"> /branches/universal-sanity/base/src:51872-52323
</span><span class="cx"> /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><del>-/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865
</del><ins>+/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865,154451
</ins><span class="cx"> /users/perry/base-bugs_and_notes/src:45682-46060
</span><span class="cx"> /users/perry/base-select/src:44044-44692
</span><span class="cx">\ No newline at end of property
</span><a id="branchesrelease_2_3basesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/macports.tcl (154454 => 154455)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-29 23:02:53 UTC (rev 154454)
+++ branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-29 23:06:26 UTC (rev 154455)
</span><span class="lines">@@ -2232,6 +2232,25 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+##
+# Checks whether a local source directory is a checkout of the obsolete Subversion repository
+#
+# @param source_dir local directory check
+proc _source_is_obsolete_svn_repo {source_dir} {
+ if {![catch {macports::findBinary svn} svn] &&
+ ([file exists ${source_dir}/.svn] ||
+ ![catch {exec $svn info ${source_dir} >/dev/null 2>@1}])
+ } then {
+ if {![catch {exec $svn info ${source_dir}} svninfo]} {
+ if {[regexp -line {^Repository Root: https://svn\.macports\.org/repository/macports} $svninfo] ||
+ [regexp -line {^Repository UUID: d073be05-634f-4543-b044-5fe20cf6d1d6$} $svninfo]} {
+ return 1
+ }
+ }
+ }
+ return 0
+}
+
</ins><span class="cx"> proc macports::getportbuildpath {id {portname {}}} {
</span><span class="cx"> global macports::portdbpath
</span><span class="cx"> regsub {://} $id {.} port_path
</span><span class="lines">@@ -2274,6 +2293,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set numfailed 0
</span><ins>+ set obsoletesvn 0
</ins><span class="cx">
</span><span class="cx"> ui_msg "$macports::ui_prefix Updating the ports tree"
</span><span class="cx"> foreach source $sources {
</span><span class="lines">@@ -2288,6 +2308,9 @@
</span><span class="cx"> switch -regexp -- [macports::getprotocol $source] {
</span><span class="cx"> {^file$} {
</span><span class="cx"> set portdir [macports::getportdir $source]
</span><ins>+ if {[_source_is_obsolete_svn_repo $portdir]} {
+ set obsoletesvn 1
+ }
</ins><span class="cx"> set svn_cmd {}
</span><span class="cx"> catch {set svn_cmd [macports::findBinary svn]}
</span><span class="cx"> set git_cmd {}
</span><span class="lines">@@ -2590,6 +2613,11 @@
</span><span class="cx"> if {$numfailed > 0} {
</span><span class="cx"> return -code error "Synchronization of $numfailed source(s) failed"
</span><span class="cx"> }
</span><ins>+
+ if {$obsoletesvn != 0} {
+ ui_warn "The Subversion repository at svn.macports.org is no longer updated."
+ ui_warn "Please switch to Git: https://trac.macports.org/wiki/howto/SyncingWithGit"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ##
</span></span></pre>
</div>
</div>
</body>
</html>