/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.446 by Jelmer Vernooij
Support new 'local' argument.
28
    errors,
0.200.327 by Jelmer Vernooij
merge new bzr-foreign.
29
    foreign,
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
30
    repository,
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
31
    revision,
0.200.82 by Jelmer Vernooij
Support listing tags.
32
    tag,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
33
    transport,
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
34
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
35
from bzrlib.decorators import (
36
    needs_read_lock,
37
    )
38
from bzrlib.trace import (
0.200.342 by Jelmer Vernooij
Report git sha during pull.
39
    is_quiet,
0.200.261 by Jelmer Vernooij
More formatting fixes.
40
    mutter,
41
    )
42
0.200.386 by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username().
43
from bzrlib.plugins.git.config import (
44
    GitBranchConfig,
45
    )
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
46
from bzrlib.plugins.git.errors import (
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
47
    NoPushSupport,
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
48
    NoSuchRef,
49
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
50
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
51
try:
52
    from bzrlib.foreign import ForeignBranch
53
except ImportError:
54
    class ForeignBranch(branch.Branch):
55
        def __init__(self, mapping):
56
            self.mapping = mapping
57
            super(ForeignBranch, self).__init__()
58
0.200.261 by Jelmer Vernooij
More formatting fixes.
59
0.200.462 by Jelmer Vernooij
Import tags when pulling.
60
def extract_tags(refs, mapping):
61
    ret = {}
62
    for k,v in refs.iteritems():
63
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
64
            v = refs.get(k+"^{}", v)
65
            ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
66
    return ret
67
68
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
69
class GitPullResult(branch.PullResult):
70
71
    def _lookup_revno(self, revid):
72
        assert isinstance(revid, str), "was %r" % revid
73
        # Try in source branch first, it'll be faster
74
        return self.target_branch.revision_id_to_revno(revid)
75
76
    @property
77
    def old_revno(self):
78
        return self._lookup_revno(self.old_revid)
79
80
    @property
81
    def new_revno(self):
82
        return self._lookup_revno(self.new_revid)
83
84
0.200.261 by Jelmer Vernooij
More formatting fixes.
85
class LocalGitTagDict(tag.BasicTags):
86
    """Dictionary with tags in a local repository."""
0.200.82 by Jelmer Vernooij
Support listing tags.
87
0.200.89 by Jelmer Vernooij
Support sprouting branches.
88
    def __init__(self, branch):
89
        self.branch = branch
90
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
91
92
    def get_tag_dict(self):
93
        ret = {}
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
94
        for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
95
            obj = self.repository._git.get_object(v)
96
            while isinstance(obj, Tag):
97
                v = obj.object[1]
98
                obj = self.repository._git.get_object(v)
99
            if not isinstance(obj, Commit):
0.200.261 by Jelmer Vernooij
More formatting fixes.
100
                mutter("Tag %s points at object %r that is not a commit, "
101
                       "ignoring", k, obj)
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
102
                continue
0.200.180 by Jelmer Vernooij
Simplify tag handling.
103
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
104
        return ret
105
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
106
    def set_tag(self, name, revid):
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
107
        self.repository._git.refs["refs/tags/%s" % name], _ = \
0.200.462 by Jelmer Vernooij
Import tags when pulling.
108
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
109
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
110
111
class GitBranchFormat(branch.BranchFormat):
112
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
113
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
114
        return 'Git Branch'
115
0.200.82 by Jelmer Vernooij
Support listing tags.
116
    def supports_tags(self):
117
        return True
118
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
119
    def make_tags(self, branch):
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
120
        if getattr(branch.repository, "get_refs", None) is not None:
121
            from bzrlib.plugins.git.remote import RemoteGitTagDict
122
            return RemoteGitTagDict(branch)
0.200.261 by Jelmer Vernooij
More formatting fixes.
123
        else:
124
            return LocalGitTagDict(branch)
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
125
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
126
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
127
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
128
    """An adapter to git repositories for bzr Branch objects."""
129
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
130
    def __init__(self, bzrdir, repository, name, lockfiles):
0.200.82 by Jelmer Vernooij
Support listing tags.
131
        self.repository = repository
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
132
        self._format = GitBranchFormat()
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
133
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
134
        self.bzrdir = bzrdir
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
135
        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.
136
        self.name = name
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
137
        self._head = None
0.200.143 by Jelmer Vernooij
Reoncile InterGitRepository objects.
138
        self.base = bzrdir.transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
139
0.200.293 by Jelmer Vernooij
Fix branch nicks.
140
    def _get_nick(self, local=False, possible_master_transports=None):
141
        """Find the nick name for this branch.
142
143
        :return: Branch nick
144
        """
145
        return self.name
146
0.200.331 by Jelmer Vernooij
Add stub for setting nick function.
147
    def _set_nick(self, nick):
148
        raise NotImplementedError
149
150
    nick = property(_get_nick, _set_nick)
0.200.293 by Jelmer Vernooij
Fix branch nicks.
151
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
152
    def __repr__(self):
153
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
154
0.200.211 by Jelmer Vernooij
Add basic infrastructure for dpush.
155
    def dpull(self, source, stop_revision=None):
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
156
        return branch.InterBranch.get(source, self).lossy_push()
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
157
158
    def generate_revision_history(self, revid, old_revid=None):
159
        # FIXME: Check that old_revid is in the ancestry of revid
160
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
161
        self._set_head(newhead)
162
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
163
    def lock_write(self):
164
        self.control_files.lock_write()
165
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
166
    def get_stacked_on_url(self):
167
        # Git doesn't do stacking (yet...)
168
        return None
169
170
    def get_parent(self):
171
        """See Branch.get_parent()."""
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
172
        # 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.
173
        return None
174
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
175
    def set_parent(self, url):
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
176
        # FIXME: Set "origin" url in .git/config ?
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
177
        pass
178
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
179
    def lock_read(self):
180
        self.control_files.lock_read()
181
0.200.432 by Jelmer Vernooij
Support Branch.is_locked, required for loggerhead.
182
    def is_locked(self):
183
        return self.control_files.is_locked()
184
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
185
    def unlock(self):
186
        self.control_files.unlock()
187
188
    def get_physical_lock_status(self):
189
        return False
190
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
191
    @needs_read_lock
192
    def last_revision(self):
193
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
194
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
195
            return revision.NULL_REVISION
0.200.112 by Jelmer Vernooij
Fix the build.
196
        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.
197
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
198
 
199
class LocalGitBranch(GitBranch):
200
    """A local Git branch."""
201
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
202
    def _get_checkout_format(self):
203
        """Return the most suitable metadir for a checkout of this branch.
204
        Weaves are used if this branch's repository uses weaves.
205
        """
206
        format = self.repository.bzrdir.checkout_metadir()
207
        format.set_branch_format(self._format)
208
        return format
209
0.200.261 by Jelmer Vernooij
More formatting fixes.
210
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
211
        accelerator_tree=None, hardlink=False):
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
212
        if lightweight:
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
213
            t = transport.get_transport(to_location)
214
            t.ensure_base()
215
            format = self._get_checkout_format()
216
            checkout = format.initialize_on_transport(t)
217
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
218
                self)
219
            tree = checkout.create_workingtree(revision_id,
220
                from_branch=from_branch, hardlink=hardlink)
221
            return tree
222
        else:
223
            return self._create_heavyweight_checkout(to_location, revision_id,
0.200.261 by Jelmer Vernooij
More formatting fixes.
224
            hardlink)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
225
226
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
227
                                     hardlink=False):
228
        """Create a new heavyweight checkout of this branch.
229
230
        :param to_location: URL of location to create the new checkout in.
231
        :param revision_id: Revision that should be the tip of the checkout.
232
        :param hardlink: Whether to hardlink
233
        :return: WorkingTree object of checkout.
234
        """
235
        checkout_branch = BzrDir.create_branch_convenience(
236
            to_location, force_new_tree=False, format=get_rich_root_format())
237
        checkout = checkout_branch.bzrdir
238
        checkout_branch.bind(self)
239
        # pull up to the specified revision_id to set the initial 
240
        # branch tip correctly, and seed it with history.
241
        checkout_branch.pull(self, stop_revision=revision_id)
242
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
243
0.200.57 by Jelmer Vernooij
Fix more tests.
244
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
245
        if self.head is None:
246
            return []
0.200.261 by Jelmer Vernooij
More formatting fixes.
247
        ret = list(self.repository.iter_reverse_revision_history(
248
            self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
249
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
250
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
251
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
252
    def _get_head(self):
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
253
        try:
254
            return self.repository._git.ref(self.name)
255
        except KeyError:
256
            return None
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
257
258
    def _set_head(self, value):
259
        self._head = value
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
260
        self.repository._git.refs[self.name] = self._head
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
261
        self._clear_cached_state()
262
263
    head = property(_get_head, _set_head)
264
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
265
    def get_config(self):
266
        return GitBranchConfig(self)
267
268
    def get_push_location(self):
269
        """See Branch.get_push_location."""
270
        push_loc = self.get_config().get_user_option('push_location')
271
        return push_loc
272
273
    def set_push_location(self, location):
274
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
275
        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.
276
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
277
278
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
279
        return True
0.200.96 by Jelmer Vernooij
Fix branch.
280
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
281
0.200.342 by Jelmer Vernooij
Report git sha during pull.
282
class GitBranchPullResult(branch.PullResult):
283
284
    def report(self, to_file):
285
        if not is_quiet():
286
            if self.old_revid == self.new_revid:
287
                to_file.write('No revisions to pull.\n')
288
            else:
289
                to_file.write('Now on revision %d (git sha: %s).\n' % 
290
                        (self.new_revno, self.new_git_head))
291
        self._show_tag_conficts(to_file)
292
293
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
294
class InterFromGitBranch(branch.InterBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
295
    """InterBranch implementation that pulls from Git into bzr."""
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
296
297
    @classmethod
298
    def is_compatible(self, source, target):
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
299
        return (isinstance(source, GitBranch) and 
300
                not isinstance(target, GitBranch))
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
301
302
    def update_revisions(self, stop_revision=None, overwrite=False,
303
        graph=None):
304
        """See InterBranch.update_revisions()."""
0.226.2 by Jelmer Vernooij
Cope with new fetch_spec argument.
305
        interrepo = repository.InterRepository.get(self.source.repository, 
306
            self.target.repository)
0.200.342 by Jelmer Vernooij
Report git sha during pull.
307
        self._head = None
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
308
        self._last_revid = None
309
        def determine_wants(heads):
310
            if not self.source.name in heads:
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
311
                raise NoSuchRef(self.source.name, heads.keys())
0.200.314 by Jelmer Vernooij
Support stop_revision.
312
            if stop_revision is not None:
313
                self._last_revid = stop_revision
0.200.342 by Jelmer Vernooij
Report git sha during pull.
314
                self._head, mapping = self.source.repository.lookup_git_revid(
0.200.316 by Jelmer Vernooij
Fix formatting.
315
                    stop_revision)
0.200.314 by Jelmer Vernooij
Support stop_revision.
316
            else:
0.200.342 by Jelmer Vernooij
Report git sha during pull.
317
                self._head = heads[self.source.name]
0.200.316 by Jelmer Vernooij
Fix formatting.
318
                self._last_revid = \
0.200.342 by Jelmer Vernooij
Report git sha during pull.
319
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
0.200.226 by Jelmer Vernooij
Merge thin-pack work.
320
            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.
321
                return []
0.200.342 by Jelmer Vernooij
Report git sha during pull.
322
            return [self._head]
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
323
        interrepo.fetch_objects(determine_wants, self.source.mapping)
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
324
        if overwrite:
0.200.314 by Jelmer Vernooij
Support stop_revision.
325
            prev_last_revid = None
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
326
        else:
0.200.314 by Jelmer Vernooij
Support stop_revision.
327
            prev_last_revid = self.target.last_revision()
328
        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.
329
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
330
    def pull(self, overwrite=False, stop_revision=None,
331
             possible_transports=None, _hook_master=None, run_hooks=True,
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
332
             _override_hook_target=None, local=False):
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
333
        """See Branch.pull.
334
335
        :param _hook_master: Private parameter - set the branch to
336
            be supplied as the master to pull hooks.
337
        :param run_hooks: Private parameter - if false, this branch
338
            is being called because it's the master of the primary branch,
339
            so it should not run its hooks.
340
        :param _override_hook_target: Private parameter - set the branch to be
341
            supplied as the target_branch to pull hooks.
342
        """
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
343
        # This type of branch can't be bound.
344
        if local:
345
            raise errors.LocalRequiresBoundBranch()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
346
        result = GitBranchPullResult()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
347
        result.source_branch = self.source
348
        if _override_hook_target is None:
349
            result.target_branch = self.target
350
        else:
351
            result.target_branch = _override_hook_target
352
        self.source.lock_read()
353
        try:
354
            # We assume that during 'pull' the target repository is closer than
355
            # the source one.
356
            graph = self.target.repository.get_graph(self.source.repository)
357
            result.old_revno, result.old_revid = \
358
                self.target.last_revision_info()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
359
            self.update_revisions(stop_revision, overwrite=overwrite, 
360
                graph=graph)
361
            result.new_git_head = self._head
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
362
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
363
                overwrite)
364
            result.new_revno, result.new_revid = self.target.last_revision_info()
365
            if _hook_master:
366
                result.master_branch = _hook_master
367
                result.local_branch = result.target_branch
368
            else:
369
                result.master_branch = result.target_branch
370
                result.local_branch = None
371
            if run_hooks:
372
                for hook in branch.Branch.hooks['post_pull']:
373
                    hook(result)
374
        finally:
375
            self.source.unlock()
376
        return result
377
378
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
379
class InterGitRemoteLocalBranch(branch.InterBranch):
380
    """InterBranch implementation that pulls between Git branches."""
381
382
    @classmethod
383
    def is_compatible(self, source, target):
384
        from bzrlib.plugins.git.remote import RemoteGitBranch
385
        return (isinstance(source, RemoteGitBranch) and 
386
                isinstance(target, LocalGitBranch))
387
388
    def pull(self, stop_revision=None, overwrite=False, 
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
389
        possible_transports=None, local=False):
390
        # This type of branch can't be bound.
391
        if local:
392
            raise errors.LocalRequiresBoundBranch()
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
393
        result = GitPullResult()
394
        result.source_branch = self.source
395
        result.target_branch = self.target
396
        interrepo = repository.InterRepository.get(self.source.repository, 
397
            self.target.repository)
398
        result.old_revid = self.target.last_revision()
399
        if stop_revision is None:
0.200.456 by Jelmer Vernooij
Fix git -> git fetching.
400
            refs = interrepo.fetch_refs(branches=["HEAD"])
401
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
402
        else:
403
            refs = interrepo.fetch_refs(revision_id=stop_revision)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
404
        self.target.generate_revision_history(stop_revision, result.old_revid)
0.200.462 by Jelmer Vernooij
Import tags when pulling.
405
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
406
            self.target.tags.set_tag(name, revid)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
407
        result.new_revid = self.target.last_revision()
408
        return result
409
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
410
    
411
class InterToGitBranch(branch.InterBranch):
412
    """InterBranch implementation that pulls from Git into bzr."""
413
414
    @classmethod
415
    def is_compatible(self, source, target):
416
        return (not isinstance(source, GitBranch) and 
417
                isinstance(target, GitBranch))
418
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
419
    def push(self, overwrite=True, stop_revision=None, 
420
             _override_hook_source_branch=None):
421
        raise NoPushSupport()
422
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
423
    def lossy_push(self, stop_revision=None):
424
        if stop_revision is None:
425
            stop_revision = self.source.last_revision()
426
        # FIXME: Check for diverged branches
427
        refs = { "refs/heads/master": stop_revision }
428
        for name, revid in self.source.tags.get_tag_dict().iteritems():
429
            if self.source.repository.has_revision(revid):
430
                refs["refs/tags/%s" % name] = revid
431
        revidmap, new_refs = self.target.repository.dfetch_refs(
432
            self.source.repository, refs)
433
        if revidmap != {}:
434
            self.target.generate_revision_history(revidmap[stop_revision])
435
        return revidmap
436
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
437
438
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
439
branch.InterBranch.register_optimiser(InterFromGitBranch)
440
branch.InterBranch.register_optimiser(InterToGitBranch)