~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-16 19:55:10 UTC
  • mfrom: (1770.3.3 bzr.jelmer.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060616195510-99f53d52da967571
(jrydberg, jelmer) Change Branch.get_revision_delta() to use Repository.get_revision_delta()

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
import bzrlib.bzrdir as bzrdir
24
24
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
25
25
from bzrlib.commit import commit
 
26
from bzrlib.delta import TreeDelta
26
27
import bzrlib.errors as errors
27
28
from bzrlib.errors import (FileExists,
28
29
                           NoSuchRevision,
101
102
        tree = b2.repository.revision_tree('revision-1')
102
103
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
103
104
 
 
105
    def test_get_revision_delta(self):
 
106
        tree_a = self.make_branch_and_tree('a')
 
107
        self.build_tree(['a/foo'])
 
108
        tree_a.add('foo', 'file1')
 
109
        tree_a.commit('rev1', rev_id='rev1')
 
110
        self.build_tree(['a/vla'])
 
111
        tree_a.add('vla', 'file2')
 
112
        tree_a.commit('rev2', rev_id='rev2')
 
113
 
 
114
        delta = tree_a.branch.get_revision_delta(1)
 
115
        self.assertIsInstance(delta, TreeDelta)
 
116
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
 
117
        delta = tree_a.branch.get_revision_delta(2)
 
118
        self.assertIsInstance(delta, TreeDelta)
 
119
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
 
120
 
104
121
    def get_unbalanced_tree_pair(self):
105
122
        """Return two branches, a and b, with one file in a."""
106
123
        get_transport(self.get_url()).mkdir('a')