/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

Partially fix pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
16
16
 
17
17
"""Tests for interfacing with a Git Repository"""
18
18
 
19
 
import dulwich
20
 
from dulwich.repo import (
21
 
    Repo as GitRepo,
22
 
    )
23
 
import os
24
 
 
25
19
from bzrlib import (
26
20
    errors,
27
21
    inventory,
28
22
    revision,
29
23
    )
30
 
from bzrlib.repository import (
31
 
    InterRepository,
32
 
    Repository,
33
 
    )
 
24
from bzrlib.repository import Repository
34
25
 
35
26
from bzrlib.plugins.git import (
36
27
    dir,
37
28
    repository,
38
29
    tests,
39
30
    )
40
 
from bzrlib.plugins.git.mapping import (
41
 
    default_mapping,
42
 
    )
43
 
from bzrlib.plugins.git.object_store import (
44
 
    BazaarObjectStore,
45
 
    )
46
 
from bzrlib.plugins.git.push import (
47
 
    MissingObjectsIterator,
48
 
    )
 
31
from bzrlib.plugins.git.mapping import default_mapping
 
32
 
 
33
import dulwich as git
49
34
 
50
35
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
51
36
    """Feature tests for GitRepository."""
53
38
    _test_needs_features = [tests.GitCommandFeature]
54
39
 
55
40
    def test_open_existing(self):
56
 
        GitRepo.init(self.test_dir)
 
41
        tests.run_git('init')
57
42
 
58
43
        repo = Repository.open('.')
59
44
        self.assertIsInstance(repo, repository.GitRepository)
60
45
 
61
46
    def test_has_git_repo(self):
62
 
        GitRepo.init(self.test_dir)
 
47
        tests.run_git('init')
63
48
 
64
49
        repo = Repository.open('.')
65
 
        self.assertIsInstance(repo._git, dulwich.repo.Repo)
 
50
        self.assertIsInstance(repo._git, git.repo.Repo)
66
51
 
67
52
    def test_get_revision(self):
68
53
        # GitRepository.get_revision gives a Revision object.
69
54
 
70
55
        # Create a git repository with a revision.
71
 
        GitRepo.init(self.test_dir)
 
56
        tests.run_git('init')
72
57
        builder = tests.GitBranchBuilder()
73
58
        builder.set_file('a', 'text for a\n', False)
74
59
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
82
67
        self.assertIsInstance(rev, revision.Revision)
83
68
 
84
69
    def test_get_revision_unknown(self):
85
 
        GitRepo.init(self.test_dir)
 
70
        tests.run_git('init')
86
71
 
87
72
        repo = Repository.open('.')
88
73
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
89
74
 
90
75
    def simple_commit(self):
91
76
        # Create a git repository with some interesting files in a revision.
92
 
        GitRepo.init(self.test_dir)
 
77
        tests.run_git('init')
93
78
        builder = tests.GitBranchBuilder()
94
79
        builder.set_file('data', 'text\n', False)
95
80
        builder.set_file('executable', 'content', True)
124
109
            for path, entry in inv.iter_entries())
125
110
        self.assertEqualDiff(
126
111
            printed_inv,
127
 
            "('', False, GitInventoryDirectory('TREE_ROOT', u'', parent_id=None,"
 
112
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
128
113
            " revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
129
 
            "(u'data', False, GitInventoryFile('data', u'data',"
130
 
            " parent_id='TREE_ROOT',"
131
 
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
132
 
            "(u'executable', True, GitInventoryFile('executable', u'executable',"
133
 
            " parent_id='TREE_ROOT',"
134
 
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
135
 
            "(u'link', False, GitInventoryLink('link', u'link',"
136
 
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
137
 
            "(u'subdir', False, GitInventoryDirectory('subdir', u'subdir',"
138
 
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
139
 
            "(u'subdir/subfile', False, GitInventoryFile('subdir/subfile',"
 
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='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
 
122
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
 
123
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
 
124
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
140
125
            " u'subfile', parent_id='subdir',"
141
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
 
126
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")
142
127
 
143
128
 
144
129
class TestGitRepository(tests.TestCaseWithTransport):
145
130
 
146
131
    def setUp(self):
147
132
        tests.TestCaseWithTransport.setUp(self)
148
 
        dulwich.repo.Repo.create(self.test_dir)
 
133
        git.repo.Repo.create(self.test_dir)
149
134
        self.git_repo = Repository.open(self.test_dir)
150
135
 
151
136
    def test_supports_rich_root(self):
159
144
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
160
145
 
161
146
    def test_all_revision_ids_none(self):
162
 
        self.assertEquals(set([revision.NULL_REVISION]), self.git_repo.all_revision_ids())
 
147
        self.assertEquals(set(), self.git_repo.all_revision_ids())
163
148
 
164
149
    def test_get_ancestry_null(self):
165
 
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
 
150
        self.assertEquals([None], self.git_repo.get_ancestry(revision.NULL_REVISION))
166
151
 
167
152
    def assertIsNullInventory(self, inv):
168
153
        self.assertEqual(inv.root, None)
191
176
 
192
177
    def setUp(self):
193
178
        super(GitRepositoryFormat, self).setUp()
194
 
        self.format = repository.GitRepositoryFormat()
 
179
        self.format = repository.GitFormat()
195
180
 
196
181
    def test_get_format_description(self):
197
182
        self.assertEquals("Git Repository", self.format.get_format_description())
198
 
 
199
 
 
200
 
class RevisionGistImportTests(tests.TestCaseWithTransport):
201
 
 
202
 
    def setUp(self):
203
 
        tests.TestCaseWithTransport.setUp(self)
204
 
        self.git_path = os.path.join(self.test_dir, "git")
205
 
        os.mkdir(self.git_path)
206
 
        dulwich.repo.Repo.create(self.git_path)
207
 
        self.git_repo = Repository.open(self.git_path)
208
 
        self.bzr_tree = self.make_branch_and_tree("bzr")
209
 
 
210
 
    def get_inter(self):
211
 
        return InterRepository.get(self.bzr_tree.branch.repository, 
212
 
                                   self.git_repo)
213
 
 
214
 
    def object_iter(self):
215
 
        store = BazaarObjectStore(self.bzr_tree.branch.repository, default_mapping)
216
 
        return MissingObjectsIterator(store, self.bzr_tree.branch.repository)
217
 
 
218
 
    def import_rev(self, revid, parent_lookup=None):
219
 
        return self.object_iter().import_revision(revid)
220
 
 
221
 
    def test_pointless(self):
222
 
        revid = self.bzr_tree.commit("pointless", timestamp=1205433193,
223
 
                timezone=0,
224
 
                  committer="Jelmer Vernooij <jelmer@samba.org>")
225
 
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
226
 
                self.import_rev(revid))
227
 
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
228
 
                self.import_rev(revid))