Attachment 195431 Details for Bug 230021 – port patch

[patch] port patch

port.patch (text/plain), 5.56 KB, created by Radim Kolar on 2018-07-24 19:23:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2018-07-24 19:23:43 UTC

Size: 5.56 KB

patch

obsolete

>diff -Naur /usr/ports/devel/bzr-fastimport/Makefile bzr-fastimport/Makefile
>--- /usr/ports/devel/bzr-fastimport/Makefile	2018-06-20 19:05:41.000000000 +0200
>+++ bzr-fastimport/Makefile	2018-07-24 18:46:06.976720000 +0200
>@@ -3,9 +3,11 @@
> 
> PORTNAME=	bzr-fastimport
> PORTVERSION=	0.13.0
>+PORTREVISION=	1
> CATEGORIES=	devel
>-MASTER_SITES=	http://launchpadlibrarian.net/94774555/ \
>-		http://www.c-s.li/ports/
>+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
>+DISTNAME=	${PORTNAME}_${PORTVERSION}+bzr361
>+EXTRACT_SUFX=	.orig.tar.gz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Provide fast loading of revision control data into bzr
>@@ -19,4 +21,10 @@
> USES=		python:2.7
> USE_PYTHON=	distutils autoplist
> 
>+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
>+PATCH_STRIP=	-p1
>+
>+post-stage:
>+		${CHMOD} -R -P a+rX ${STAGEDIR}
>+
> .include <bsd.port.mk>
>diff -Naur /usr/ports/devel/bzr-fastimport/distinfo bzr-fastimport/distinfo
>--- /usr/ports/devel/bzr-fastimport/distinfo	2014-01-22 16:30:13.000000000 +0100
>+++ bzr-fastimport/distinfo	2018-07-24 17:33:05.286497000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (bzr-fastimport-0.13.0.tar.gz) = 5e296dc4ff8e9bf1b6447e81fef41e1217656b43368ee4056a1f024221e009eb
>-SIZE (bzr-fastimport-0.13.0.tar.gz) = 80255
>+TIMESTAMP = 1532446385
>+SHA256 (bzr-fastimport_0.13.0+bzr361.orig.tar.gz) = 7d9467175279dd2f7a92638aaeeba9874098db6d6bda2fa127722f449f80326d
>+SIZE (bzr-fastimport_0.13.0+bzr361.orig.tar.gz) = 81499
>diff -Naur /usr/ports/devel/bzr-fastimport/files/patch-deletion-case bzr-fastimport/files/patch-deletion-case
>--- /usr/ports/devel/bzr-fastimport/files/patch-deletion-case	1970-01-01 01:00:00.000000000 +0100
>+++ bzr-fastimport/files/patch-deletion-case	2017-06-20 00:05:06.000000000 +0200
>@@ -0,0 +1,66 @@
>+Description: Fix a case where deleteion of an entry in a renamed directory is not reproduced
>+ correctly in fast-export.  Thanks to Harry Hirsch, Nuno Araujo, and Andrew Huff for the patch.
>+Bugs: https://launchpad.net/bugs/430347 https://launchpad.net/bugs/1167690 https://launchpad.net/bugs/1014291
>+
>+=== modified file 'exporter.py'
>+--- a/exporter.py	2014-05-15 09:26:03 +0000
>++++ b/exporter.py	2015-05-04 13:08:57 +0000
>+@@ -514,6 +514,7 @@
>+         #
>+         # 1) bzr rm a; bzr mv b a; bzr commit
>+         # 2) bzr mv x/y z; bzr rm x; commmit
>++        # 3) bzr mv x y; bzr rm y/z; bzr commit
>+         #
>+         # The first must come out with the delete first like this:
>+         #
>+@@ -525,6 +526,11 @@
>+         # R x/y z
>+         # D x
>+         #
>++        # The third case must come out with delete first like this:
>++        #
>++        # D x/z
>++        # R x y
>++        #
>+         # So outputting all deletes first or all renames first won't work.
>+         # Instead, we need to make multiple passes over the various lists to
>+         # get the ordering right.
>+@@ -532,6 +538,7 @@
>+         must_be_renamed = {}
>+         old_to_new = {}
>+         deleted_paths = set([p for p, _, _ in deletes])
>++        deleted_child_paths = set()
>+         for (oldpath, newpath, id_, kind,
>+                 text_modified, meta_modified) in renames:
>+             emit = kind != 'directory' or not self.plain_format
>+@@ -543,6 +550,20 @@
>+                 self.note("Skipping empty dir %s in rev %s" % (oldpath,
>+                     revision_id))
>+                 continue
>++                
>++            if kind == 'directory':
>++                # handling deleted children in renamed directory (case 3 above)
>++                for p, e in tree_old.inventory.iter_entries_by_dir(from_dir=id_):
>++                    if e.kind == 'directory' or not self.plain_format:
>++                        continue
>++                    old_child_path = osutils.pathjoin(oldpath, p)
>++                    new_child_path = osutils.pathjoin(newpath, p)
>++                    if old_child_path in deleted_paths:
>++                        file_cmds.append(commands.FileDeleteCommand(old_child_path.encode("utf-8")))
>++                        deleted_paths.remove(old_child_path)
>++                        deleted_child_paths.add(old_child_path)
>++
>++                
>+             #oldpath = self._adjust_path_for_renames(oldpath, renamed,
>+             #    revision_id)
>+             renamed.append([oldpath, newpath])
>+@@ -561,6 +582,8 @@
>+                         continue
>+                     old_child_path = osutils.pathjoin(oldpath, p)
>+                     new_child_path = osutils.pathjoin(newpath, p)
>++                    if old_child_path in deleted_child_paths:
>++                        continue
>+                     must_be_renamed[old_child_path] = new_child_path
>+ 
>+         # Add children not already renamed
>+
>diff -Naur /usr/ports/devel/bzr-fastimport/files/patch-disable-known-graph bzr-fastimport/files/patch-disable-known-graph
>--- /usr/ports/devel/bzr-fastimport/files/patch-disable-known-graph	1970-01-01 01:00:00.000000000 +0100
>+++ bzr-fastimport/files/patch-disable-known-graph	2016-04-24 18:12:14.000000000 +0200
>@@ -0,0 +1,19 @@
>+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):

Actions: View | Diff

Attachments on bug 230021: 195431