diff -Nru bzrtools-2.5/debian/changelog bzrtools-2.5+bzr786/debian/changelog --- bzrtools-2.5/debian/changelog 2012-01-20 02:29:31.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/changelog 2012-07-25 19:34:08.000000000 +0000 @@ -1,3 +1,27 @@ +bzrtools (2.5+bzr786-2~bazaar1~precise1) precise; urgency=low + + * Rebuild in PPA. + + -- Max Bowsher <_@maxb.eu> Wed, 25 Jul 2012 20:34:08 +0100 + +bzrtools (2.5+bzr786-2) unstable; urgency=low + + * Use rsvg-convert rather than rsvg. Closes: #666472, LP: #971190 + * Disable version check to allow use with bzr 2.6. + * Remove Arnaud Fontaine and Gustavo Franco from uploaders. + * Fix Vcs-Bzr URL. + * Add 03_testing: fix test suite run with newer versions of bzr. + + -- Jelmer Vernooij Fri, 13 Apr 2012 12:06:17 +0200 + +bzrtools (2.5+bzr786-1) unstable; urgency=low + + * Bump standards version to 3.9.3 (no changes). + * Fix header of copyright file format. + * New upstream snapshot. + + -- Jelmer Vernooij Wed, 21 Mar 2012 11:43:10 +0100 + bzrtools (2.5-1) unstable; urgency=low * Use DEP5 for copyright file. diff -Nru bzrtools-2.5/debian/control bzrtools-2.5+bzr786/debian/control --- bzrtools-2.5/debian/control 2012-01-20 02:29:11.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/control 2012-04-13 10:03:29.000000000 +0000 @@ -2,15 +2,13 @@ Section: vcs Priority: optional Maintainer: Debian Bazaar Maintainers -Uploaders: Gustavo Franco , - Arnaud Fontaine , - Jelmer Vernooij , - James Westby +Uploaders: James Westby , + Jelmer Vernooij Build-Depends: debhelper (>> 7.0.50~), python (>= 2.6.6-3) -Build-Depends-Indep: bzr (<< 2.6.0), bzr (>= 2.5~), python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-subunit, rsync -Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/2.4 +Build-Depends-Indep: python-bzrlib (<< 2.6.0), python-bzrlib (>= 2.5~), python-bzrlib.tests, bzr, python-subunit, rsync +Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzrtools/unstable Homepage: http://bazaar-vcs.org/BzrTools -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.4 Dm-Upload-Allowed: yes diff -Nru bzrtools-2.5/debian/copyright bzrtools-2.5+bzr786/debian/copyright --- bzrtools-2.5/debian/copyright 2012-01-20 02:28:42.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/copyright 2012-03-15 03:02:00.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzrtools Upstream-Contact: Aaron Bentley Source: http://bazaar-vcs.org/BzrTools. diff -Nru bzrtools-2.5/debian/patches/01_use-rsvg-convert bzrtools-2.5+bzr786/debian/patches/01_use-rsvg-convert --- bzrtools-2.5/debian/patches/01_use-rsvg-convert 1970-01-01 00:00:00.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/patches/01_use-rsvg-convert 2012-04-12 00:09:25.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Use rsvg-convert utility rather than rsvg, which is going to be removed. +Origin: commit, revision id: jelmer@samba.org-20120402011629-djysdlb3xaobp4hz +Author: Jelmer Vernooij +Bug-Debian: http://bugs.debian.org/666472 +Bug: https://launchpad.net/bugs/971190 +Last-Update: 2012-04-02 +Applied-Upstream: no +X-Bzr-Revision-Id: jelmer@samba.org-20120402011629-djysdlb3xaobp4hz + +=== modified file 'dotgraph.py' +--- old/dotgraph.py 2008-04-11 00:03:51 +0000 ++++ new/dotgraph.py 2012-04-02 01:16:29 +0000 +@@ -192,7 +192,7 @@ + try: + temp_file = os.path.join(tempdir, 'temp.svg') + invoke_dot(input, temp_file, 'svg') +- cmdline = ['rsvg', temp_file, out_file] ++ cmdline = ['rsvg-convert', temp_file, out_file] + try: + rsvg_proc = Popen(cmdline) + except OSError, e: + diff -Nru bzrtools-2.5/debian/patches/02_version_check bzrtools-2.5+bzr786/debian/patches/02_version_check --- bzrtools-2.5/debian/patches/02_version_check 1970-01-01 00:00:00.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/patches/02_version_check 2012-04-12 00:09:25.000000000 +0000 @@ -0,0 +1,100 @@ +Description: Disable version checking +Author: Jelmer Vernooij + +=== modified file 'command.py' +--- old/command.py 2011-04-15 02:33:36 +0000 ++++ new/command.py 2012-04-02 01:13:56 +0000 +@@ -16,91 +16,4 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +-import bzrlib +-from bzrlib import commands +- +-from version import version_info, __version__ +- +- +-_testing = False +-# True if we are currently testing commands via the test suite. +- +-def _stop_testing(): +- """Set the _testing flag to indicate we are no longer testing.""" +- global _testing +- _testing = False +- +- +-class BzrToolsCommand(commands.Command): +- +- def run_argv_aliases(self, argv, alias_argv=None): +- result = check_bzrlib_version(version_info[:2]) +- if result is not None: +- return result +- commands.Command.run_argv_aliases(self, argv, alias_argv) +- +- +-TOO_OLD = 'too_old' +-COMPATIBLE = 'compatible' +-MAYBE_TOO_NEW = 'maybe_too_new' +-TOO_NEW = 'too_new' +- +- +-def check_version_compatibility(bzrlib_version, min_version, max_version): +- """Check whether a bzrlib version is compatible with desired version. +- +- If the bzrlib_version is not less than min_version and not greater than +- max_version, it is considered COMPATIBLE. If the version exceeds +- max_version by 1 and is not a 'candidate' or 'final' version, it is +- considered MAYBE_TOO_NEW. Other values greater than max_version are +- considered TOO_NEW, and values lower than min_version are considered +- TOO_OLD. +- """ +- bzrlib_version = bzrlib.version_info[:2] +- if bzrlib_version < min_version: +- return TOO_OLD +- if bzrlib_version <= max_version: +- return COMPATIBLE +- max_plus = (max_version[0], max_version[1] + 1) +- if bzrlib_version == max_plus: +- if bzrlib.version_info[3] not in ('final', 'candidate'): +- return COMPATIBLE +- return MAYBE_TOO_NEW +- return TOO_NEW +- +- +-def check_bzrlib_version(desired): +- """Check that bzrlib is compatible. +- +- If version is < bzrtools version, assume incompatible. +- If version == bzrtools version, assume completely compatible +- If version == bzrtools version + 1, assume compatible, with deprecations +- Otherwise, assume incompatible. +- """ +- global _testing +- if _testing: +- return +- compatibility = check_version_compatibility(bzrlib.version_info, desired, +- desired) +- if compatibility == COMPATIBLE: +- return +- try: +- from bzrlib.trace import warning +- except ImportError: +- # get the message out any way we can +- from warnings import warn as warning +- if compatibility == TOO_OLD: +- warning('Bazaar version %s is too old to be used with' +- ' plugin "Bzrtools" %s.' % ( +- bzrlib.__version__, __version__)) +- # Not using BzrNewError, because it may not exist. +- return 3 +- else: +- warning('Plugin "Bzrtools" is not up to date with installed Bazaar' +- ' version %s.\n' +- 'There should be a newer version of Bzrtools available, e.g.' +- ' %i.%i.' +- % (bzrlib.__version__, bzrlib.version_info[0], +- bzrlib.version_info[1])) +- if compatibility == TOO_NEW: +- return 3 ++from bzrlib.commands import Command as BzrToolsCommand + diff -Nru bzrtools-2.5/debian/patches/03_testing bzrtools-2.5+bzr786/debian/patches/03_testing --- bzrtools-2.5/debian/patches/03_testing 1970-01-01 00:00:00.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/patches/03_testing 2012-04-13 10:05:30.000000000 +0000 @@ -0,0 +1,31 @@ +=== modified file 'tests/blackbox.py' +--- old/tests/blackbox.py 2011-09-25 03:13:49 +0000 ++++ new/tests/blackbox.py 2012-04-13 10:04:33 +0000 +@@ -27,11 +27,6 @@ + + class TestBzrTools(TestCaseWithTransport): + +- def setUp(self): +- TestCaseWithTransport.setUp(self) +- command._testing = True +- self.addCleanup(command._stop_testing) +- + @staticmethod + def touch(filename): + file(filename, 'wb').write('') + +=== modified file 'tests/shelf_tests.py' +--- old/tests/shelf_tests.py 2012-03-20 02:40:57 +0000 ++++ new/tests/shelf_tests.py 2012-04-13 10:05:18 +0000 +@@ -33,10 +33,6 @@ + +hello test world + + """ +- def setUp(self): +- bzrlib.tests.TestCaseWithTransport.setUp(self) +- command._testing = True +- self.addCleanup(command._stop_testing) + + def _check_diff(self, diff=DIFF_1, filename='test_file'): + old_tree = self.tree.basis_tree() + diff -Nru bzrtools-2.5/debian/patches/series bzrtools-2.5+bzr786/debian/patches/series --- bzrtools-2.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ bzrtools-2.5+bzr786/debian/patches/series 2012-04-13 10:04:56.000000000 +0000 @@ -0,0 +1,3 @@ +01_use-rsvg-convert +02_version_check +03_testing diff -Nru bzrtools-2.5/graph.py bzrtools-2.5+bzr786/graph.py --- bzrtools-2.5/graph.py 2012-01-20 02:07:41.000000000 +0000 +++ bzrtools-2.5+bzr786/graph.py 2012-03-20 02:40:57.000000000 +0000 @@ -202,13 +202,16 @@ self.graph = self.branch.repository.get_graph(other_repo) revision_a = self.branch.last_revision() self.scan_graph(revision_a, revision_b) - self.n_history = branch.revision_history() + self.n_history = list(self.graph.iter_lefthand_ancestry(revision_a)) + self.n_history.reverse() self.n_revnos = branch.get_revision_id_to_revno_map() self.distances = node_distances(self.descendants, self.ancestors, self.root) if other_branch is not None: self.base = select_farthest(self.distances, self.common) - self.m_history = other_branch.revision_history() + self.m_history = self.graph.iter_lefthand_ancestry(revision_b) + self.m_history = list(self.m_history) + self.m_history.reverse() self.m_revnos = other_branch.get_revision_id_to_revno_map() self.new_base = self.graph.find_unique_lca(revision_a, revision_b) diff -Nru bzrtools-2.5/tests/shelf_tests.py bzrtools-2.5+bzr786/tests/shelf_tests.py --- bzrtools-2.5/tests/shelf_tests.py 2012-01-20 02:07:41.000000000 +0000 +++ bzrtools-2.5+bzr786/tests/shelf_tests.py 2012-03-20 02:40:57.000000000 +0000 @@ -44,10 +44,10 @@ self.tree.lock_read() try: old_date = _patch_header_date(old_tree, - old_tree.inventory.path2id(filename), + old_tree.path2id(filename), filename) new_date = _patch_header_date(self.tree, - self.tree.inventory.path2id(filename), filename) + self.tree.path2id(filename), filename) finally: self.tree.unlock() old_tree.unlock() @@ -63,7 +63,7 @@ old_tree.lock_read() try: old_date = _patch_header_date(old_tree, - old_tree.inventory.path2id(filename), + old_tree.path2id(filename), filename) finally: old_tree.unlock() @@ -96,7 +96,7 @@ self.tree.lock_write() try: new_date = _patch_header_date(self.tree, - self.tree.inventory.path2id('test_file'), 'test_file') + self.tree.path2id('test_file'), 'test_file') finally: self.tree.unlock() @@ -337,7 +337,7 @@ f.write(self.MODIFIED) f.close() new_date = _patch_header_date(self.tree, - self.tree.inventory.path2id('test_file'), 'test_file') + self.tree.path2id('test_file'), 'test_file') finally: self.tree.unlock() @@ -438,10 +438,10 @@ self.tree.lock_read() try: old_date = _patch_header_date(old_tree, - old_tree.inventory.path2id('test_file'), + old_tree.path2id('test_file'), 'test_file') new_date = _patch_header_date(self.tree, - self.tree.inventory.path2id('test_file'), 'test_file') + self.tree.path2id('test_file'), 'test_file') finally: old_tree.unlock() self.tree.unlock() diff -Nru bzrtools-2.5/tests/upstream_import.py bzrtools-2.5+bzr786/tests/upstream_import.py --- bzrtools-2.5/tests/upstream_import.py 2012-01-20 02:07:41.000000000 +0000 +++ bzrtools-2.5+bzr786/tests/upstream_import.py 2012-03-20 02:40:57.000000000 +0000 @@ -223,9 +223,9 @@ self.assertTrue(tree.path2id('README') is not None) self.assertTrue(tree.path2id('FEEDME') is not None) self.assertTrue(os.path.isfile(tree.abspath('README'))) - self.assertEqual(tree.inventory[tree.path2id('README')].kind, + self.assertEqual(tree.stored_kind(tree.path2id('README')), 'file') - self.assertEqual(tree.inventory[tree.path2id('FEEDME')].kind, + self.assertEqual(tree.stored_kind(tree.path2id('FEEDME')), 'file') f = file(tree.abspath('junk/food'), 'wb') f.write('I like food\n') diff -Nru bzrtools-2.5/upstream_import.py bzrtools-2.5+bzr786/upstream_import.py --- bzrtools-2.5/upstream_import.py 2012-01-20 02:07:41.000000000 +0000 +++ bzrtools-2.5+bzr786/upstream_import.py 2012-03-20 02:40:57.000000000 +0000 @@ -196,7 +196,7 @@ def import_archive_to_transform(tree, archive_file, tt): prefix = common_directory(names_of_files(archive_file)) removed = set() - for path, entry in tree.inventory.iter_entries(): + for path, entry in tree.iter_entries_by_dir(): if entry.parent_id is None: continue trans_id = tt.trans_id_tree_path(path)