/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 gitlib/git_branch.py

More refactoring. Add some direct tests for GitModel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gitlib/git_branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
23
 
    tag,
24
23
    )
25
24
from bzrlib.decorators import needs_read_lock
26
 
from bzrlib.trace import mutter
27
 
 
28
 
from bzrlib.plugins.git.foreign import ForeignBranch
29
 
 
30
 
from dulwich.objects import (
31
 
        Commit,
32
 
        Tag,
33
 
        )
34
 
 
35
 
class GitTagDict(tag.BasicTags):
36
 
 
37
 
    def __init__(self, branch):
38
 
        self.branch = branch
39
 
        self.repository = branch.repository
40
 
 
41
 
    def get_tag_dict(self):
42
 
        ret = {}
43
 
        for k,v in self.repository._git.tags.iteritems():
44
 
            obj = self.repository._git.get_object(v)
45
 
            while isinstance(obj, Tag):
46
 
                v = obj.object[1]
47
 
                obj = self.repository._git.get_object(v)
48
 
            if not isinstance(obj, Commit):
49
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
50
 
                continue
51
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
52
 
        return ret
53
 
 
54
 
    def set_tag(self, name, revid):
55
 
        self.repository._git.tags[name] = revid
56
25
 
57
26
 
58
27
class GitBranchConfig(config.BranchConfig):
70
39
 
71
40
class GitBranchFormat(branch.BranchFormat):
72
41
 
73
 
    def get_format_description(self):
 
42
    def get_branch_description(self):
74
43
        return 'Git Branch'
75
44
 
76
 
    def supports_tags(self):
77
 
        return True
78
 
 
79
 
 
80
 
class GitBranch(ForeignBranch):
 
45
 
 
46
class GitBranch(branch.Branch):
81
47
    """An adapter to git repositories for bzr Branch objects."""
82
48
 
83
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
84
 
        self.repository = repository
85
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
49
    def __init__(self, gitdir, lockfiles):
 
50
        from bzrlib.plugins.git.gitlib import git_repository
 
51
        self.bzrdir = gitdir
86
52
        self.control_files = lockfiles
87
 
        self.bzrdir = bzrdir
88
 
        self.name = name
89
 
        self.head = head
90
 
        self.base = bzrdir.transport.base
 
53
        self.repository = git_repository.GitRepository(gitdir, lockfiles)
 
54
        self.base = gitdir.root_transport.base
 
55
        if '.git' not in gitdir.root_transport.list_dir('.'):
 
56
            raise errors.NotBranchError(self.base)
91
57
        self._format = GitBranchFormat()
92
58
 
93
59
    def lock_write(self):
94
60
        self.control_files.lock_write()
95
61
 
96
 
    def get_stacked_on_url(self):
97
 
        # Git doesn't do stacking (yet...)
98
 
        return None
99
 
 
100
 
    def get_parent(self):
101
 
        """See Branch.get_parent()."""
102
 
        return None
103
 
 
104
 
    def set_parent(self, url):
105
 
        pass
106
 
 
107
 
    def lock_read(self):
108
 
        self.control_files.lock_read()
109
 
 
110
 
    def unlock(self):
111
 
        self.control_files.unlock()
112
 
 
113
 
    def get_physical_lock_status(self):
114
 
        return False
115
 
 
116
 
 
117
 
class LocalGitBranch(GitBranch):
118
 
 
119
62
    @needs_read_lock
120
63
    def last_revision(self):
121
64
        # perhaps should escape this ?
122
 
        if self.head is None:
 
65
        head_git_id = self.repository._git.get_head()
 
66
        if head_git_id is None:
123
67
            return revision.NULL_REVISION
124
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
125
 
 
126
 
    def _make_tags(self):
127
 
        return GitTagDict(self)
128
 
 
129
 
    def _gen_revision_history(self):
130
 
        if self.head is None:
131
 
            return []
132
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
133
 
        ret.reverse()
134
 
        return ret
 
68
        return ids.convert_revision_id_git_to_bzr(head_git_id)
 
69
 
 
70
    @needs_read_lock
 
71
    def revision_history(self):
 
72
        node = self.last_revision()
 
73
        ancestors = self.repository.get_revision_graph(node)
 
74
        history = []
 
75
        while node is not None:
 
76
            history.append(node)
 
77
            if len(ancestors[node]) > 0:
 
78
                node = ancestors[node][0]
 
79
            else:
 
80
                node = None
 
81
        return list(reversed(history))
135
82
 
136
83
    def get_config(self):
137
84
        return GitBranchConfig(self)
138
85
 
 
86
    def lock_read(self):
 
87
        self.control_files.lock_read()
 
88
 
 
89
    def unlock(self):
 
90
        self.control_files.unlock()
 
91
 
139
92
    def get_push_location(self):
140
93
        """See Branch.get_push_location."""
141
94
        push_loc = self.get_config().get_user_option('push_location')
146
99
        self.get_config().set_user_option('push_location', location,
147
100
                                          local=True)
148
101
 
149
 
    def supports_tags(self):
150
 
        return True
151
 
 
152
 
    def sprout(self, to_bzrdir, revision_id=None):
153
 
        """See Branch.sprout()."""
154
 
        result = to_bzrdir.create_branch()
155
 
        self.copy_content_into(result, revision_id=revision_id)
156
 
        result.set_parent(self.bzrdir.root_transport.base)
157
 
        return result
158
102