/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/repository_implementations/test_fileid_involved.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_fileid_involved.py
1
1
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
20
from bzrlib.add import smart_add
21
21
from bzrlib.builtins import merge
22
22
from bzrlib.errors import IllegalPath
23
 
from bzrlib.delta import compare_trees
24
23
from bzrlib.tests import TestSkipped
25
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
26
25
from bzrlib.transform import TreeTransform
37
36
    def compare_tree_fileids(self, branch, old_rev, new_rev):
38
37
        old_tree = self.branch.repository.revision_tree(old_rev)
39
38
        new_tree = self.branch.repository.revision_tree(new_rev)
40
 
        delta = compare_trees(old_tree, new_tree)
 
39
        delta = new_tree.changes_from(old_tree)
41
40
 
42
41
        l2 = [id for path, id, kind in delta.added] + \
43
42
             [id for oldpath, newpath, id, kind, text_modified, \