/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

Fix git -> git fetching.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
40
40
from bzrlib.plugins.git.mapping import (
41
41
    default_mapping,
42
42
    )
43
 
from bzrlib.plugins.git.object_store import (
44
 
    BazaarObjectStore,
45
 
    )
46
43
from bzrlib.plugins.git.push import (
47
44
    MissingObjectsIterator,
48
45
    )
50
47
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
51
48
    """Feature tests for GitRepository."""
52
49
 
53
 
    def _do_commit(self):
54
 
        builder = tests.GitBranchBuilder()
55
 
        builder.set_file('a', 'text for a\n', False)
56
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
57
 
        mapping = builder.finish()
58
 
        return mapping[commit_handle]
 
50
    _test_needs_features = [tests.GitCommandFeature]
59
51
 
60
52
    def test_open_existing(self):
61
53
        GitRepo.init(self.test_dir)
67
59
        GitRepo.init(self.test_dir)
68
60
 
69
61
        repo = Repository.open('.')
70
 
        self.assertIsInstance(repo._git, dulwich.repo.BaseRepo)
71
 
 
72
 
    def test_has_revision(self):
73
 
        GitRepo.init(self.test_dir)
74
 
        commit_id = self._do_commit()
75
 
        repo = Repository.open('.')
76
 
        self.assertFalse(repo.has_revision('foobar'))
77
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
78
 
        self.assertTrue(repo.has_revision(revid))
79
 
 
80
 
    def test_has_revisions(self):
81
 
        GitRepo.init(self.test_dir)
82
 
        commit_id = self._do_commit()
83
 
        repo = Repository.open('.')
84
 
        self.assertEquals(set(), repo.has_revisions(['foobar']))
85
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
86
 
        self.assertEquals(set([revid]), repo.has_revisions(['foobar', revid]))
 
62
        self.assertIsInstance(repo._git, dulwich.repo.Repo)
87
63
 
88
64
    def test_get_revision(self):
89
65
        # GitRepository.get_revision gives a Revision object.
90
66
 
91
67
        # Create a git repository with a revision.
92
68
        GitRepo.init(self.test_dir)
93
 
        commit_id = self._do_commit()
 
69
        builder = tests.GitBranchBuilder()
 
70
        builder.set_file('a', 'text for a\n', False)
 
71
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
72
        mapping = builder.finish()
 
73
        commit_id = mapping[commit_handle]
94
74
 
95
75
        # Get the corresponding Revision object.
96
76
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
117
97
        mapping = builder.finish()
118
98
        return mapping[commit_handle]
119
99
 
120
 
    def test_pack(self):
121
 
        commit_id = self.simple_commit()
122
 
        repo = Repository.open('.')
123
 
        repo.pack()
124
 
 
125
100
    def test_revision_tree(self):
126
101
        commit_id = self.simple_commit()
127
102
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
150
125
            " revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
151
126
            "(u'data', False, GitInventoryFile('data', u'data',"
152
127
            " parent_id='TREE_ROOT',"
153
 
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
128
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
154
129
            "(u'executable', True, GitInventoryFile('executable', u'executable',"
155
130
            " parent_id='TREE_ROOT',"
156
 
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
131
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
157
132
            "(u'link', False, GitInventoryLink('link', u'link',"
158
133
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
159
134
            "(u'subdir', False, GitInventoryDirectory('subdir', u'subdir',"
160
135
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
161
136
            "(u'subdir/subfile', False, GitInventoryFile('subdir/subfile',"
162
137
            " u'subfile', parent_id='subdir',"
163
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
 
138
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
164
139
 
165
140
 
166
141
class TestGitRepository(tests.TestCaseWithTransport):
167
142
 
168
 
    def _do_commit(self):
169
 
        builder = tests.GitBranchBuilder()
170
 
        builder.set_file('a', 'text for a\n', False)
171
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
172
 
        mapping = builder.finish()
173
 
        return mapping[commit_handle]
174
 
 
175
143
    def setUp(self):
176
144
        tests.TestCaseWithTransport.setUp(self)
177
145
        dulwich.repo.Repo.create(self.test_dir)
188
156
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
189
157
 
190
158
    def test_all_revision_ids_none(self):
191
 
        self.assertEquals(set([]), self.git_repo.all_revision_ids())
192
 
 
193
 
    def test_all_revision_ids(self):
194
 
        commit_id = self._do_commit()
195
 
        self.assertEquals(
196
 
                set([default_mapping.revision_id_foreign_to_bzr(commit_id)]),
197
 
                self.git_repo.all_revision_ids())
 
159
        self.assertEquals(set([revision.NULL_REVISION]), self.git_repo.all_revision_ids())
198
160
 
199
161
    def test_get_ancestry_null(self):
200
162
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
247
209
                                   self.git_repo)
248
210
 
249
211
    def object_iter(self):
250
 
        store = BazaarObjectStore(self.bzr_tree.branch.repository, default_mapping)
251
 
        store_iterator = MissingObjectsIterator(store, self.bzr_tree.branch.repository)
252
 
        return store, store_iterator
 
212
        return MissingObjectsIterator(self.bzr_tree.branch.repository, 
 
213
                                      default_mapping)
253
214
 
254
215
    def import_rev(self, revid, parent_lookup=None):
255
 
        store, store_iter = self.object_iter()
256
 
        store._cache.idmap.start_write_group()
257
 
        try:
258
 
            return store_iter.import_revision(revid, roundtrip=False)
259
 
        except:
260
 
            store._cache.idmap.abort_write_group()
261
 
            raise
262
 
        else:
263
 
            store._cache.idmap.commit_write_group()
 
216
        return self.object_iter().import_revision(revid)
264
217
 
265
218
    def test_pointless(self):
266
219
        revid = self.bzr_tree.commit("pointless", timestamp=1205433193,
270
223
                self.import_rev(revid))
271
224
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
272
225
                self.import_rev(revid))
273
 
 
274
 
 
275
 
class ForeignTestsRepositoryFactory(object):
276
 
 
277
 
    def make_repository(self, transport):
278
 
        return dir.LocalGitControlDirFormat().initialize_on_transport(transport).open_repository()