← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_revision_tree.py

  • Committer: Martin Pool
  • Date: 2010-07-02 07:29:40 UTC
  • mfrom: (129.1.7 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100702072940-hpzq5elg8wjve8rh
http://bugs.debian.org/452024
http://bugs.debian.org/464688
http://bugs.debian.org/523595
http://bugs.debian.org/526233
http://bugs.debian.org/537708
http://bugs.debian.org/555336
http://bugs.debian.org/555343
https://launchpad.net/bugs/249452
https://launchpad.net/bugs/385074
* PPA rebuild.
* PPA rebuild for Karmic.
* PPA rebuild for Jaunty.
* PPA rebuild for Hardy.
* From postinst, actually remove the example bash completion scripts.
  (LP: #249452)
* New upstream release.
* New upstream release.
* New upstream release.
* Revert change to Build-depends: Dapper does not have python-central.
  Should be python-support..
* Target ppa..
* Target ppa..
* Target ppa..
* Target ppa..
* New upstream release.
* Switch to dpkg-source 3.0 (quilt) format.
* Bump standards version to 3.8.4.
* Remove embedded copy of python-configobj. Closes: #555336
* Remove embedded copy of python-elementtree. Closes: #555343
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* Change section from 'Devel' to 'Vcs'..
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* debian/control: Fix obsolete-relation-form-in-source
  lintian warning. 
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split out docs into bzr-doc package.
* New upstream release.
* Added John Francesco Ferlito to Uploaders.
* Fix install path to quick-reference guide
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to doc paths changing
* New upstream release.
* Fix FTBFS due to path changes, again, again.
* Fix FTBFS due to path changes, again.
* Fix FTBFS due to path changes.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Bump standards version to 3.8.3.
* Remove unused patch system.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix copy and paste tab error in .install file
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
 + Fixes compatibility with Python 2.4. Closes: #537708
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream version.
* Bump standards version to 3.8.2.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add python-pyrex to build-deps to ensure C extensions are always build.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* Split documentation into bzr-doc package. ((LP: #385074)
* Multiple packaging changes to make us more linitan clean.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Fix API compatibility version. (Closes: #526233)
* New upstream release.
  + Fixes default format for upgrade command. (Closes: #464688)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add missing dependency on zlib development library. (Closes:
  #523595)
* Add zlib build-depends.
* Add zlib build-depends.
* Add zlib build-depends.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Move to section vcs.
* Bump standards version to 3.8.1.
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* New upstream release.
* Remove temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* Add temporary patch for missing .c files from distribution
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Recommend ca-certificates. (Closes: #452024)
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Update watch file. bazaar now uses launchpad to host its sources.
* Remove patch for inventory root revision copy, applied upstream.
* New upstream release.
* New upstream release.
* New upstream release
* Force removal of files installed in error to /etc/bash_completion.d/
  (LP: #249452)
* New upstream release.
* New upstream release
* New upstream release.
* Bump standards version.
* Include patch for inventory root revision copy, required for bzr-svn.
* New upstream release.
* Remove unused lintian overrides.
* Correct the package version not to be native.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* Final 1.5 release.
* New upstream release.
* New upstream release.
* New upstream release.
* Add myself as a co-maintainer.
* Add a Dm-Upload-Allowed: yes header.
* New upstream bugfix release.
* New upstream release.
* Final 1.3 release.
* New upstream release.
* First release candidate of the upcoming 1.3 release.
* Rebuild to fix the problem caused by a build with a broken python-central.
* New upstream release.
* Rebuild for dapper PPA.
* Apply Lamont's patches to fix build-dependencies on dapper.
  (See: https://bugs.launchpad.net/bzr/+bug/189915)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_revision_tree.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
"""Tests for WorkingTree.revision_tree.
 
18
 
 
19
These tests are in addition to the tests from
 
20
per_tree.test_revision_tree which cover the behaviour expected from
 
21
all Trees. WorkingTrees implement the revision_tree api to allow access to
 
22
cached data, but we don't require that all WorkingTrees have such a cache,
 
23
so these tests are testing that when there is a cache, it performs correctly.
 
24
"""
 
25
 
 
26
from bzrlib import errors
 
27
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
 
28
 
 
29
 
 
30
class TestRevisionTree(TestCaseWithWorkingTree):
 
31
 
 
32
    def test_get_zeroth_basis_tree_via_revision_tree(self):
 
33
        tree = self.make_branch_and_tree('.')
 
34
        try:
 
35
            revision_tree = tree.revision_tree(tree.last_revision())
 
36
        except errors.NoSuchRevision:
 
37
            # its ok for a working tree to not cache trees, so just return.
 
38
            return
 
39
        basis_tree = tree.basis_tree()
 
40
        self.assertTreesEqual(revision_tree, basis_tree)
 
41
 
 
42
    def test_get_nonzeroth_basis_tree_via_revision_tree(self):
 
43
        tree = self.make_branch_and_tree('.')
 
44
        revision1 = tree.commit('first post')
 
45
        revision_tree = tree.revision_tree(revision1)
 
46
        basis_tree = tree.basis_tree()
 
47
        self.assertTreesEqual(revision_tree, basis_tree)
 
48
 
 
49
    def test_get_pending_merge_revision_tree(self):
 
50
        tree = self.make_branch_and_tree('tree1')
 
51
        tree.commit('first post')
 
52
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
53
        revision1 = tree2.commit('commit in branch', allow_pointless=True)
 
54
        tree.merge_from_branch(tree2.branch)
 
55
        try:
 
56
            cached_revision_tree = tree.revision_tree(revision1)
 
57
        except errors.NoSuchRevision:
 
58
            # its ok for a working tree to not cache trees, so just return.
 
59
            return
 
60
        real_revision_tree = tree2.basis_tree()
 
61
        self.assertTreesEqual(real_revision_tree, cached_revision_tree)
 
62
 
 
63
    def test_get_uncached_basis_via_revision_tree(self):
 
64
        # The basis_tree method returns an empty tree when you ask for the
 
65
        # basis if the basis is not cached, and it is a ghost. However the
 
66
        # revision_tree method should always raise when a request tree is not
 
67
        # cached, so we force this by setting a basis that is a ghost and
 
68
        # thus cannot be cached.
 
69
        tree = self.make_branch_and_tree('.')
 
70
        tree.set_parent_ids(['a-ghost'], allow_leftmost_as_ghost=True)
 
71
        self.assertRaises(errors.NoSuchRevision, tree.revision_tree, 'a-ghost')
 
72
 
 
73
    def test_revision_tree_different_root_id(self):
 
74
        """A revision tree might have a very different root."""
 
75
        tree = self.make_branch_and_tree('tree1')
 
76
        tree.set_root_id('one')
 
77
        rev1 = tree.commit('first post')
 
78
        tree.set_root_id('two')
 
79
        try:
 
80
            cached_revision_tree = tree.revision_tree(rev1)
 
81
        except errors.NoSuchRevision:
 
82
            # its ok for a working tree to not cache trees, so just return.
 
83
            return
 
84
        repository_revision_tree = tree.branch.repository.revision_tree(rev1)
 
85
        self.assertTreesEqual(repository_revision_tree, cached_revision_tree)