<!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>[117221] trunk/dports/devel/bzr-fastimport</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/117221">117221</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2014-02-19 12:09:11 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devel/bzr-fastimport:
Fix compatibility with bzr >= 2.6, closes #42561</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelbzrfastimportPortfile">trunk/dports/devel/bzr-fastimport/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/bzr-fastimport/files/</li>
<li><a href="#trunkdportsdevelbzrfastimportfilespatchdisableknowngraphfeaturediff">trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff</a></li>
<li><a href="#trunkdportsdevelbzrfastimportfilespatchdontuseget_ancestrydiff">trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelbzrfastimportPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/bzr-fastimport/Portfile (117220 => 117221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/bzr-fastimport/Portfile 2014-02-19 20:07:16 UTC (rev 117220)
+++ trunk/dports/devel/bzr-fastimport/Portfile 2014-02-19 20:09:11 UTC (rev 117221)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> name bzr-fastimport
</span><span class="cx"> epoch 2
</span><span class="cx"> version 0.13.0
</span><ins>+revision 1
</ins><span class="cx"> categories devel python
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -32,6 +33,10 @@
</span><span class="cx"> depends_lib-append port:bzr
</span><span class="cx"> depends_run-append port:py27-fastimport
</span><span class="cx">
</span><ins>+patchfiles patch-disable-known-graph-feature.diff \
+ patch-dont-use-get_ancestry.diff
+patch.pre_args -p1
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://launchpad.net/bzr-fastimport/+download
</span><span class="cx"> livecheck.regex ${name}-(\\d+(?:\\.\\d+)+)\\.tar
</span></span></pre></div>
<a id="trunkdportsdevelbzrfastimportfilespatchdisableknowngraphfeaturediff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff (0 => 117221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff (rev 0)
+++ trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff 2014-02-19 20:09:11 UTC (rev 117221)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Patch-Source: http://patch-tracker.debian.org/patch/series/view/bzr-fastimport/0.13.0-4/disable-known-graph-feature.patch
+
+Description: Disable know graph feature.
+ repo.get_known_graph_ancestry() can't be called while in the middle of a write
+ group. Otherwise bzr will crash with: 'BTreeBuilder' object has no attribute
+ '_find_ancestors'.
+Author: Felipe Contreras <felipe.contreras@gmail.com>
+Bug: https://launchpad.net/bugs/541626
+Bug-Ubuntu: https://launchpad.net/bugs/541626
+
+--- a/revision_store.py
++++ b/revision_store.py
+@@ -170,7 +170,7 @@
+ """
+ self.repo = repo
+ self._graph = None
+- self._use_known_graph = True
++ self._use_known_graph = False
+ self._supports_chks = getattr(repo._format, 'supports_chks', False)
+
+ def expects_rich_root(self):
</ins></span></pre></div>
<a id="trunkdportsdevelbzrfastimportfilespatchdontuseget_ancestrydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff (0 => 117221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff (rev 0)
+++ trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff 2014-02-19 20:09:11 UTC (rev 117221)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Patch-Source: http://patch-tracker.debian.org/patch/series/view/bzr-fastimport/0.13.0-4/dont-use-get_ancestry.diff
+
+Description: Don't use get_ancestry() call
+ The get_ancestry() method was removed from bzr sometime in the past.
+ The actual code was pulled from a similar bug in bzr-stat where get_ancestry()
+ is reimplemented as a two-liner.
+ .
+ This is just a work around until upstream has a better implementation.
+Author: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1084749
+Reviewed-By: Andrew Starr-Bochicchio <asb@debian.org> Sun, 24 Nov 2013 17:46:36 -0500
+
+--- bzr-fastimport-0.13.0.orig/branch_updater.py
++++ bzr-fastimport-0.13.0/branch_updater.py
+@@ -165,7 +165,8 @@ class BranchUpdater(object):
+ # apply tags known in this branch
+ my_tags = {}
+ if self.tags:
+- ancestry = self.repo.get_ancestry(last_rev_id)
++ graph = self.repo.get_graph()
++ ancestry = [r for (r, ps) in graph.iter_ancestry([last_rev_id]) if ps is not None]
+ for tag,rev in self.tags.items():
+ if rev in ancestry:
+ my_tags[tag] = rev
</ins></span></pre>
</div>
</div>
</body>
</html>