<!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>[146635] branches/vcs-fetch/base/src/port1.0/portfetch.tcl</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="https://trac.macports.org/changeset/146635">146635</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-03-14 09:45:23 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initial tarball generation for fetch.type git</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesvcsfetchbasesrcport10portfetchtcl">branches/vcs-fetch/base/src/port1.0/portfetch.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesvcsfetchbasesrcport10portfetchtcl"></a>
<div class="modfile"><h4>Modified: branches/vcs-fetch/base/src/port1.0/portfetch.tcl (146634 => 146635)</h4>
<pre class="diff"><span>
<span class="info">--- branches/vcs-fetch/base/src/port1.0/portfetch.tcl 2016-03-14 16:45:05 UTC (rev 146634)
+++ branches/vcs-fetch/base/src/port1.0/portfetch.tcl 2016-03-14 16:45:23 UTC (rev 146635)
</span><span class="lines">@@ -427,29 +427,44 @@
</span><span class="cx">
</span><span class="cx"> # Perform a git fetch
</span><span class="cx"> proc portfetch::gitfetch {args} {
</span><del>- global worksrcpath patchfiles \
- git.url git.branch git.cmd
</del><ins>+ global distpath workpath worksrcpath patchfiles \
+ git.url git.branch git.cmd \
+ name fetch.type
</ins><span class="cx">
</span><ins>+ set generatedtar "${distpath}/${name}-${git.branch}.${fetch.type}.tar"
+ set generatedfile "${generatedtar}.xz"
+
+ if {${git.branch} ne "" && [file isfile "${generatedfile}"]} {
+ return 0
+ }
+
</ins><span class="cx"> set options "-q"
</span><span class="cx"> if {${git.branch} eq ""} {
</span><span class="cx"> # if we're just using HEAD, we can make a shallow repo
</span><span class="cx"> set options "$options --depth=1"
</span><span class="cx"> }
</span><del>- set cmdstring "${git.cmd} clone $options ${git.url} ${worksrcpath} 2>&1"
</del><ins>+
+ set generatedpath "${workpath}/${fetch.type}"
+ set cmdstring "${git.cmd} clone $options ${git.url} ${generatedpath} 2>&1"
</ins><span class="cx"> ui_debug "Executing: $cmdstring"
</span><span class="cx"> if {[catch {system $cmdstring} result]} {
</span><span class="cx"> return -code error [msgcat::mc "Git clone failed"]
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${git.branch} ne ""} {
- set env "GIT_DIR=${worksrcpath}/.git GIT_WORK_TREE=${worksrcpath}"
- set cmdstring "$env ${git.cmd} checkout -q ${git.branch} 2>&1"
- ui_debug "Executing $cmdstring"
- if {[catch {system $cmdstring} result]} {
- return -code error [msgcat::mc "Git checkout failed"]
- }
</del><ins>+ if {${git.branch} eq ""} {
+ file rename ${generatedpath} ${worksrcpath}
+ return 0
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ # generate tarball
+ set xz [findBinary xz ${portutil::autoconf::xz_path}]
+ set cmdstring "${git.cmd} -c \"tar.tar.xz.command=xz -c\" archive --format=tar.xz --output=${generatedfile}.TMP ${git.branch} 2>&1"
+ ui_debug "Executing $cmdstring"
+ if {[catch {system -W ${generatedpath} $cmdstring} result]} {
+ return -code error [msgcat::mc "Git archive creation failed"]
+ }
+ file rename -force "${generatedfile}.TMP" "${generatedfile}"
+
</ins><span class="cx"> if {[info exists patchfiles]} {
</span><span class="cx"> return [portfetch::fetchfiles]
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>