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