/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
1
# Copyright (C) 2007 Canonical Ltd
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
2
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
19
0.200.261 by Jelmer Vernooij
More formatting fixes.
20
from dulwich.objects import (
21
    Commit,
22
    Tag,
23
    )
24
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
25
from bzrlib import (
26
    branch,
27
    config,
0.200.327 by Jelmer Vernooij
merge new bzr-foreign.
28
    foreign,
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
29
    repository,
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
30
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
31
    tag,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
32
    transport,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
33
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
34
from bzrlib.decorators import (
35
    needs_read_lock,
36
    )
37
from bzrlib.trace import (
0.200.342 by Jelmer Vernooij
Report git sha during pull.
38
    is_quiet,
0.200.261 by Jelmer Vernooij
More formatting fixes.
39
    mutter,
40
    )
41
0.200.386 by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username().
42
from bzrlib.plugins.git.config import (
43
    GitBranchConfig,
44
    )
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
45
from bzrlib.plugins.git.errors import (
46
    NoSuchRef,
47
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
48
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
49
try:
50
    from bzrlib.foreign import ForeignBranch
51
except ImportError:
52
    class ForeignBranch(branch.Branch):
53
        def __init__(self, mapping):
54
            self.mapping = mapping
55
            super(ForeignBranch, self).__init__()
56
0.200.261 by Jelmer Vernooij
More formatting fixes.
57
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
58
class GitPullResult(branch.PullResult):
59
60
    def _lookup_revno(self, revid):
61
        assert isinstance(revid, str), "was %r" % revid
62
        # Try in source branch first, it'll be faster
63
        return self.target_branch.revision_id_to_revno(revid)
64
65
    @property
66
    def old_revno(self):
67
        return self._lookup_revno(self.old_revid)
68
69
    @property
70
    def new_revno(self):
71
        return self._lookup_revno(self.new_revid)
72
73
0.200.261 by Jelmer Vernooij
More formatting fixes.
74
class LocalGitTagDict(tag.BasicTags):
75
    """Dictionary with tags in a local repository."""
0.200.82 by Jelmer Vernooij
Support listing tags.
76
0.200.89 by Jelmer Vernooij
Support sprouting branches.
77
    def __init__(self, branch):
78
        self.branch = branch
79
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
80
81
    def get_tag_dict(self):
82
        ret = {}
0.200.180 by Jelmer Vernooij
Simplify tag handling.
83
        for k,v in self.repository._git.tags.iteritems():
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
84
            obj = self.repository._git.get_object(v)
85
            while isinstance(obj, Tag):
86
                v = obj.object[1]
87
                obj = self.repository._git.get_object(v)
88
            if not isinstance(obj, Commit):
0.200.261 by Jelmer Vernooij
More formatting fixes.
89
                mutter("Tag %s points at object %r that is not a commit, "
90
                       "ignoring", k, obj)
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
91
                continue
0.200.180 by Jelmer Vernooij
Simplify tag handling.
92
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
93
        return ret
94
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
95
    def set_tag(self, name, revid):
0.200.181 by Jelmer Vernooij
Support setting tags.
96
        self.repository._git.tags[name] = revid
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
97
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
98
99
class GitBranchFormat(branch.BranchFormat):
100
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
101
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
102
        return 'Git Branch'
103
0.200.82 by Jelmer Vernooij
Support listing tags.
104
    def supports_tags(self):
105
        return True
106
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
107
    def make_tags(self, branch):
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
108
        if getattr(branch.repository, "get_refs", None) is not None:
109
            from bzrlib.plugins.git.remote import RemoteGitTagDict
110
            return RemoteGitTagDict(branch)
0.200.261 by Jelmer Vernooij
More formatting fixes.
111
        else:
112
            return LocalGitTagDict(branch)
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
113
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
114
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
115
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
116
    """An adapter to git repositories for bzr Branch objects."""
117
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
118
    def __init__(self, bzrdir, repository, name, head, lockfiles):
0.200.82 by Jelmer Vernooij
Support listing tags.
119
        self.repository = repository
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
120
        self._format = GitBranchFormat()
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
121
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
122
        self.bzrdir = bzrdir
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
123
        super(GitBranch, self).__init__(repository.get_mapping())
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
124
        self.name = name
0.200.57 by Jelmer Vernooij
Fix more tests.
125
        self.head = head
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
126
        self.base = bzrdir.transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
127
0.200.293 by Jelmer Vernooij
Fix branch nicks.
128
    def _get_nick(self, local=False, possible_master_transports=None):
129
        """Find the nick name for this branch.
130
131
        :return: Branch nick
132
        """
133
        return self.name
134
0.200.331 by Jelmer Vernooij
Add stub for setting nick function.
135
    def _set_nick(self, nick):
136
        raise NotImplementedError
137
138
    nick = property(_get_nick, _set_nick)
0.200.293 by Jelmer Vernooij
Fix branch nicks.
139
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
140
    def dpull(self, source, stop_revision=None):
141
        if stop_revision is None:
142
            stop_revision = source.last_revision()
143
        # FIXME: Check for diverged branches
144
        revidmap = self.repository.dfetch(source.repository, stop_revision)
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
145
        if revidmap != {}:
146
            self.generate_revision_history(revidmap[stop_revision])
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
147
        return revidmap
148
149
    def generate_revision_history(self, revid, old_revid=None):
150
        # FIXME: Check that old_revid is in the ancestry of revid
151
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
152
        self._set_head(newhead)
153
154
    def _set_head(self, head):
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
155
        self.head = head
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
156
        self.repository._git.set_ref(self.name, self.head)
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
157
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
158
    def lock_write(self):
159
        self.control_files.lock_write()
160
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
161
    def get_stacked_on_url(self):
162
        # Git doesn't do stacking (yet...)
163
        return None
164
165
    def get_parent(self):
166
        """See Branch.get_parent()."""
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
167
        # FIXME: Set "origin" url from .git/config ?
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
168
        return None
169
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
170
    def set_parent(self, url):
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
171
        # FIXME: Set "origin" url in .git/config ?
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
172
        pass
173
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
174
    def lock_read(self):
175
        self.control_files.lock_read()
176
177
    def unlock(self):
178
        self.control_files.unlock()
179
180
    def get_physical_lock_status(self):
181
        return False
182
183
 
184
class LocalGitBranch(GitBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
185
    """A local Git branch."""
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
186
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
187
    @needs_read_lock
188
    def last_revision(self):
189
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
190
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
191
            return revision.NULL_REVISION
0.200.112 by Jelmer Vernooij
Fix the build.
192
        return self.mapping.revision_id_foreign_to_bzr(self.head)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
193
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
194
    def _get_checkout_format(self):
195
        """Return the most suitable metadir for a checkout of this branch.
196
        Weaves are used if this branch's repository uses weaves.
197
        """
198
        format = self.repository.bzrdir.checkout_metadir()
199
        format.set_branch_format(self._format)
200
        return format
201
0.200.261 by Jelmer Vernooij
More formatting fixes.
202
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
203
        accelerator_tree=None, hardlink=False):
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
204
        if lightweight:
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
205
            t = transport.get_transport(to_location)
206
            t.ensure_base()
207
            format = self._get_checkout_format()
208
            checkout = format.initialize_on_transport(t)
209
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
210
                self)
211
            tree = checkout.create_workingtree(revision_id,
212
                from_branch=from_branch, hardlink=hardlink)
213
            return tree
214
        else:
215
            return self._create_heavyweight_checkout(to_location, revision_id,
0.200.261 by Jelmer Vernooij
More formatting fixes.
216
            hardlink)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
217
218
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
219
                                     hardlink=False):
220
        """Create a new heavyweight checkout of this branch.
221
222
        :param to_location: URL of location to create the new checkout in.
223
        :param revision_id: Revision that should be the tip of the checkout.
224
        :param hardlink: Whether to hardlink
225
        :return: WorkingTree object of checkout.
226
        """
227
        checkout_branch = BzrDir.create_branch_convenience(
228
            to_location, force_new_tree=False, format=get_rich_root_format())
229
        checkout = checkout_branch.bzrdir
230
        checkout_branch.bind(self)
231
        # pull up to the specified revision_id to set the initial 
232
        # branch tip correctly, and seed it with history.
233
        checkout_branch.pull(self, stop_revision=revision_id)
234
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
235
0.200.57 by Jelmer Vernooij
Fix more tests.
236
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
237
        if self.head is None:
238
            return []
0.200.261 by Jelmer Vernooij
More formatting fixes.
239
        ret = list(self.repository.iter_reverse_revision_history(
240
            self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
241
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
242
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
243
244
    def get_config(self):
245
        return GitBranchConfig(self)
246
247
    def get_push_location(self):
248
        """See Branch.get_push_location."""
249
        push_loc = self.get_config().get_user_option('push_location')
250
        return push_loc
251
252
    def set_push_location(self, location):
253
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
254
        self.get_config().set_user_option('push_location', location,
0.217.54 by John Carr
set_user_option breaks - doesnt have a local option in BranchConfig. Follow the bzr.dev syntax instead.
255
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
256
257
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
258
        return True
0.200.96 by Jelmer Vernooij
Fix branch.
259
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
260
0.200.342 by Jelmer Vernooij
Report git sha during pull.
261
class GitBranchPullResult(branch.PullResult):
262
263
    def report(self, to_file):
264
        if not is_quiet():
265
            if self.old_revid == self.new_revid:
266
                to_file.write('No revisions to pull.\n')
267
            else:
268
                to_file.write('Now on revision %d (git sha: %s).\n' % 
269
                        (self.new_revno, self.new_git_head))
270
        self._show_tag_conficts(to_file)
271
272
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
273
class InterGitGenericBranch(branch.InterBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
274
    """InterBranch implementation that pulls from Git into bzr."""
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
275
276
    @classmethod
277
    def is_compatible(self, source, target):
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
278
        return (isinstance(source, GitBranch) and 
279
                not isinstance(target, GitBranch))
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
280
281
    def update_revisions(self, stop_revision=None, overwrite=False,
282
        graph=None):
283
        """See InterBranch.update_revisions()."""
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
284
        interrepo = repository.InterRepository.get(self.source.repository, 
285
            self.target.repository)
0.200.342 by Jelmer Vernooij
Report git sha during pull.
286
        self._head = None
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
287
        self._last_revid = None
288
        def determine_wants(heads):
289
            if not self.source.name in heads:
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
290
                raise NoSuchRef(self.source.name, heads.keys())
0.200.314 by Jelmer Vernooij
Support stop_revision.
291
            if stop_revision is not None:
292
                self._last_revid = stop_revision
0.200.342 by Jelmer Vernooij
Report git sha during pull.
293
                self._head, mapping = self.source.repository.lookup_git_revid(
0.200.316 by Jelmer Vernooij
Fix formatting.
294
                    stop_revision)
0.200.314 by Jelmer Vernooij
Support stop_revision.
295
            else:
0.200.342 by Jelmer Vernooij
Report git sha during pull.
296
                self._head = heads[self.source.name]
0.200.316 by Jelmer Vernooij
Fix formatting.
297
                self._last_revid = \
0.200.342 by Jelmer Vernooij
Report git sha during pull.
298
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
299
            if self.target.repository.has_revision(self._last_revid):
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
300
                return []
0.200.342 by Jelmer Vernooij
Report git sha during pull.
301
            return [self._head]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
302
        interrepo.fetch_objects(determine_wants, self.source.mapping)
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
303
        if overwrite:
0.200.314 by Jelmer Vernooij
Support stop_revision.
304
            prev_last_revid = None
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
305
        else:
0.200.314 by Jelmer Vernooij
Support stop_revision.
306
            prev_last_revid = self.target.last_revision()
307
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
308
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
309
    def pull(self, overwrite=False, stop_revision=None,
310
             possible_transports=None, _hook_master=None, run_hooks=True,
311
             _override_hook_target=None):
312
        """See Branch.pull.
313
314
        :param _hook_master: Private parameter - set the branch to
315
            be supplied as the master to pull hooks.
316
        :param run_hooks: Private parameter - if false, this branch
317
            is being called because it's the master of the primary branch,
318
            so it should not run its hooks.
319
        :param _override_hook_target: Private parameter - set the branch to be
320
            supplied as the target_branch to pull hooks.
321
        """
0.200.342 by Jelmer Vernooij
Report git sha during pull.
322
        result = GitBranchPullResult()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
323
        result.source_branch = self.source
324
        if _override_hook_target is None:
325
            result.target_branch = self.target
326
        else:
327
            result.target_branch = _override_hook_target
328
        self.source.lock_read()
329
        try:
330
            # We assume that during 'pull' the target repository is closer than
331
            # the source one.
332
            graph = self.target.repository.get_graph(self.source.repository)
333
            result.old_revno, result.old_revid = \
334
                self.target.last_revision_info()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
335
            self.update_revisions(stop_revision, overwrite=overwrite, 
336
                graph=graph)
337
            result.new_git_head = self._head
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
338
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
339
                overwrite)
340
            result.new_revno, result.new_revid = self.target.last_revision_info()
341
            if _hook_master:
342
                result.master_branch = _hook_master
343
                result.local_branch = result.target_branch
344
            else:
345
                result.master_branch = result.target_branch
346
                result.local_branch = None
347
            if run_hooks:
348
                for hook in branch.Branch.hooks['post_pull']:
349
                    hook(result)
350
        finally:
351
            self.source.unlock()
352
        return result
353
354
355
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
356
357
branch.InterBranch.register_optimiser(InterGitGenericBranch)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
358
359
360
class InterGitRemoteLocalBranch(branch.InterBranch):
361
    """InterBranch implementation that pulls between Git branches."""
362
363
    @classmethod
364
    def is_compatible(self, source, target):
365
        from bzrlib.plugins.git.remote import RemoteGitBranch
366
        return (isinstance(source, RemoteGitBranch) and 
367
                isinstance(target, LocalGitBranch))
368
369
    def pull(self, stop_revision=None, overwrite=False, 
370
        possible_transports=None):
371
        result = GitPullResult()
372
        result.source_branch = self.source
373
        result.target_branch = self.target
374
        interrepo = repository.InterRepository.get(self.source.repository, 
375
            self.target.repository)
376
        result.old_revid = self.target.last_revision()
377
        if stop_revision is None:
378
            stop_revision = self.source.last_revision()
379
        interrepo.fetch(revision_id=stop_revision)
380
        self.target.generate_revision_history(stop_revision, result.old_revid)
381
        result.new_revid = self.target.last_revision()
382
        return result
383
384
385
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)