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