/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

Revert locking fixes for now, as they break bzr 1.13 compatibility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
19
19
from bzrlib import (
20
20
    branch,
21
21
    config,
 
22
    repository,
22
23
    revision,
 
24
    tag,
23
25
    )
24
26
from bzrlib.decorators import needs_read_lock
25
 
 
26
 
from bzrlib.plugins.git import ids
 
27
from bzrlib.trace import mutter
 
28
 
 
29
from bzrlib.plugins.git.foreign import ForeignBranch
 
30
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
 
31
 
 
32
from dulwich.objects import (
 
33
        Commit,
 
34
        Tag,
 
35
        )
 
36
 
 
37
class GitTagDict(tag.BasicTags):
 
38
 
 
39
    def __init__(self, branch):
 
40
        self.branch = branch
 
41
        self.repository = branch.repository
 
42
 
 
43
    def get_tag_dict(self):
 
44
        ret = {}
 
45
        for k,v in self.repository._git.tags.iteritems():
 
46
            obj = self.repository._git.get_object(v)
 
47
            while isinstance(obj, Tag):
 
48
                v = obj.object[1]
 
49
                obj = self.repository._git.get_object(v)
 
50
            if not isinstance(obj, Commit):
 
51
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
52
                continue
 
53
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
54
        return ret
 
55
 
 
56
    def set_tag(self, name, revid):
 
57
        self.repository._git.tags[name] = revid
27
58
 
28
59
 
29
60
class GitBranchConfig(config.BranchConfig):
34
65
        # do not provide a BranchDataConfig
35
66
        self.option_sources = self.option_sources[0], self.option_sources[2]
36
67
 
37
 
    def set_user_option(self, name, value, local=False):
 
68
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
38
69
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
70
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
40
71
 
41
72
 
42
73
class GitBranchFormat(branch.BranchFormat):
44
75
    def get_format_description(self):
45
76
        return 'Git Branch'
46
77
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
78
    def supports_tags(self):
 
79
        return True
 
80
 
 
81
    def make_tags(self, branch):
 
82
        return GitTagDict(branch)
 
83
 
 
84
 
 
85
class GitBranch(ForeignBranch):
49
86
    """An adapter to git repositories for bzr Branch objects."""
50
87
 
51
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
52
 
        super(GitBranch, self).__init__()
 
88
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
89
        self.repository = repository
 
90
        self._format = GitBranchFormat()
 
91
        super(GitBranch, self).__init__(repository.get_mapping())
53
92
        self.control_files = lockfiles
54
93
        self.bzrdir = bzrdir
55
 
        self.repository = repository
 
94
        self.name = name
56
95
        self.head = head
57
 
        self.base = base
58
 
        self._format = GitBranchFormat()
 
96
        self.base = bzrdir.transport.base
 
97
 
 
98
    def dpull(self, source, stop_revision=None):
 
99
        if stop_revision is None:
 
100
            stop_revision = source.last_revision()
 
101
        # FIXME: Check for diverged branches
 
102
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
103
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
104
        return revidmap
59
105
 
60
106
    def lock_write(self):
61
107
        self.control_files.lock_write()
62
108
 
 
109
    def get_stacked_on_url(self):
 
110
        # Git doesn't do stacking (yet...)
 
111
        return None
 
112
 
 
113
    def get_parent(self):
 
114
        """See Branch.get_parent()."""
 
115
        return None
 
116
 
 
117
    def set_parent(self, url):
 
118
        pass
 
119
 
 
120
    def lock_read(self):
 
121
        self.control_files.lock_read()
 
122
 
 
123
    def unlock(self):
 
124
        self.control_files.unlock()
 
125
 
 
126
    def get_physical_lock_status(self):
 
127
        return False
 
128
 
 
129
 
 
130
class LocalGitBranch(GitBranch):
 
131
 
63
132
    @needs_read_lock
64
133
    def last_revision(self):
65
134
        # perhaps should escape this ?
66
135
        if self.head is None:
67
136
            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
 
137
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
138
 
 
139
    def create_checkout(self, to_location, revision_id=None, 
 
140
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
141
        if lightweight:
 
142
            raise LightWeightCheckoutsNotSupported()
 
143
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
144
 
 
145
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
146
                                     hardlink=False):
 
147
        """Create a new heavyweight checkout of this branch.
 
148
 
 
149
        :param to_location: URL of location to create the new checkout in.
 
150
        :param revision_id: Revision that should be the tip of the checkout.
 
151
        :param hardlink: Whether to hardlink
 
152
        :return: WorkingTree object of checkout.
 
153
        """
 
154
        checkout_branch = BzrDir.create_branch_convenience(
 
155
            to_location, force_new_tree=False, format=get_rich_root_format())
 
156
        checkout = checkout_branch.bzrdir
 
157
        checkout_branch.bind(self)
 
158
        # pull up to the specified revision_id to set the initial 
 
159
        # branch tip correctly, and seed it with history.
 
160
        checkout_branch.pull(self, stop_revision=revision_id)
 
161
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
76
162
 
77
163
    def _gen_revision_history(self):
78
164
        if self.head is None:
79
165
            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
 
166
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
95
167
        ret.reverse()
96
168
        return ret
97
169
 
98
170
    def get_config(self):
99
171
        return GitBranchConfig(self)
100
172
 
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
173
    def get_push_location(self):
111
174
        """See Branch.get_push_location."""
112
175
        push_loc = self.get_config().get_user_option('push_location')
115
178
    def set_push_location(self, location):
116
179
        """See Branch.set_push_location."""
117
180
        self.get_config().set_user_option('push_location', location,
118
 
                                          local=True)
 
181
                                          store=config.STORE_LOCATION)
119
182
 
120
183
    def supports_tags(self):
121
 
        return False
 
184
        return True
 
185
 
 
186
 
 
187
class InterGitGenericBranch(branch.InterBranch):
 
188
 
 
189
    @classmethod
 
190
    def is_compatible(self, source, target):
 
191
        return isinstance(source, GitBranch)
 
192
 
 
193
    def update_revisions(self, stop_revision=None, overwrite=False,
 
194
        graph=None):
 
195
        """See InterBranch.update_revisions()."""
 
196
        # TODO: stop_revision, overwrite
 
197
        interrepo = repository.InterRepository.get(self.source.repository, 
 
198
            self.target.repository)
 
199
        self._last_revid = None
 
200
        def determine_wants(heads):
 
201
            if not self.source.name in heads:
 
202
                raise BzrError("No such remote branch '%s', found: %r" % (
 
203
                    self.source.name, heads.keys()))
 
204
            head = heads[self.source.name]
 
205
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
206
            if self.target.repository.has_revision(self._last_revid):
 
207
                return []
 
208
            return [head]
 
209
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
210
        self.target.generate_revision_history(self._last_revid)
 
211
 
 
212
 
 
213
branch.InterBranch.register_optimiser(InterGitGenericBranch)