/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_git_repository.py

Flat is better than nested, remove the gitlib hierarchy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_git_repository.py
16
16
 
17
17
"""Tests for interfacing with a Git Repository"""
18
18
 
19
 
from bzrlib import (
20
 
    errors,
21
 
    inventory,
22
 
    revision,
23
 
    )
24
 
from bzrlib.repository import Repository
25
 
 
 
19
import subprocess
 
20
 
 
21
from bzrlib import repository
 
22
 
 
23
from bzrlib.plugins.git import tests
26
24
from bzrlib.plugins.git import (
27
 
    dir,
28
 
    git,
29
 
    repository,
30
 
    tests,
 
25
    git_repository,
 
26
    ids,
 
27
    model,
31
28
    )
32
 
from bzrlib.plugins.git.mapping import default_mapping
33
 
 
34
 
 
35
 
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
36
 
    """Feature tests for GitRepository."""
 
29
 
 
30
 
 
31
class TestGitRepository(tests.TestCaseInTempDir):
37
32
 
38
33
    _test_needs_features = [tests.GitCommandFeature]
39
34
 
40
35
    def test_open_existing(self):
41
36
        tests.run_git('init')
42
37
 
43
 
        repo = Repository.open('.')
44
 
        self.assertIsInstance(repo, repository.GitRepository)
45
 
 
46
 
    def test_has_git_repo(self):
47
 
        tests.run_git('init')
48
 
 
49
 
        repo = Repository.open('.')
50
 
        self.assertIsInstance(repo._git, git.repo.Repo)
51
 
 
52
 
    def test_get_revision(self):
53
 
        # GitRepository.get_revision gives a Revision object.
54
 
 
55
 
        # Create a git repository with a revision.
56
 
        tests.run_git('init')
57
 
        builder = tests.GitBranchBuilder()
58
 
        builder.set_file('a', 'text for a\n', False)
59
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
60
 
        mapping = builder.finish()
61
 
        commit_id = mapping[commit_handle]
62
 
 
63
 
        # Get the corresponding Revision object.
64
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
65
 
        repo = Repository.open('.')
66
 
        rev = repo.get_revision(revid)
67
 
        self.assertIsInstance(rev, revision.Revision)
68
 
 
69
 
    def test_get_revision_unknown(self):
70
 
        tests.run_git('init')
71
 
 
72
 
        repo = Repository.open('.')
73
 
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
74
 
 
75
 
    def simple_commit(self):
76
 
        # Create a git repository with some interesting files in a revision.
77
 
        tests.run_git('init')
78
 
        builder = tests.GitBranchBuilder()
79
 
        builder.set_file('data', 'text\n', False)
80
 
        builder.set_file('executable', 'content', True)
81
 
        builder.set_link('link', 'broken')
82
 
        builder.set_file('subdir/subfile', 'subdir text\n', False)
83
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message',
84
 
            timestamp=1205433193)
85
 
        mapping = builder.finish()
86
 
        return mapping[commit_handle]
87
 
 
88
 
    def test_revision_tree(self):
89
 
        commit_id = self.simple_commit()
90
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
91
 
        repo = Repository.open('.')
92
 
        tree = repo.revision_tree(revid)
93
 
        self.assertEquals(tree.get_revision_id(), revid)
94
 
        self.assertEquals("text\n", tree.get_file_text(tree.path2id("data")))
95
 
 
96
 
    def test_get_inventory(self):
97
 
        # GitRepository.get_inventory gives a GitInventory object with
98
 
        # plausible entries for typical cases.
99
 
 
100
 
        commit_id = self.simple_commit()
101
 
 
102
 
        # Get the corresponding Inventory object.
103
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
104
 
        repo = Repository.open('.')
105
 
        inv = repo.get_inventory(revid)
106
 
        self.assertIsInstance(inv, inventory.Inventory)
107
 
        printed_inv = '\n'.join(
108
 
            repr((path, entry.executable, entry))
109
 
            for path, entry in inv.iter_entries())
110
 
        self.assertEqualDiff(
111
 
            printed_inv,
112
 
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
113
 
            " revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
114
 
            "(u'data', False, InventoryFile('data', u'data',"
115
 
            " parent_id='TREE_ROOT',"
116
 
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5))\n"
117
 
            "(u'executable', True, InventoryFile('executable', u'executable',"
118
 
            " parent_id='TREE_ROOT',"
119
 
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7))\n"
120
 
            "(u'link', False, InventoryLink('link', u'link',"
121
 
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
122
 
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
123
 
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
124
 
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
125
 
            " u'subfile', parent_id='subdir',"
126
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")
127
 
 
128
 
 
129
 
class TestGitRepository(tests.TestCaseWithTransport):
130
 
 
131
 
    def setUp(self):
132
 
        tests.TestCaseWithTransport.setUp(self)
133
 
        git.repo.Repo.create(self.test_dir)
134
 
        self.git_repo = Repository.open(self.test_dir)
135
 
 
136
 
    def test_supports_rich_root(self):
137
 
        repo = self.git_repo
138
 
        self.assertEqual(repo.supports_rich_root(), True)
139
 
 
140
 
    def test_get_signature_text(self):
141
 
        self.assertRaises(errors.NoSuchRevision, self.git_repo.get_signature_text, revision.NULL_REVISION)
142
 
 
143
 
    def test_has_signature_for_revision_id(self):
144
 
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
145
 
 
146
 
    def test_all_revision_ids_none(self):
147
 
        self.assertEquals(set(), self.git_repo.all_revision_ids())
148
 
 
149
 
    def test_get_ancestry_null(self):
150
 
        self.assertEquals([None], self.git_repo.get_ancestry(revision.NULL_REVISION))
151
 
 
152
 
    def assertIsNullInventory(self, inv):
153
 
        self.assertEqual(inv.root, None)
154
 
        self.assertEqual(inv.revision_id, revision.NULL_REVISION)
155
 
        self.assertEqual(list(inv.iter_entries()), [])
156
 
 
157
 
    def test_get_inventory_none(self):
158
 
        # GitRepository.get_inventory(None) returns the null inventory.
159
 
        repo = self.git_repo
160
 
        inv = repo.get_inventory(revision.NULL_REVISION)
161
 
        self.assertIsNullInventory(inv)
162
 
 
163
 
    def test_revision_tree_none(self):
164
 
        # GitRepository.revision_tree(None) returns the null tree.
165
 
        repo = self.git_repo
166
 
        tree = repo.revision_tree(revision.NULL_REVISION)
167
 
        self.assertEqual(tree.get_revision_id(), revision.NULL_REVISION)
168
 
        self.assertIsNullInventory(tree.inventory)
169
 
 
170
 
    def test_get_parent_map_null(self):
171
 
        self.assertEquals({revision.NULL_REVISION: ()}, 
172
 
                           self.git_repo.get_parent_map([revision.NULL_REVISION]))
173
 
 
174
 
 
175
 
class GitRepositoryFormat(tests.TestCase):
176
 
 
177
 
    def setUp(self):
178
 
        super(GitRepositoryFormat, self).setUp()
179
 
        self.format = repository.GitFormat()
180
 
 
181
 
    def test_get_format_description(self):
182
 
        self.assertEquals("Git Repository", self.format.get_format_description())
 
38
        repo = repository.Repository.open('.')
 
39
        self.assertIsInstance(repo, git_repository.GitRepository)
 
40
 
 
41
    def test_has_git_model(self):
 
42
        tests.run_git('init')
 
43
 
 
44
        repo = repository.Repository.open('.')
 
45
        self.assertIsInstance(repo._git, model.GitModel)
 
46
 
 
47
    def test_revision_graph(self):
 
48
        tests.run_git('init')
 
49
        builder = tests.GitBranchBuilder()
 
50
        file_handle = builder.set_file('a', 'text for a\n', False)
 
51
        commit1_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
52
        file2_handle = builder.set_file('a', 'new a\n', False)
 
53
        commit2_handle = builder.commit('Joe Foo <joe@foo.com>', u'new a')
 
54
        file3_handle = builder.set_file('b', 'text for b\n', False)
 
55
        commit3_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'b',
 
56
                                        base=commit1_handle)
 
57
        commit4_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'merge',
 
58
                                        base=commit3_handle,
 
59
                                        merge=[commit2_handle],)
 
60
 
 
61
        mapping = builder.finish()
 
62
        commit1_id = mapping[commit1_handle]
 
63
        commit2_id = mapping[commit2_handle]
 
64
        commit3_id = mapping[commit3_handle]
 
65
        commit4_id = mapping[commit4_handle]
 
66
 
 
67
        revisions = tests.run_git('rev-list', '--topo-order',
 
68
                                  commit4_id)
 
69
        revisions = revisions.splitlines()
 
70
        self.assertEqual([commit4_id, commit2_id, commit3_id, commit1_id],
 
71
                         revisions)
 
72
        bzr_revisions = [ids.convert_revision_id_git_to_bzr(r) for r in revisions]
 
73
        graph = {bzr_revisions[0]:[bzr_revisions[2], bzr_revisions[1]],
 
74
                 bzr_revisions[1]:[bzr_revisions[3]],
 
75
                 bzr_revisions[2]:[bzr_revisions[3]],
 
76
                 bzr_revisions[3]:[],
 
77
                }
 
78
 
 
79
        repo = repository.Repository.open('.')
 
80
        self.assertEqual(graph, repo.get_revision_graph(bzr_revisions[0]))
 
81
        self.assertEqual({bzr_revisions[3]:[]},
 
82
                         repo.get_revision_graph(bzr_revisions[3]))