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

Try to import nothing other than __init__ when not opening git repositories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
20
20
    branch,
21
21
    config,
22
22
    revision,
 
23
    tag,
23
24
    )
24
25
from bzrlib.decorators import needs_read_lock
25
 
 
26
 
from bzrlib.plugins.git import ids
 
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
27
56
 
28
57
 
29
58
class GitBranchConfig(config.BranchConfig):
34
63
        # do not provide a BranchDataConfig
35
64
        self.option_sources = self.option_sources[0], self.option_sources[2]
36
65
 
37
 
    def set_user_option(self, name, value, local=False):
 
66
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
38
67
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
68
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
40
69
 
41
70
 
42
71
class GitBranchFormat(branch.BranchFormat):
44
73
    def get_format_description(self):
45
74
        return 'Git Branch'
46
75
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
76
    def supports_tags(self):
 
77
        return True
 
78
 
 
79
 
 
80
class GitBranch(ForeignBranch):
49
81
    """An adapter to git repositories for bzr Branch objects."""
50
82
 
51
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
52
 
        super(GitBranch, self).__init__()
 
83
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
84
        self.repository = repository
 
85
        super(GitBranch, self).__init__(repository.get_mapping())
53
86
        self.control_files = lockfiles
54
87
        self.bzrdir = bzrdir
55
 
        self.repository = repository
 
88
        self.name = name
56
89
        self.head = head
57
 
        self.base = base
 
90
        self.base = bzrdir.transport.base
58
91
        self._format = GitBranchFormat()
59
92
 
60
93
    def lock_write(self):
61
94
        self.control_files.lock_write()
62
95
 
 
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
 
63
119
    @needs_read_lock
64
120
    def last_revision(self):
65
121
        # perhaps should escape this ?
66
122
        if self.head is None:
67
123
            return revision.NULL_REVISION
68
 
        return ids.convert_revision_id_git_to_bzr(self.head)
69
 
 
70
 
    def get_parent(self):
71
 
        """See Branch.get_parent()."""
72
 
        return None
73
 
 
74
 
    def get_stacked_on_url(self):
75
 
        return None
 
124
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
125
 
 
126
    def _make_tags(self):
 
127
        return GitTagDict(self)
76
128
 
77
129
    def _gen_revision_history(self):
78
130
        if self.head is None:
79
131
            return []
80
 
        skip = 0
81
 
        cms = None
82
 
        ret = []
83
 
        max_count = 1000
84
 
        nextid = self.head
85
 
        while cms != []:
86
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
87
 
            skip += max_count
88
 
            for cm in cms:
89
 
                if cm.id == nextid:
90
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
91
 
                    if cm.parents == []:
92
 
                        nextid = None
93
 
                    else:
94
 
                        nextid = cm.parents[0].id
 
132
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
95
133
        ret.reverse()
96
134
        return ret
97
135
 
98
136
    def get_config(self):
99
137
        return GitBranchConfig(self)
100
138
 
101
 
    def lock_read(self):
102
 
        self.control_files.lock_read()
103
 
 
104
 
    def unlock(self):
105
 
        self.control_files.unlock()
106
 
 
107
 
    def get_physical_lock_status(self):
108
 
        return False
109
 
 
110
139
    def get_push_location(self):
111
140
        """See Branch.get_push_location."""
112
141
        push_loc = self.get_config().get_user_option('push_location')
115
144
    def set_push_location(self, location):
116
145
        """See Branch.set_push_location."""
117
146
        self.get_config().set_user_option('push_location', location,
118
 
                                          local=True)
 
147
                                          store=config.STORE_LOCATION)
119
148
 
120
149
    def supports_tags(self):
121
 
        return False
 
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