From 062d4e4d0ddf116e453dce2bfc580e0d8558fcc7 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Mon, 2 Apr 2007 23:09:41 +0000 Subject: Clean up files dir. Package-Manager: portage-2.1.2.3 --- dev-util/bzr/ChangeLog | 9 ++- dev-util/bzr/Manifest | 34 ++------ .../bzr/files/bzr-0.10-python-2.5-compat.patch | 51 ------------ .../bzr/files/bzr-0.8-fix-manpage-location.patch | 12 --- .../bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch | 13 ---- dev-util/bzr/files/bzr-0.8.2-push-repository.patch | 90 ---------------------- dev-util/bzr/files/bzr-0.9-binary-diff.patch | 79 ------------------- 7 files changed, 15 insertions(+), 273 deletions(-) delete mode 100644 dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch delete mode 100644 dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch delete mode 100644 dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch delete mode 100644 dev-util/bzr/files/bzr-0.8.2-push-repository.patch delete mode 100644 dev-util/bzr/files/bzr-0.9-binary-diff.patch (limited to 'dev-util/bzr') diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog index fa441535b237..35fff16c395a 100644 --- a/dev-util/bzr/ChangeLog +++ b/dev-util/bzr/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/bzr # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.30 2007/04/02 23:07:14 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.31 2007/04/02 23:09:41 marienz Exp $ + + 02 Apr 2007; Marien Zwart + -files/bzr-0.8.2-paramiko-1.6-compat.patch, + -files/bzr-0.8.2-push-repository.patch, + -files/bzr-0.8-fix-manpage-location.patch, + -files/bzr-0.9-binary-diff.patch, -files/bzr-0.10-python-2.5-compat.patch: + Clean up files dir. *bzr-0.15 (02 Apr 2007) diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest index 5d7661ad78f2..ff368f17fbbc 100644 --- a/dev-util/bzr/Manifest +++ b/dev-util/bzr/Manifest @@ -9,26 +9,6 @@ AUX bzr-0.10-fix-manpage-location.patch 438 RMD160 01e1a08e312ee80e14abb716f043e MD5 85c2ae99b48cedc73b723d2916b441e8 files/bzr-0.10-fix-manpage-location.patch 438 RMD160 01e1a08e312ee80e14abb716f043e40f6c332218 files/bzr-0.10-fix-manpage-location.patch 438 SHA256 2bdcccd82a9d81ade3e2a4f9b1948516bce1219d509fe14ed6e5bad0821a14a5 files/bzr-0.10-fix-manpage-location.patch 438 -AUX bzr-0.10-python-2.5-compat.patch 1692 RMD160 0b0296da7ff64b5331ef287e78f32556b9e21938 SHA1 e90213aa2b2e2146c009b086f0e30457ed706eeb SHA256 7929a354ebc8643e25f520bf3a6eb2310a0ec0fbf5b5a596832e3650a6379aa1 -MD5 fba9d1c4211cdaf371f19aeff711bb42 files/bzr-0.10-python-2.5-compat.patch 1692 -RMD160 0b0296da7ff64b5331ef287e78f32556b9e21938 files/bzr-0.10-python-2.5-compat.patch 1692 -SHA256 7929a354ebc8643e25f520bf3a6eb2310a0ec0fbf5b5a596832e3650a6379aa1 files/bzr-0.10-python-2.5-compat.patch 1692 -AUX bzr-0.8-fix-manpage-location.patch 361 RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de SHA1 ec0c0cc45ae717a6a8a998f64afdda9219a8ba6d SHA256 4bc85843e10660bb95cf12f758aaa92053db0c5ff82bd5479d8d4090a5935305 -MD5 4c2a989947fc7aeabffd234649aaf6c6 files/bzr-0.8-fix-manpage-location.patch 361 -RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de files/bzr-0.8-fix-manpage-location.patch 361 -SHA256 4bc85843e10660bb95cf12f758aaa92053db0c5ff82bd5479d8d4090a5935305 files/bzr-0.8-fix-manpage-location.patch 361 -AUX bzr-0.8.2-paramiko-1.6-compat.patch 453 RMD160 68a27746ced96409d98b18e9122f98a98405f2ae SHA1 894f319d8928dfe60b6605717c21866061dc6981 SHA256 3b427ac695a5abacf214771f8f6589744555c1da08583d266975da770e262214 -MD5 c73fb29e757d273cdf2dd44c755a442a files/bzr-0.8.2-paramiko-1.6-compat.patch 453 -RMD160 68a27746ced96409d98b18e9122f98a98405f2ae files/bzr-0.8.2-paramiko-1.6-compat.patch 453 -SHA256 3b427ac695a5abacf214771f8f6589744555c1da08583d266975da770e262214 files/bzr-0.8.2-paramiko-1.6-compat.patch 453 -AUX bzr-0.8.2-push-repository.patch 3321 RMD160 20881ad55ec1018ff921e64defc0c6063a6ac19c SHA1 9ee4fc6f0e925d7cf65a1be9c949f099b4056986 SHA256 e5c5d1cfe2ccf74241fe54236574196819fa2ab40390469eabe5541b5c710412 -MD5 345d91359f28e1ffaefa43963b0e9c9b files/bzr-0.8.2-push-repository.patch 3321 -RMD160 20881ad55ec1018ff921e64defc0c6063a6ac19c files/bzr-0.8.2-push-repository.patch 3321 -SHA256 e5c5d1cfe2ccf74241fe54236574196819fa2ab40390469eabe5541b5c710412 files/bzr-0.8.2-push-repository.patch 3321 -AUX bzr-0.9-binary-diff.patch 3660 RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 SHA1 bafba7a423a7b969afed0f2e91da1c47fed776ba SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b -MD5 56bc12a57f4b60f074871a84be58d6b7 files/bzr-0.9-binary-diff.patch 3660 -RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 files/bzr-0.9-binary-diff.patch 3660 -SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b files/bzr-0.9-binary-diff.patch 3660 DIST bzr-0.14.tar.gz 1159335 RMD160 f75cd37e3c2d30ffc482f215cd60c47ee392f34e SHA1 90c6278b332f369585ca6db47b65c4e7c60d6a6f SHA256 c1c47236e985b11069fd432a327cffb5d2de5af4035df22b434f24d916e4749f DIST bzr-0.15.tar.gz 1363733 RMD160 e3e6eeeff3df6dbd8ef9342b4a648a204cefae19 SHA1 7d166093b9ff5a5ab02f3bb840d34fdc4a8ccd79 SHA256 d84969833e1d588df3715e4910b891cbcc310a332796e0ce6528dd3b633c3171 EBUILD bzr-0.14.ebuild 1969 RMD160 46629fce04db885143c4b5cf2d8c33835a89b533 SHA1 c82b9176f0fa5f1362206f6e44fba7b247683543 SHA256 6f4a3eee0b76d1439be0b85466c1baff4687f337d2d0745f789f8e076533e7ab @@ -39,10 +19,10 @@ EBUILD bzr-0.15.ebuild 1993 RMD160 94594d04d80d6ad7eaae0ee88f318aa4fe92c568 SHA1 MD5 52b3e5bb4240711267c02b0128fd4649 bzr-0.15.ebuild 1993 RMD160 94594d04d80d6ad7eaae0ee88f318aa4fe92c568 bzr-0.15.ebuild 1993 SHA256 4f35d0645f0564d2c77fb5de0fbdad8f7973fbc0ff9815f9bd97e90aa9e2d04b bzr-0.15.ebuild 1993 -MISC ChangeLog 5235 RMD160 174dc56f0a00a2ab80b3fb9b8e27e71008865b04 SHA1 b545a5cad1123ce102fb167b28b26e9c756e4cc2 SHA256 8d8c6c79f4e39b88f81e92a748776f09ccd458c379f707b8889db8dcaf447824 -MD5 e9f712ec47b038efe1e95a34dae111cd ChangeLog 5235 -RMD160 174dc56f0a00a2ab80b3fb9b8e27e71008865b04 ChangeLog 5235 -SHA256 8d8c6c79f4e39b88f81e92a748776f09ccd458c379f707b8889db8dcaf447824 ChangeLog 5235 +MISC ChangeLog 5517 RMD160 9fe97acf3b8645cc69ab06e0491bf372071aa12a SHA1 7ad795a5bacd7f2388850f1a077be9f7477edda8 SHA256 0e8eccac3db3626d1367ee9c6f2fd43ca9765aa5b60df3863f60f4ade0bfa411 +MD5 bb8eea242e598c61e80239be5ea070fb ChangeLog 5517 +RMD160 9fe97acf3b8645cc69ab06e0491bf372071aa12a ChangeLog 5517 +SHA256 0e8eccac3db3626d1367ee9c6f2fd43ca9765aa5b60df3863f60f4ade0bfa411 ChangeLog 5517 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218 @@ -56,7 +36,7 @@ SHA256 9c7f9d7cb73e10d048ef635969cf522a53fde799c64ca669fcc8938e5c9e3b60 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGEYzTUElL7eJpfEQRAtTIAKCVng2eEtRgNaQ9tYHRFo9fbl11rQCfdW3/ -38Bt8WHXU8KKzI3SRkR74O4= -=YjOA +iD8DBQFGEY1mUElL7eJpfEQRAigpAJ9Z5ShnLZv3cjHn1id8NEpwFINvwgCfY5G0 +neb+KkMax6Gdpo3yoA8dl2c= +=f2I0 -----END PGP SIGNATURE----- diff --git a/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch b/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch deleted file mode 100644 index fdb2fc0c8b16..000000000000 --- a/dev-util/bzr/files/bzr-0.10-python-2.5-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -=== modified file 'bzrlib/errors.py' ---- bzrlib/errors.py 2006-08-22 21:31:23 +0000 -+++ bzrlib/errors.py 2006-09-21 21:01:04 +0000 -@@ -44,7 +44,7 @@ - >>> try: - ... raise NotBranchError(path='/foo/bar') - ... except: --... print sys.exc_type -+... print '%s.%s' % (sys.exc_type.__module__, sys.exc_type.__name__) - ... print sys.exc_value - ... path = getattr(sys.exc_value, 'path', None) - ... if path is not None: -@@ -264,8 +264,7 @@ - - def __init__(self, msg, base, args): - PathError.__init__(self, base, msg) -- self.args = [base] -- self.args.extend(args) -+ self.args = [base] + list(args) - - - class UnsupportedProtocol(PathError): - -=== modified file 'bzrlib/plugins/launchpad/test_register.py' ---- bzrlib/plugins/launchpad/test_register.py 2006-05-16 02:31:06 +0000 -+++ bzrlib/plugins/launchpad/test_register.py 2006-09-21 21:44:39 +0000 -@@ -71,6 +71,9 @@ - - class InstrumentedXMLRPCTransport(xmlrpclib.Transport): - -+ # Python 2.5's xmlrpclib looks for this. -+ _use_datetime = False -+ - def __init__(self, testcase): - self.testcase = testcase - - -=== modified file 'bzrlib/trace.py' ---- bzrlib/trace.py 2006-08-22 21:39:33 +0000 -+++ bzrlib/trace.py 2006-09-21 20:53:45 +0000 -@@ -288,7 +288,8 @@ - """Report an exception that probably indicates a bug in bzr""" - import traceback - exc_type, exc_object, exc_tb = exc_info -- print >>err_file, "bzr: ERROR: %s: %s" % (exc_type, exc_object) -+ print >>err_file, "bzr: ERROR: %s.%s: %s" % ( -+ exc_type.__module__, exc_type.__name__, exc_object) - print >>err_file - traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file) - print >>err_file - diff --git a/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch b/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch deleted file mode 100644 index f2c36e7800a7..000000000000 --- a/dev-util/bzr/files/bzr-0.8-fix-manpage-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -=== modified file 'setup.py' ---- setup.py -+++ setup.py -@@ -114,6 +114,6 @@ - ], - scripts=['bzr'], - cmdclass={'install_scripts': my_install_scripts, 'build': bzr_build}, -- data_files=[('man/man1', ['bzr.1'])], -+ data_files=[('share/man/man1', ['bzr.1'])], - # todo: install the txt files from bzrlib.doc.api. - ) - diff --git a/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch b/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch deleted file mode 100644 index b5ef35ae059c..000000000000 --- a/dev-util/bzr/files/bzr-0.8.2-paramiko-1.6-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'bzrlib/transport/sftp.py' ---- bzrlib/transport/sftp.py -+++ bzrlib/transport/sftp.py -@@ -1019,6 +1019,8 @@ - return '1' - def get_hexdump(self): - return False -+ def close(self): -+ pass - - server = paramiko.SFTPServer(FakeChannel(), 'sftp', StubServer(self), StubSFTPServer, - root=self._root, home=self._server_homedir) - diff --git a/dev-util/bzr/files/bzr-0.8.2-push-repository.patch b/dev-util/bzr/files/bzr-0.8.2-push-repository.patch deleted file mode 100644 index 86649d66dfb0..000000000000 --- a/dev-util/bzr/files/bzr-0.8.2-push-repository.patch +++ /dev/null @@ -1,90 +0,0 @@ -=== modified file 'NEWS' ---- NEWS -+++ NEWS -@@ -1,3 +1,11 @@ -+IN DEVELOPMENT -+ -+ INTERNALS: -+ -+ * 'bzr push' should only push the ancestry of the current revision, not -+ all of the history in the repository. This is especially important for -+ shared repositories. (John Arbash Meinel) -+ - bzr 0.8.2 2006-05-17 - - BUG FIXES: - -=== modified file 'bzrlib/builtins.py' ---- bzrlib/builtins.py -+++ bzrlib/builtins.py -@@ -516,7 +516,8 @@ - if new_transport.base == transport.base: - raise BzrCommandError("Could not create " - "path prefix.") -- dir_to = br_from.bzrdir.clone(location) -+ dir_to = br_from.bzrdir.clone(location, -+ revision_id=br_from.last_revision()) - br_to = dir_to.open_branch() - old_rh = br_to.revision_history() - try: - -=== modified file 'bzrlib/tests/blackbox/test_push.py' ---- bzrlib/tests/blackbox/test_push.py -+++ bzrlib/tests/blackbox/test_push.py -@@ -22,9 +22,12 @@ - - import bzrlib - from bzrlib.branch import Branch -+from bzrlib.bzrdir import BzrDirMetaFormat1 - from bzrlib.osutils import abspath -+from bzrlib.repository import RepositoryFormatKnit1 - from bzrlib.tests.blackbox import ExternalBase - from bzrlib.uncommit import uncommit -+from bzrlib.workingtree import WorkingTree - - - class TestPush(ExternalBase): -@@ -80,3 +83,42 @@ - self.assertEqual('0 revision(s) pushed.\n', err) - b2 = bzrlib.branch.Branch.open('pushed-location') - self.assertEndsWith(b2.base, 'pushed-location/') -+ -+ def test_push_only_pushes_history(self): -+ # Knit branches should only push the history for the current revision. -+ format = BzrDirMetaFormat1() -+ format.repository_format = RepositoryFormatKnit1() -+ shared_repo = self.make_repository('repo', format=format, shared=True) -+ shared_repo.set_make_working_trees(True) -+ -+ def make_shared_tree(path): -+ shared_repo.bzrdir.root_transport.mkdir(path) -+ shared_repo.bzrdir.create_branch_convenience('repo/' + path) -+ return WorkingTree.open('repo/' + path) -+ tree_a = make_shared_tree('a') -+ self.build_tree(['repo/a/file']) -+ tree_a.add('file') -+ tree_a.commit('commit a-1', rev_id='a-1') -+ f = open('repo/a/file', 'ab') -+ f.write('more stuff\n') -+ f.close() -+ tree_a.commit('commit a-2', rev_id='a-2') -+ -+ tree_b = make_shared_tree('b') -+ self.build_tree(['repo/b/file']) -+ tree_b.add('file') -+ tree_b.commit('commit b-1', rev_id='b-1') -+ -+ self.assertTrue(shared_repo.has_revision('a-1')) -+ self.assertTrue(shared_repo.has_revision('a-2')) -+ self.assertTrue(shared_repo.has_revision('b-1')) -+ -+ # Now that we have a repository with shared files, make sure -+ # that things aren't copied out by a 'push' -+ os.chdir('repo/b') -+ self.run_bzr('push', '../../push-b') -+ pushed_tree = WorkingTree.open('../../push-b') -+ pushed_repo = pushed_tree.branch.repository -+ self.assertFalse(pushed_repo.has_revision('a-1')) -+ self.assertFalse(pushed_repo.has_revision('a-2')) -+ self.assertTrue(pushed_repo.has_revision('b-1')) - diff --git a/dev-util/bzr/files/bzr-0.9-binary-diff.patch b/dev-util/bzr/files/bzr-0.9-binary-diff.patch deleted file mode 100644 index 0c930677b30d..000000000000 --- a/dev-util/bzr/files/bzr-0.9-binary-diff.patch +++ /dev/null @@ -1,79 +0,0 @@ -# Bazaar revision bundle v0.8 -# -# message: -# Make the tests pass with recent versions of diffutils. -# committer: Marien Zwart -# date: Thu 2006-08-24 20:01:44.809999943 +0200 - -=== modified file bzrlib/diff.py // last-changed:marienz@gentoo.org-20060824174 -... 709-83cf7a51d41c69f8 ---- bzrlib/diff.py -+++ bzrlib/diff.py -@@ -166,8 +166,9 @@ - # 'diff' gives retcode == 2 for all sorts of errors - # one of those is 'Binary files differ'. - # Bad options could also be the problem. -- # 'Binary files' is not a real error, so we suppress that error -- m = re.match('^binary files.*differ$', first_line, re.I) -+ # 'Binary files' is not a real error, so we suppress that error. -+ # Starting with diffutils 2.8.4 the word "binary" was dropped. -+ m = re.match('^(binary )?files.*differ$', first_line, re.I) - if not m: - raise BzrError('external diff failed with exit code 2;' - ' command: %r' % (diffcmd,)) - -=== modified file bzrlib/tests/test_diff.py ---- bzrlib/tests/test_diff.py -+++ bzrlib/tests/test_diff.py -@@ -111,7 +111,11 @@ - - def test_external_diff_binary(self): - lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n']) -- self.assertEqual(['Binary files old and new differ\n', '\n'], lines) -+ # Older versions of diffutils say "Binary files", newer -+ # versions just say "files". -+ self.assertContainsRe(lines[0], -+ '(Binary f|F)iles old and new differ\n') -+ self.assertEquals(lines[1:], ['\n']) - - def test_no_external_diff(self): - """Check that NoDiff is raised when diff is not available""" - -# revision id: marienz@gentoo.org-20060824180144-b5b013e11e5709f4 -# sha1: fd7d1ad679b4fde74c2d5927d4bb67b0e7dc6bac -# inventory sha1: 18333f103b8c13ac42673e56e272805790a275c5 -# parent ids: -# marienz@gentoo.org-20060824174709-83cf7a51d41c69f8 -# base id: pqm@pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82 -# properties: -# branch-nick: bzr.0.9 - -# message: -# Make external diff in binary mode work with recent versions of diffutils. -# committer: Marien Zwart -# date: Thu 2006-08-24 19:47:09.569000006 +0200 - -=== modified file bzrlib/diff.py // encoding:base64 -LS0tIGJ6cmxpYi9kaWZmLnB5CisrKyBienJsaWIvZGlmZi5weQpAQCAtMTY2LDggKzE2Niw5IEBA -CiAgICAgICAgICAgICAjICdkaWZmJyBnaXZlcyByZXRjb2RlID09IDIgZm9yIGFsbCBzb3J0cyBv -ZiBlcnJvcnMKICAgICAgICAgICAgICMgb25lIG9mIHRob3NlIGlzICdCaW5hcnkgZmlsZXMgZGlm -ZmVyJy4KICAgICAgICAgICAgICMgQmFkIG9wdGlvbnMgY291bGQgYWxzbyBiZSB0aGUgcHJvYmxl -bS4KLSAgICAgICAgICAgICMgJ0JpbmFyeSBmaWxlcycgaXMgbm90IGEgcmVhbCBlcnJvciwgc28g -d2Ugc3VwcHJlc3MgdGhhdCBlcnJvcgotICAgICAgICAgICAgbSA9IHJlLm1hdGNoKCdeYmluYXJ5 -IGZpbGVzLipkaWZmZXIkJywgZmlyc3RfbGluZSwgcmUuSSkKKyAgICAgICAgICAgICMgJ0JpbmFy -eSBmaWxlcycgaXMgbm90IGEgcmVhbCBlcnJvciwgc28gd2Ugc3VwcHJlc3MgdGhhdCBlcnJvci4K -KyAgICAgICAgICAgICMgU3RhcnRpbmcgd2l0aCBkaWZmdXRpbHMgMi44LjQgdGhlIHdvcmQgImJp -bmFyeSIgd2FzIGRyb3BwZWQuCisgICAgICAgICAgICBtID0gcmUubWF0Y2goJ14oYmluYXJ5ICk/ -ZmlsZXMuKmRpZmZlciQnLCBmaXJzdF9saW5lLCByZS5JKQogICAgICAgICAgICAgaWYgbm90IG06 -CiAgICAgICAgICAgICAgICAgcmFpc2UgQnpyRXJyb3IoJ2V4dGVybmFsIGRpZmYgZmFpbGVkIHdp -dGggZXhpdCBjb2RlIDI7JwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcgY29tbWFu -ZDogJXInICUgKGRpZmZjbWQsKSkKCg== - -# revision id: marienz@gentoo.org-20060824174709-83cf7a51d41c69f8 -# sha1: a7a4000ddb2b723ba82c62a11104c4ed354abe13 -# inventory sha1: 03cc983b5e08ffbcdbb02fba0f4733c973d0a554 -# parent ids: -# pqm@pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82 -# properties: -# branch-nick: bzr.0.9 - -- cgit v1.2.3-65-gdbad