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

https://launchpad.net/bugs/449507
Fix fetching between git repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
 
17
18
"""Tests for interfacing with a Git Branch"""
18
19
 
19
 
from bzrlib import revision
20
 
from bzrlib.branch import Branch
 
20
 
 
21
import dulwich
 
22
from dulwich.repo import (
 
23
    Repo as GitRepo,
 
24
    )
 
25
 
 
26
import os
 
27
 
 
28
from bzrlib import (
 
29
    errors,
 
30
    revision,
 
31
    )
 
32
from bzrlib.branch import (
 
33
    Branch,
 
34
    )
 
35
from bzrlib.bzrdir import (
 
36
    BzrDir,
 
37
    )
 
38
from bzrlib.repository import (
 
39
    Repository,
 
40
    )
21
41
 
22
42
from bzrlib.plugins.git import (
23
43
    branch,
24
44
    tests,
25
45
    )
26
 
from bzrlib.plugins.git.mapping import default_mapping
27
 
 
28
 
import dulwich as git
 
46
from bzrlib.plugins.git.mapping import (
 
47
    default_mapping,
 
48
    )
29
49
 
30
50
 
31
51
class TestGitBranch(tests.TestCaseInTempDir):
33
53
    _test_needs_features = [tests.GitCommandFeature]
34
54
 
35
55
    def test_open_existing(self):
36
 
        tests.run_git('init')
 
56
        GitRepo.init('.')
37
57
 
38
58
        thebranch = Branch.open('.')
39
59
        self.assertIsInstance(thebranch, branch.GitBranch)
40
60
 
 
61
    def test_repr(self):
 
62
        GitRepo.init('.')
 
63
        thebranch = Branch.open('.')
 
64
        self.assertEquals("LocalGitBranch('file://%s/', 'HEAD')" % self.test_dir, repr(thebranch))
 
65
 
41
66
    def test_last_revision_is_null(self):
42
 
        tests.run_git('init')
 
67
        GitRepo.init('.')
43
68
 
44
69
        thebranch = Branch.open('.')
45
70
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
47
72
                         thebranch.last_revision_info())
48
73
 
49
74
    def simple_commit_a(self):
50
 
        tests.run_git('init')
 
75
        GitRepo.init('.')
51
76
        self.build_tree(['a'])
52
77
        tests.run_git('add', 'a')
53
78
        tests.run_git('commit', '-m', 'a')
72
97
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
73
98
                         thebranch.revision_history())
74
99
 
75
 
    def test_tags(self):
 
100
    def test_tag_annotated(self):
76
101
        self.simple_commit_a()
77
102
        reva = tests.run_git('rev-parse', 'HEAD').strip()
78
 
        
79
103
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
80
 
        
81
 
        thebranch = Branch.open('.')
82
 
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
83
 
                          thebranch.tags.get_tag_dict())
 
104
        thebranch = Branch.open('.')
 
105
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
106
                          thebranch.tags.get_tag_dict())
 
107
 
 
108
    def test_tag(self):
 
109
        self.simple_commit_a()
 
110
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
111
        tests.run_git('tag', '-m', 'add tag', 'foo')
 
112
        thebranch = Branch.open('.')
 
113
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
114
                          thebranch.tags.get_tag_dict())
 
115
 
84
116
        
85
117
 
86
118
class TestWithGitBranch(tests.TestCaseWithTransport):
87
119
 
88
120
    def setUp(self):
89
121
        tests.TestCaseWithTransport.setUp(self)
90
 
        git.repo.Repo.create(self.test_dir)
 
122
        dulwich.repo.Repo.create(self.test_dir)
91
123
        self.git_branch = Branch.open(self.test_dir)
92
124
 
93
125
    def test_get_parent(self):
94
126
        self.assertIs(None, self.git_branch.get_parent())
95
127
 
96
128
    def test_get_stacked_on_url(self):
97
 
        self.assertIs(None, self.git_branch.get_stacked_on_url())
 
129
        self.assertRaises(errors.UnstackableBranchFormat, 
 
130
            self.git_branch.get_stacked_on_url)
98
131
 
99
132
    def test_get_physical_lock_status(self):
100
133
        self.assertFalse(self.git_branch.get_physical_lock_status())
108
141
 
109
142
    def test_get_format_description(self):
110
143
        self.assertEquals("Git Branch", self.format.get_format_description())
 
144
 
 
145
 
 
146
 
 
147
class BranchTests(tests.TestCaseInTempDir):
 
148
 
 
149
    def make_onerev_branch(self):
 
150
        os.mkdir("d")
 
151
        os.chdir("d")
 
152
        GitRepo.init('.')
 
153
        bb = tests.GitBranchBuilder()
 
154
        bb.set_file("foobar", "foo\nbar\n", False)
 
155
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
156
        gitsha = bb.finish()[mark]
 
157
        os.chdir("..")
 
158
        return "d", gitsha
 
159
 
 
160
    def clone_git_branch(self, from_url, to_url):
 
161
        from_dir = BzrDir.open(from_url)
 
162
        to_dir = from_dir.sprout(to_url)
 
163
        return to_dir.open_branch()
 
164
 
 
165
    def test_single_rev(self):
 
166
        path, gitsha = self.make_onerev_branch()
 
167
        oldrepo = Repository.open(path)
 
168
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
169
        newbranch = self.clone_git_branch(path, "f")
 
170
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
 
171
 
 
172
    def test_sprouted_tags(self):
 
173
        path, gitsha = self.make_onerev_branch()
 
174
        os.chdir(path)
 
175
        tests.run_git("tag", "lala")
 
176
        os.chdir(self.test_dir)
 
177
        oldrepo = Repository.open(path)
 
178
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
179
        newbranch = self.clone_git_branch(path, "f")
 
180
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
 
181
        self.assertEquals([revid], newbranch.repository.all_revision_ids())