/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

Add simple HACKING document.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
16
16
 
17
17
"""Tests for interfacing with a Git Branch"""
18
18
 
19
 
from bzrlib import revision
20
 
from bzrlib.branch import Branch
 
19
import dulwich as git
 
20
import os
 
21
 
 
22
from bzrlib import (
 
23
    revision,
 
24
    )
 
25
from bzrlib.branch import (
 
26
    Branch,
 
27
    )
 
28
from bzrlib.bzrdir import (
 
29
    BzrDir,
 
30
    )
 
31
from bzrlib.repository import (
 
32
    Repository,
 
33
    )
21
34
 
22
35
from bzrlib.plugins.git import (
23
36
    branch,
25
38
    )
26
39
from bzrlib.plugins.git.mapping import default_mapping
27
40
 
28
 
import dulwich as git
29
 
 
30
41
 
31
42
class TestGitBranch(tests.TestCaseInTempDir):
32
43
 
72
83
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
73
84
                         thebranch.revision_history())
74
85
 
75
 
    def test_tags(self):
 
86
    def test_tag_annotated(self):
76
87
        self.simple_commit_a()
77
88
        reva = tests.run_git('rev-parse', 'HEAD').strip()
78
 
        
79
89
        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())
 
90
        thebranch = Branch.open('.')
 
91
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
92
                          thebranch.tags.get_tag_dict())
 
93
 
 
94
    def test_tag(self):
 
95
        self.simple_commit_a()
 
96
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
97
        tests.run_git('tag', '-m', 'add tag', 'foo')
 
98
        thebranch = Branch.open('.')
 
99
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
100
                          thebranch.tags.get_tag_dict())
 
101
 
84
102
        
85
103
 
86
104
class TestWithGitBranch(tests.TestCaseWithTransport):
108
126
 
109
127
    def test_get_format_description(self):
110
128
        self.assertEquals("Git Branch", self.format.get_format_description())
 
129
 
 
130
 
 
131
 
 
132
class BranchTests(tests.TestCaseInTempDir):
 
133
 
 
134
    def make_onerev_branch(self):
 
135
        os.mkdir("d")
 
136
        os.chdir("d")
 
137
        tests.run_git("init")
 
138
        bb = tests.GitBranchBuilder()
 
139
        bb.set_file("foobar", "foo\nbar\n", False)
 
140
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
141
        gitsha = bb.finish()[mark]
 
142
        os.chdir("..")
 
143
        return "d", gitsha
 
144
 
 
145
    def clone_git_branch(self, from_url, to_url):
 
146
        from_dir = BzrDir.open(from_url)
 
147
        to_dir = from_dir.sprout(to_url)
 
148
        return to_dir.open_branch()
 
149
 
 
150
    def test_single_rev(self):
 
151
        path, gitsha = self.make_onerev_branch()
 
152
        oldrepo = Repository.open(path)
 
153
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
154
        newbranch = self.clone_git_branch(path, "f")
 
155
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
 
156
 
 
157
    def test_sprouted_tags(self):
 
158
        path, gitsha = self.make_onerev_branch()
 
159
        os.chdir(path)
 
160
        tests.run_git("tag", "lala")
 
161
        os.chdir(self.test_dir)
 
162
        oldrepo = Repository.open(path)
 
163
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
164
        newbranch = self.clone_git_branch(path, "f")
 
165
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
 
166
        self.assertEquals([revid], newbranch.repository.all_revision_ids())