[32044] trunk/dports/devel/bzr
ram at macports.org
ram at macports.org
Fri Dec 14 06:21:27 PST 2007
Revision: 32044
http://trac.macosforge.org/projects/macports/changeset/32044
Author: ram at macports.org
Date: 2007-12-14 06:21:21 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
devel/bzr: update to 1.0, remove patches that are now in upstream
Modified Paths:
--------------
trunk/dports/devel/bzr/Portfile
Removed Paths:
-------------
trunk/dports/devel/bzr/files/patch-bzr.dev-r2966.diff
trunk/dports/devel/bzr/files/patch-bzr.dev-r2975.diff
Modified: trunk/dports/devel/bzr/Portfile
===================================================================
--- trunk/dports/devel/bzr/Portfile 2007-12-14 12:10:29 UTC (rev 32043)
+++ trunk/dports/devel/bzr/Portfile 2007-12-14 14:21:21 UTC (rev 32044)
@@ -4,7 +4,7 @@
PortGroup python25 1.0
name bzr
-version 0.92
+version 1.0
categories devel python
platforms darwin
maintainers ram openmaintainer
@@ -21,13 +21,11 @@
homepage http://bazaar-vcs.org/
master_sites ${homepage}releases/src/
-checksums md5 f91e760d646660f0f790066ff0526b38 \
- sha1 51901b0c467e30dab9e51b990bb491752460d680 \
- rmd160 f7a6c24944be50c830c25376bfaf0d2b8c56ae56
+checksums md5 b71c7920a157bb508284ad77abcedf94 \
+ sha1 9f20838b70b02bf7992513534009282c17a540e7 \
+ rmd160 89e26f25ba5abe04178de30ed50a726f8d44ed4d
-patchfiles patch-setup.py.diff \
- patch-bzr.dev-r2966.diff \
- patch-bzr.dev-r2975.diff \
+patchfiles patch-setup.py.diff
depends_lib-append port:py25-paramiko \
port:py25-crypto \
Deleted: trunk/dports/devel/bzr/files/patch-bzr.dev-r2966.diff
===================================================================
--- trunk/dports/devel/bzr/files/patch-bzr.dev-r2966.diff 2007-12-14 12:10:29 UTC (rev 32043)
+++ trunk/dports/devel/bzr/files/patch-bzr.dev-r2966.diff 2007-12-14 14:21:21 UTC (rev 32044)
@@ -1,16 +0,0 @@
-=== modified file 'bzrlib/export/__init__.py'
---- bzrlib/export/__init__.py 2006-09-20 23:43:18 +0000
-+++ bzrlib/export/__init__.py 2007-10-28 17:30:25 +0000
-@@ -92,7 +92,11 @@
-
- if format not in _exporters:
- raise errors.NoSuchExportFormat(format)
-- return _exporters[format](tree, dest, root)
-+ tree.lock_read()
-+ try:
-+ return _exporters[format](tree, dest, root)
-+ finally:
-+ tree.unlock()
-
-
- def get_root_name(dest):
Deleted: trunk/dports/devel/bzr/files/patch-bzr.dev-r2975.diff
===================================================================
--- trunk/dports/devel/bzr/files/patch-bzr.dev-r2975.diff 2007-12-14 12:10:29 UTC (rev 32043)
+++ trunk/dports/devel/bzr/files/patch-bzr.dev-r2975.diff 2007-12-14 14:21:21 UTC (rev 32044)
@@ -1,64 +0,0 @@
---- bzrlib/repofmt/pack_repo.py 2007-11-09 08:19:25.000000000 -0500
-+++ bzrlib/repofmt/pack_repo.py 2007-11-14 10:36:27.000000000 -0500
-@@ -748,7 +748,7 @@
- self._remove_pack_from_memory(pack)
- # record the newly available packs and stop advertising the old
- # packs
-- self._save_pack_names()
-+ self._save_pack_names(clear_obsolete_packs=True)
- # Move the old packs out of the way now they are no longer referenced.
- for revision_count, packs in pack_operations:
- self._obsolete_packs(packs)
-@@ -1133,13 +1133,16 @@
- """Release the mutex around the pack-names index."""
- self.repo.control_files.unlock()
-
-- def _save_pack_names(self):
-+ def _save_pack_names(self, clear_obsolete_packs=False):
- """Save the list of packs.
-
- This will take out the mutex around the pack names list for the
- duration of the method call. If concurrent updates have been made, a
- three-way merge between the current list and the current in memory list
- is performed.
-+
-+ :param clear_obsolete_packs: If True, clear out the contents of the
-+ obsolete_packs directory.
- """
- self.lock_names()
- try:
-@@ -1165,6 +1168,10 @@
- self.transport.put_file('pack-names', builder.finish())
- # move the baseline forward
- self._packs_at_load = disk_nodes
-+ # now clear out the obsolete packs directory
-+ if clear_obsolete_packs:
-+ self.transport.clone('obsolete_packs').delete_multi(
-+ self.transport.list_dir('obsolete_packs'))
- finally:
- self._unlock_names()
- # synchronise the memory packs list with what we just wrote:
---- bzrlib/tests/test_repository.py 2007-11-09 08:19:29.000000000 -0500
-+++ bzrlib/tests/test_repository.py 2007-11-14 10:36:27.000000000 -0500
-@@ -888,6 +888,9 @@
- # there should be 9 packs:
- index = GraphIndex(trans, 'pack-names', None)
- self.assertEqual(9, len(list(index.iter_all_entries())))
-+ # insert some files in obsolete_packs which should be removed by pack.
-+ trans.put_bytes('obsolete_packs/foo', '123')
-+ trans.put_bytes('obsolete_packs/bar', '321')
- # committing one more should coalesce to 1 of 10.
- tree.commit('commit triggering pack')
- index = GraphIndex(trans, 'pack-names', None)
-@@ -896,6 +899,11 @@
- tree = tree.bzrdir.open_workingtree()
- check_result = tree.branch.repository.check(
- [tree.branch.last_revision()])
-+ # We should have 50 (10x5) files in the obsolete_packs directory.
-+ obsolete_files = list(trans.list_dir('obsolete_packs'))
-+ self.assertFalse('foo' in obsolete_files)
-+ self.assertFalse('bar' in obsolete_files)
-+ self.assertEqual(50, len(obsolete_files))
- # XXX: Todo check packs obsoleted correctly - old packs and indices
- # in the obsolete_packs directory.
- large_pack_name = list(index.iter_all_entries())[0][1][0]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071214/13b666b1/attachment.html
More information about the macports-changes
mailing list