[117221] trunk/dports/devel/bzr-fastimport

[raimue at macports.org]

Revision: 117221
          https://trac.macports.org/changeset/117221
Author:   raimue at macports.org
Date:     2014-02-19 12:09:11 -0800 (Wed, 19 Feb 2014)
Log Message:
-----------
devel/bzr-fastimport:
Fix compatibility with bzr >= 2.6, closes #42561

Modified Paths:
--------------
    trunk/dports/devel/bzr-fastimport/Portfile

Added Paths:
-----------
    trunk/dports/devel/bzr-fastimport/files/
    trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff
    trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff

Modified: trunk/dports/devel/bzr-fastimport/Portfile
===================================================================
--- 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)
@@ -6,6 +6,7 @@
 name            bzr-fastimport
 epoch           2
 version         0.13.0
+revision        1
 categories      devel python
 platforms       darwin
 supported_archs noarch
@@ -32,6 +33,10 @@
 depends_lib-append port:bzr
 depends_run-append port:py27-fastimport
 
+patchfiles      patch-disable-known-graph-feature.diff \
+                patch-dont-use-get_ancestry.diff
+patch.pre_args -p1
+
 livecheck.type  regex
 livecheck.url   http://launchpad.net/bzr-fastimport/+download
 livecheck.regex ${name}-(\\d+(?:\\.\\d+)+)\\.tar

Added: trunk/dports/devel/bzr-fastimport/files/patch-disable-known-graph-feature.diff
===================================================================
--- 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)
@@ -0,0 +1,21 @@
+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 at 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):

Added: trunk/dports/devel/bzr-fastimport/files/patch-dont-use-get_ancestry.diff
===================================================================
--- 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)
@@ -0,0 +1,24 @@
+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 at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1084749
+Reviewed-By: Andrew Starr-Bochicchio <asb at 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140219/6214ef75/attachment.html>