/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 tests/test_repository.py

use mapping object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
25
25
    )
26
26
from bzrlib.repository import Repository
27
27
 
28
 
from bzrlib.plugins.git import tests
29
28
from bzrlib.plugins.git import (
30
29
    dir,
31
30
    repository,
32
 
    ids,
 
31
    tests,
33
32
    )
 
33
from bzrlib.plugins.git.mapping import default_mapping
34
34
 
35
35
 
36
36
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
62
62
        commit_id = mapping[commit_handle]
63
63
 
64
64
        # Get the corresponding Revision object.
65
 
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
 
65
        revid = default_mapping.convert_revision_id_git_to_bzr(commit_id)
66
66
        repo = Repository.open('.')
67
67
        rev = repo.get_revision(revid)
68
68
        self.assertIsInstance(rev, revision.Revision)
82
82
 
83
83
    def test_revision_tree(self):
84
84
        commit_id = self.simple_commit()
85
 
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
 
85
        revid = default_mapping.convert_revision_id_git_to_bzr(commit_id)
86
86
        repo = Repository.open('.')
87
87
        tree = repo.revision_tree(revid)
88
88
        self.assertEquals(tree.get_revision_id(), revid)
95
95
        commit_id = self.simple_commit()
96
96
 
97
97
        # Get the corresponding Inventory object.
98
 
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
 
98
        revid = default_mapping.convert_revision_id_git_to_bzr(commit_id)
99
99
        repo = Repository.open('.')
100
100
        inv = repo.get_inventory(revid)
101
101
        self.assertIsInstance(inv, inventory.Inventory)
105
105
        self.assertEqualDiff(
106
106
            printed_inv,
107
107
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
108
 
            " revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
108
            " revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
109
109
            "(u'data', False, InventoryFile('data', u'data',"
110
110
            " parent_id='TREE_ROOT',"
111
111
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5))\n"
113
113
            " parent_id='TREE_ROOT',"
114
114
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7))\n"
115
115
            "(u'link', False, InventoryLink('link', u'link',"
116
 
            " parent_id='TREE_ROOT', revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
116
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
117
117
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
118
 
            " parent_id='TREE_ROOT', revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
118
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
119
119
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
120
120
            " u'subfile', parent_id='subdir',"
121
121
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")