/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

Default to using global user id rather than making one up.

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