/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.910 by Jelmer Vernooij
update copyright years
2
# Copyright (C) 2009-2010 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.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
    )
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
38
from bzrlib.revision import (
39
    NULL_REVISION,
40
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
41
from bzrlib.trace import (
0.200.342 by Jelmer Vernooij
Report git sha during pull.
42
    is_quiet,
0.200.261 by Jelmer Vernooij
More formatting fixes.
43
    mutter,
44
    )
45
0.200.386 by Jelmer Vernooij
Move config to a separate file, support BranchConfig.username().
46
from bzrlib.plugins.git.config import (
47
    GitBranchConfig,
48
    )
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
49
from bzrlib.plugins.git.errors import (
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
50
    NoPushSupport,
0.200.278 by Jelmer Vernooij
Update branch head appropriately during dpull.
51
    NoSuchRef,
52
    )
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
53
from bzrlib.plugins.git.refs import (
54
    ref_to_branch_name,
55
    extract_tags,
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
56
    tag_name_to_ref,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
57
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
58
0.238.5 by Jelmer Vernooij
Remove old backwards compatibility code.
59
from bzrlib.foreign import ForeignBranch
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
60
0.200.261 by Jelmer Vernooij
More formatting fixes.
61
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
62
class GitPullResult(branch.PullResult):
0.200.956 by Jelmer Vernooij
Add some more format tests.
63
    """Result of a pull from a Git branch."""
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
64
65
    def _lookup_revno(self, revid):
66
        assert isinstance(revid, str), "was %r" % revid
67
        # Try in source branch first, it'll be faster
68
        return self.target_branch.revision_id_to_revno(revid)
69
70
    @property
71
    def old_revno(self):
72
        return self._lookup_revno(self.old_revid)
73
74
    @property
75
    def new_revno(self):
76
        return self._lookup_revno(self.new_revid)
77
78
0.200.261 by Jelmer Vernooij
More formatting fixes.
79
class LocalGitTagDict(tag.BasicTags):
80
    """Dictionary with tags in a local repository."""
0.200.82 by Jelmer Vernooij
Support listing tags.
81
0.200.89 by Jelmer Vernooij
Support sprouting branches.
82
    def __init__(self, branch):
83
        self.branch = branch
84
        self.repository = branch.repository
0.200.82 by Jelmer Vernooij
Support listing tags.
85
86
    def get_tag_dict(self):
87
        ret = {}
0.200.648 by Jelmer Vernooij
Fix tag handling when encountering packed refs.
88
        for k,v in extract_tags(self.repository._git.get_refs()).iteritems():
0.200.609 by Jelmer Vernooij
Cope with tags pointing at nonexisting objects.
89
            try:
0.200.647 by Jelmer Vernooij
Fix use of packed refs.
90
                obj = self.repository._git[v]
0.200.609 by Jelmer Vernooij
Cope with tags pointing at nonexisting objects.
91
            except KeyError:
92
                mutter("Tag %s points at unknown object %s, ignoring", v, obj)
93
                continue
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
94
            while isinstance(obj, Tag):
95
                v = obj.object[1]
0.200.647 by Jelmer Vernooij
Fix use of packed refs.
96
                obj = self.repository._git[v]
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
97
            if not isinstance(obj, Commit):
0.200.261 by Jelmer Vernooij
More formatting fixes.
98
                mutter("Tag %s points at object %r that is not a commit, "
99
                       "ignoring", k, obj)
0.200.194 by Jelmer Vernooij
Look for commit object in heavyweight tags.
100
                continue
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
101
            ret[k] = self.branch.lookup_foreign_revision_id(v)
0.200.82 by Jelmer Vernooij
Support listing tags.
102
        return ret
103
0.200.711 by Jelmer Vernooij
Support merging tags to a local Git repository.
104
    def _set_tag_dict(self, to_dict):
105
        extra = set(self.repository._git.get_refs().keys())
106
        for k, revid in to_dict.iteritems():
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
107
            name = tag_name_to_ref(k)
0.200.711 by Jelmer Vernooij
Support merging tags to a local Git repository.
108
            if name in extra:
109
                extra.remove(name)
110
            self.set_tag(k, revid)
111
        for name in extra:
112
            if name.startswith("refs/tags/"):
113
                del self.repository._git[name]
0.200.956 by Jelmer Vernooij
Add some more format tests.
114
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
115
    def set_tag(self, name, revid):
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
117
            self.branch.lookup_bzr_revision_id(revid)
0.200.86 by Jelmer Vernooij
Clearer error when setting tags.
118
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
119
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
120
class DictTagDict(LocalGitTagDict):
121
122
    def __init__(self, branch, tags):
123
        super(DictTagDict, self).__init__(branch)
124
        self._tags = tags
125
126
    def get_tag_dict(self):
127
        return self._tags
128
129
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
130
class GitBranchFormat(branch.BranchFormat):
131
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
132
    def get_format_description(self):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
133
        return 'Git Branch'
134
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
135
    def network_name(self):
136
        return "git"
137
0.200.82 by Jelmer Vernooij
Support listing tags.
138
    def supports_tags(self):
139
        return True
140
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
141
    def get_foreign_tests_branch_factory(self):
142
        from bzrlib.plugins.git.tests.test_branch import ForeignTestsBranchFactory
143
        return ForeignTestsBranchFactory()
144
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
145
    def make_tags(self, branch):
0.228.3 by Jelmer Vernooij
Fix tags when fetching from remotes.
146
        if getattr(branch.repository, "get_refs", None) is not None:
147
            from bzrlib.plugins.git.remote import RemoteGitTagDict
148
            return RemoteGitTagDict(branch)
0.200.261 by Jelmer Vernooij
More formatting fixes.
149
        else:
150
            return LocalGitTagDict(branch)
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
151
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
152
0.200.911 by Jelmer Vernooij
Cope with locking changes in bzr.dev.
153
class GitReadLock(object):
154
155
    def __init__(self, unlock):
156
        self.unlock = unlock
157
158
159
class GitWriteLock(object):
160
161
    def __init__(self, unlock):
162
        self.unlock = unlock
163
164
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
165
class GitBranch(ForeignBranch):
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
166
    """An adapter to git repositories for bzr Branch objects."""
167
0.200.770 by Jelmer Vernooij
Proper branch names.
168
    def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
0.200.82 by Jelmer Vernooij
Support listing tags.
169
        self.repository = repository
0.200.246 by Jelmer Vernooij
Cope with API changes in 1.13.
170
        self._format = GitBranchFormat()
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
171
        self.control_files = lockfiles
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
172
        self.bzrdir = bzrdir
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
173
        super(GitBranch, self).__init__(repository.get_mapping())
0.239.1 by Jelmer Vernooij
Avoid re-connecting to fetch tags we already know.
174
        if tagsdict is not None:
175
            self.tags = DictTagDict(self, tagsdict)
0.200.770 by Jelmer Vernooij
Proper branch names.
176
        self.ref = ref
177
        self.name = ref_to_branch_name(ref)
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
178
        self._head = None
0.200.630 by Jelmer Vernooij
Fix base url of Git branches - use the working tree path rather than the control directory path.
179
        self.base = bzrdir.root_transport.base
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
180
0.239.8 by Jelmer Vernooij
Support checkouts.
181
    def _get_checkout_format(self):
182
        """Return the most suitable metadir for a checkout of this branch.
183
        Weaves are used if this branch's repository uses weaves.
184
        """
0.200.927 by Jelmer Vernooij
Remove explicit use of rich root formats.
185
        return bzrdir.format_registry.make_bzrdir("default")
0.239.8 by Jelmer Vernooij
Support checkouts.
186
0.238.3 by Jelmer Vernooij
Remove svn references, prefer git send format when submitting changes against a git branch.
187
    def get_child_submit_format(self):
188
        """Return the preferred format of submissions to this branch."""
189
        ret = self.get_config().get_user_option("child_submit_format")
190
        if ret is not None:
191
            return ret
192
        return "git"
193
0.200.293 by Jelmer Vernooij
Fix branch nicks.
194
    def _get_nick(self, local=False, possible_master_transports=None):
195
        """Find the nick name for this branch.
196
197
        :return: Branch nick
198
        """
0.200.920 by Jelmer Vernooij
Fix some more tests.
199
        return self.name or "HEAD"
0.200.293 by Jelmer Vernooij
Fix branch nicks.
200
0.200.331 by Jelmer Vernooij
Add stub for setting nick function.
201
    def _set_nick(self, nick):
202
        raise NotImplementedError
203
204
    nick = property(_get_nick, _set_nick)
0.200.293 by Jelmer Vernooij
Fix branch nicks.
205
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
206
    def __repr__(self):
0.200.770 by Jelmer Vernooij
Proper branch names.
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
0.200.920 by Jelmer Vernooij
Fix some more tests.
208
            self.ref or "HEAD")
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
209
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
210
    def generate_revision_history(self, revid, old_revid=None):
211
        # FIXME: Check that old_revid is in the ancestry of revid
212
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
213
        self._set_head(newhead)
214
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
215
    def lock_write(self):
216
        self.control_files.lock_write()
0.200.911 by Jelmer Vernooij
Cope with locking changes in bzr.dev.
217
        return GitWriteLock(self.unlock)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
218
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
219
    def get_stacked_on_url(self):
220
        # Git doesn't do stacking (yet...)
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
221
        raise errors.UnstackableBranchFormat(self._format, self.base)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
222
223
    def get_parent(self):
224
        """See Branch.get_parent()."""
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
225
        # 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.
226
        return None
227
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
228
    def set_parent(self, url):
0.200.312 by Jelmer Vernooij
Add notes about parent locations.
229
        # FIXME: Set "origin" url in .git/config ?
0.200.175 by Jelmer Vernooij
Add optimized handling when fetching from git to git.
230
        pass
231
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
232
    def lock_read(self):
233
        self.control_files.lock_read()
0.200.911 by Jelmer Vernooij
Cope with locking changes in bzr.dev.
234
        return GitReadLock(self.unlock)
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
235
0.200.432 by Jelmer Vernooij
Support Branch.is_locked, required for loggerhead.
236
    def is_locked(self):
237
        return self.control_files.is_locked()
238
0.200.139 by Jelmer Vernooij
Share more code between local and remote classes, support opening remote branches.
239
    def unlock(self):
240
        self.control_files.unlock()
241
242
    def get_physical_lock_status(self):
243
        return False
244
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
245
    @needs_read_lock
246
    def last_revision(self):
247
        # perhaps should escape this ?
0.200.57 by Jelmer Vernooij
Fix more tests.
248
        if self.head is None:
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
249
            return revision.NULL_REVISION
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
250
        return self.lookup_foreign_revision_id(self.head)
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
251
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
252
    def _basic_push(self, target, overwrite=False, stop_revision=None):
253
        return branch.InterBranch.get(self, target)._basic_push(
254
            overwrite, stop_revision)
255
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
256
    def lookup_foreign_revision_id(self, foreign_revid):
0.200.956 by Jelmer Vernooij
Add some more format tests.
257
        return self.repository.lookup_foreign_revision_id(foreign_revid,
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
258
            self.mapping)
259
0.200.1030 by Jelmer Vernooij
More work on supporting roundtripping push.
260
    def lookup_bzr_revision_id(self, revid):
261
        return self.repository.lookup_bzr_revision_id(
262
            revid, mapping=self.mapping)
263
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
264
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
265
class LocalGitBranch(GitBranch):
266
    """A local Git branch."""
267
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
268
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
0.200.956 by Jelmer Vernooij
Add some more format tests.
269
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
270
              lockfiles, tagsdict)
0.200.918 by Jelmer Vernooij
Cope with 'self.ref is None' in a couple more places.
271
        refs = repository._git.get_refs()
272
        if not (name in refs.keys() or "HEAD" in refs.keys()):
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
273
            raise errors.NotBranchError(self.base)
274
0.200.261 by Jelmer Vernooij
More formatting fixes.
275
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
276
        accelerator_tree=None, hardlink=False):
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
277
        if lightweight:
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
278
            t = transport.get_transport(to_location)
279
            t.ensure_base()
280
            format = self._get_checkout_format()
281
            checkout = format.initialize_on_transport(t)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
282
            from_branch = branch.BranchReferenceFormat().initialize(checkout,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
283
                self)
284
            tree = checkout.create_workingtree(revision_id,
285
                from_branch=from_branch, hardlink=hardlink)
286
            return tree
287
        else:
288
            return self._create_heavyweight_checkout(to_location, revision_id,
0.257.1 by Jelmer Vernooij
use transport repo objects even for local access.
289
                hardlink)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
290
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
291
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
292
                                     hardlink=False):
293
        """Create a new heavyweight checkout of this branch.
294
295
        :param to_location: URL of location to create the new checkout in.
296
        :param revision_id: Revision that should be the tip of the checkout.
297
        :param hardlink: Whether to hardlink
298
        :return: WorkingTree object of checkout.
299
        """
0.200.513 by Jelmer Vernooij
Fix imports.
300
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
0.200.927 by Jelmer Vernooij
Remove explicit use of rich root formats.
301
            to_location, force_new_tree=False)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
302
        checkout = checkout_branch.bzrdir
303
        checkout_branch.bind(self)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
304
        # pull up to the specified revision_id to set the initial
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
305
        # branch tip correctly, and seed it with history.
306
        checkout_branch.pull(self, stop_revision=revision_id)
307
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
308
0.200.57 by Jelmer Vernooij
Fix more tests.
309
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
310
        if self.head is None:
311
            return []
0.200.261 by Jelmer Vernooij
More formatting fixes.
312
        ret = list(self.repository.iter_reverse_revision_history(
313
            self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
314
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
315
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
316
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
317
    def _get_head(self):
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
318
        try:
0.200.918 by Jelmer Vernooij
Cope with 'self.ref is None' in a couple more places.
319
            return self.repository._git.ref(self.ref or "HEAD")
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
320
        except KeyError:
321
            return None
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
322
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
323
    def set_last_revision_info(self, revno, revid):
324
        self.set_last_revision(revid)
325
326
    def set_last_revision(self, revid):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
327
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
0.200.523 by Jelmer Vernooij
Fix undefined error.
328
        self.head = newhead
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
329
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
330
    def _set_head(self, value):
331
        self._head = value
0.200.918 by Jelmer Vernooij
Cope with 'self.ref is None' in a couple more places.
332
        self.repository._git.refs[self.ref or "HEAD"] = self._head
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
333
        self._clear_cached_state()
334
335
    head = property(_get_head, _set_head)
336
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
337
    def get_config(self):
338
        return GitBranchConfig(self)
339
340
    def get_push_location(self):
341
        """See Branch.get_push_location."""
342
        push_loc = self.get_config().get_user_option('push_location')
343
        return push_loc
344
345
    def set_push_location(self, location):
346
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
347
        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.
348
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
349
350
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
351
        return True
0.200.956 by Jelmer Vernooij
Add some more format tests.
352
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
353
0.200.342 by Jelmer Vernooij
Report git sha during pull.
354
class GitBranchPullResult(branch.PullResult):
355
0.252.36 by Jelmer Vernooij
Fix pull.
356
    def __init__(self):
357
        super(GitBranchPullResult, self).__init__()
358
        self.new_git_head = None
359
        self._old_revno = None
360
        self._new_revno = None
361
0.200.342 by Jelmer Vernooij
Report git sha during pull.
362
    def report(self, to_file):
363
        if not is_quiet():
364
            if self.old_revid == self.new_revid:
365
                to_file.write('No revisions to pull.\n')
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
366
            elif self.new_git_head is not None:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
367
                to_file.write('Now on revision %d (git sha: %s).\n' %
0.200.342 by Jelmer Vernooij
Report git sha during pull.
368
                        (self.new_revno, self.new_git_head))
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
369
            else:
370
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
0.200.342 by Jelmer Vernooij
Report git sha during pull.
371
        self._show_tag_conficts(to_file)
372
0.252.36 by Jelmer Vernooij
Fix pull.
373
    def _lookup_revno(self, revid):
374
        assert isinstance(revid, str), "was %r" % revid
375
        # Try in source branch first, it'll be faster
376
        try:
377
            return self.source_branch.revision_id_to_revno(revid)
378
        except errors.NoSuchRevision:
379
            # FIXME: Check using graph.find_distance_to_null() ?
380
            return self.target_branch.revision_id_to_revno(revid)
381
382
    def _get_old_revno(self):
383
        if self._old_revno is not None:
384
            return self._old_revno
385
        return self._lookup_revno(self.old_revid)
386
387
    def _set_old_revno(self, revno):
388
        self._old_revno = revno
389
390
    old_revno = property(_get_old_revno, _set_old_revno)
391
392
    def _get_new_revno(self):
393
        if self._new_revno is not None:
394
            return self._new_revno
395
        return self._lookup_revno(self.new_revid)
396
397
    def _set_new_revno(self, revno):
398
        self._new_revno = revno
0.200.956 by Jelmer Vernooij
Add some more format tests.
399
0.252.36 by Jelmer Vernooij
Fix pull.
400
    new_revno = property(_get_new_revno, _set_new_revno)
401
0.200.342 by Jelmer Vernooij
Report git sha during pull.
402
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
403
class GitBranchPushResult(branch.BranchPushResult):
404
405
    def _lookup_revno(self, revid):
406
        assert isinstance(revid, str), "was %r" % revid
407
        # Try in source branch first, it'll be faster
408
        try:
409
            return self.source_branch.revision_id_to_revno(revid)
0.200.523 by Jelmer Vernooij
Fix undefined error.
410
        except errors.NoSuchRevision:
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
411
            # FIXME: Check using graph.find_distance_to_null() ?
412
            return self.target_branch.revision_id_to_revno(revid)
413
414
    @property
415
    def old_revno(self):
416
        return self._lookup_revno(self.old_revid)
417
418
    @property
419
    def new_revno(self):
420
        return self._lookup_revno(self.new_revid)
421
422
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
423
class InterFromGitBranch(branch.GenericInterBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
424
    """InterBranch implementation that pulls from Git into bzr."""
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
425
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
426
    @staticmethod
427
    def _get_branch_formats_to_test():
428
        return []
429
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
430
    @classmethod
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
431
    def _get_interrepo(self, source, target):
432
        return repository.InterRepository.get(source.repository,
433
            target.repository)
434
435
    @classmethod
436
    def is_compatible(cls, source, target):
437
        return (isinstance(source, GitBranch) and
438
                not isinstance(target, GitBranch) and
439
                (getattr(cls._get_interrepo(source, target), "fetch_objects", None) is not None))
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
440
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
441
    def _update_revisions(self, stop_revision=None, overwrite=False,
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
442
        graph=None, limit=None):
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
443
        """Like InterBranch.update_revisions(), but with additions.
444
445
        Compared to the `update_revisions()` below, this function takes a
446
        `limit` argument that limits how many git commits will be converted
447
        and returns the new git head.
448
        """
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
449
        interrepo = self._get_interrepo(self.source, self.target)
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
450
        def determine_wants(heads):
0.200.917 by Jelmer Vernooij
Cope with implicit branches during pull.
451
            if self.source.ref is not None and not self.source.ref in heads:
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
452
                raise NoSuchRef(self.source.ref, heads.keys())
0.200.314 by Jelmer Vernooij
Support stop_revision.
453
            if stop_revision is not None:
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
454
                self._last_revid = stop_revision
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
455
                head, mapping = self.source.repository.lookup_bzr_revision_id(
0.200.316 by Jelmer Vernooij
Fix formatting.
456
                    stop_revision)
0.200.314 by Jelmer Vernooij
Support stop_revision.
457
            else:
0.200.917 by Jelmer Vernooij
Cope with implicit branches during pull.
458
                if self.source.ref is not None:
459
                    head = heads[self.source.ref]
460
                else:
461
                    head = heads["HEAD"]
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
462
                self._last_revid = self.source.lookup_foreign_revision_id(head)
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
463
            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.
464
                return []
0.247.6 by Michael Hudson
away with underscore prefixed local variables
465
            return [head]
0.200.1002 by Jelmer Vernooij
Fix regression in git-import.
466
        pack_hint, head, refs = interrepo.fetch_objects(
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
467
            determine_wants, self.source.mapping, limit=limit)
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
468
        if (pack_hint is not None and
469
            self.target.repository._format.pack_compresses):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
470
            self.target.repository.pack(hint=pack_hint)
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
471
        if head is not None:
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
472
            self._last_revid = self.source.lookup_foreign_revision_id(head)
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
473
        if overwrite:
0.200.314 by Jelmer Vernooij
Support stop_revision.
474
            prev_last_revid = None
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
475
        else:
0.200.314 by Jelmer Vernooij
Support stop_revision.
476
            prev_last_revid = self.target.last_revision()
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
477
        self.target.generate_revision_history(self._last_revid,
478
            prev_last_revid)
0.247.6 by Michael Hudson
away with underscore prefixed local variables
479
        return head
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
480
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
481
    def update_revisions(self, stop_revision=None, overwrite=False,
482
                         graph=None):
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
483
        """See InterBranch.update_revisions()."""
484
        self._update_revisions(stop_revision, overwrite, graph)
485
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
486
    def pull(self, overwrite=False, stop_revision=None,
487
             possible_transports=None, _hook_master=None, run_hooks=True,
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
488
             _override_hook_target=None, local=False, limit=None):
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
489
        """See Branch.pull.
490
491
        :param _hook_master: Private parameter - set the branch to
492
            be supplied as the master to pull hooks.
493
        :param run_hooks: Private parameter - if false, this branch
494
            is being called because it's the master of the primary branch,
495
            so it should not run its hooks.
496
        :param _override_hook_target: Private parameter - set the branch to be
497
            supplied as the target_branch to pull hooks.
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
498
        :param limit: Only import this many revisons.  `None`, the default,
499
            means import all revisions.
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
500
        """
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
501
        # This type of branch can't be bound.
502
        if local:
503
            raise errors.LocalRequiresBoundBranch()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
504
        result = GitBranchPullResult()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
505
        result.source_branch = self.source
506
        if _override_hook_target is None:
507
            result.target_branch = self.target
508
        else:
509
            result.target_branch = _override_hook_target
510
        self.source.lock_read()
511
        try:
512
            # We assume that during 'pull' the target repository is closer than
513
            # the source one.
514
            graph = self.target.repository.get_graph(self.source.repository)
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
515
            (result.old_revno, result.old_revid) = \
516
                self.target.last_revision_info()
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
517
            result.new_git_head = self._update_revisions(
0.247.6 by Michael Hudson
away with underscore prefixed local variables
518
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
519
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
520
                overwrite)
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
521
            (result.new_revno, result.new_revid) = \
522
                self.target.last_revision_info()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
523
            if _hook_master:
524
                result.master_branch = _hook_master
525
                result.local_branch = result.target_branch
526
            else:
527
                result.master_branch = result.target_branch
528
                result.local_branch = None
529
            if run_hooks:
530
                for hook in branch.Branch.hooks['post_pull']:
531
                    hook(result)
532
        finally:
533
            self.source.unlock()
534
        return result
535
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
536
    def _basic_push(self, overwrite=False, stop_revision=None):
537
        result = branch.BranchPushResult()
538
        result.source_branch = self.source
539
        result.target_branch = self.target
0.200.505 by Jelmer Vernooij
Remove duplicate code.
540
        graph = self.target.repository.get_graph(self.source.repository)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
541
        result.old_revno, result.old_revid = self.target.last_revision_info()
0.247.8 by Michael Hudson
incredibly minor tweak
542
        result.new_git_head = self._update_revisions(
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
543
            stop_revision, overwrite=overwrite, graph=graph)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
544
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
545
            overwrite)
546
        result.new_revno, result.new_revid = self.target.last_revision_info()
547
        return result
548
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
549
0.200.512 by Jelmer Vernooij
Support pushing git->git.
550
class InterGitBranch(branch.GenericInterBranch):
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
551
    """InterBranch implementation that pulls between Git branches."""
552
0.200.512 by Jelmer Vernooij
Support pushing git->git.
553
554
class InterGitLocalRemoteBranch(InterGitBranch):
555
    """InterBranch that copies from a local to a remote git branch."""
556
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
557
    @staticmethod
558
    def _get_branch_formats_to_test():
559
        return []
560
0.200.512 by Jelmer Vernooij
Support pushing git->git.
561
    @classmethod
562
    def is_compatible(self, source, target):
563
        from bzrlib.plugins.git.remote import RemoteGitBranch
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
564
        return (isinstance(source, LocalGitBranch) and
0.200.512 by Jelmer Vernooij
Support pushing git->git.
565
                isinstance(target, RemoteGitBranch))
566
567
    def _basic_push(self, overwrite=False, stop_revision=None):
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
568
        from dulwich.protocol import ZERO_SHA
0.200.512 by Jelmer Vernooij
Support pushing git->git.
569
        result = GitBranchPushResult()
570
        result.source_branch = self.source
571
        result.target_branch = self.target
572
        if stop_revision is None:
573
            stop_revision = self.source.last_revision()
574
        # FIXME: Check for diverged branches
575
        def get_changed_refs(old_refs):
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
576
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
0.200.822 by Jelmer Vernooij
Fix indication of number of revisions pushed in dpush.
577
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
0.200.512 by Jelmer Vernooij
Support pushing git->git.
578
            result.new_revid = stop_revision
579
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
580
                refs[tag_name_to_ref(name)] = sha
0.200.512 by Jelmer Vernooij
Support pushing git->git.
581
            return refs
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
582
        self.target.repository.send_pack(get_changed_refs,
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
583
            self.source.repository._git.object_store.generate_pack_contents)
0.200.512 by Jelmer Vernooij
Support pushing git->git.
584
        return result
585
586
587
class InterGitRemoteLocalBranch(InterGitBranch):
588
    """InterBranch that copies from a remote to a local git branch."""
589
0.200.996 by Jelmer Vernooij
Fix test run of InterBranches.
590
    @staticmethod
591
    def _get_branch_formats_to_test():
592
        return []
593
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
594
    @classmethod
595
    def is_compatible(self, source, target):
596
        from bzrlib.plugins.git.remote import RemoteGitBranch
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
597
        return (isinstance(source, RemoteGitBranch) and
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
598
                isinstance(target, LocalGitBranch))
599
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
600
    def _basic_push(self, overwrite=False, stop_revision=None):
601
        result = branch.BranchPushResult()
602
        result.source_branch = self.source
603
        result.target_branch = self.target
604
        result.old_revid = self.target.last_revision()
605
        refs, stop_revision = self.update_refs(stop_revision)
606
        self.target.generate_revision_history(stop_revision, result.old_revid)
607
        self.update_tags(refs)
0.200.505 by Jelmer Vernooij
Remove duplicate code.
608
        result.new_revid = self.target.last_revision()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
609
        return result
610
611
    def update_tags(self, refs):
0.200.648 by Jelmer Vernooij
Fix tag handling when encountering packed refs.
612
        for name, v in extract_tags(refs).iteritems():
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
613
            revid = self.target.lookup_foreign_revision_id(v)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
614
            self.target.tags.set_tag(name, revid)
615
616
    def update_refs(self, stop_revision=None):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
617
        interrepo = repository.InterRepository.get(self.source.repository,
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
618
            self.target.repository)
619
        if stop_revision is None:
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
620
            refs = interrepo.fetch(branches=["HEAD"])
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
621
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
622
        else:
0.200.940 by Jelmer Vernooij
Avoid confusion between different fetch functions with different semantics.
623
            refs = interrepo.fetch(revision_id=stop_revision)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
624
        return refs, stop_revision
625
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
626
    def pull(self, stop_revision=None, overwrite=False,
0.200.732 by Jelmer Vernooij
Support run_hooks argument to InterGitRemoteLocalBranch.pull().
627
        possible_transports=None, run_hooks=True,local=False):
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
628
        # This type of branch can't be bound.
629
        if local:
630
            raise errors.LocalRequiresBoundBranch()
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
631
        result = GitPullResult()
632
        result.source_branch = self.source
633
        result.target_branch = self.target
634
        result.old_revid = self.target.last_revision()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
635
        refs, stop_revision = self.update_refs(stop_revision)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
636
        self.target.generate_revision_history(stop_revision, result.old_revid)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
637
        self.update_tags(refs)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
638
        result.new_revid = self.target.last_revision()
639
        return result
640
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
641
0.200.960 by Jelmer Vernooij
Use GenericInterBranch.
642
class InterToGitBranch(branch.GenericInterBranch):
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
643
    """InterBranch implementation that pulls from Git into bzr."""
644
0.200.939 by Jelmer Vernooij
Use InterRepo directly.
645
    def __init__(self, source, target):
646
        super(InterToGitBranch, self).__init__(source, target)
647
        self.interrepo = repository.InterRepository.get(source.repository,
648
                                           target.repository)
649
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
650
    @staticmethod
651
    def _get_branch_formats_to_test():
0.200.961 by Jelmer Vernooij
Cope with API changes to InterBranch._get_branch_formats_to_test.
652
        return []
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
653
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
654
    @classmethod
655
    def is_compatible(self, source, target):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
656
        return (not isinstance(source, GitBranch) and
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
657
                isinstance(target, GitBranch))
658
0.200.542 by Jelmer Vernooij
Proper error for push in 1.14.
659
    def update_revisions(self, *args, **kwargs):
660
        raise NoPushSupport()
661
0.252.38 by Jelmer Vernooij
Minor cleanups.
662
    def _get_new_refs(self, stop_revision=None):
663
        if stop_revision is None:
664
            stop_revision = self.source.last_revision()
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
665
        assert type(stop_revision) is str
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
666
        main_ref = self.target.ref or "refs/heads/master"
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
667
        refs = { main_ref: (None, stop_revision) }
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
668
        for name, revid in self.source.tags.get_tag_dict().iteritems():
669
            if self.source.repository.has_revision(revid):
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
670
                refs[tag_name_to_ref(name)] = (None, revid)
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
671
        return refs, main_ref
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
672
0.252.36 by Jelmer Vernooij
Fix pull.
673
    def pull(self, overwrite=False, stop_revision=None, local=False,
674
             possible_transports=None):
675
        from dulwich.protocol import ZERO_SHA
676
        result = GitBranchPullResult()
677
        result.source_branch = self.source
678
        result.target_branch = self.target
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
679
        new_refs, main_ref = self._get_new_refs(stop_revision)
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
680
        def update_refs(old_refs):
681
            refs = dict(old_refs)
0.200.945 by Jelmer Vernooij
Move fixmes
682
            # FIXME: Check for diverged branches
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
683
            refs.update(new_refs)
684
            return refs
685
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
686
        result.old_revid = self.target.lookup_foreign_revision_id(
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
687
            old_refs.get(main_ref, ZERO_SHA))
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
688
        result.new_revid = new_refs[main_ref]
0.252.36 by Jelmer Vernooij
Fix pull.
689
        return result
690
0.252.38 by Jelmer Vernooij
Minor cleanups.
691
    def push(self, overwrite=False, stop_revision=None,
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
692
             _override_hook_source_branch=None):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
693
        from dulwich.protocol import ZERO_SHA
694
        result = GitBranchPushResult()
695
        result.source_branch = self.source
696
        result.target_branch = self.target
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
697
        new_refs, main_ref = self._get_new_refs(stop_revision)
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
698
        def update_refs(old_refs):
699
            refs = dict(old_refs)
0.200.945 by Jelmer Vernooij
Move fixmes
700
            # FIXME: Check for diverged branches
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
701
            refs.update(new_refs)
702
            return refs
703
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
0.200.1035 by Jelmer Vernooij
Cope with tuples in refs dictionary.
704
        (result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
705
        if result.old_revid is None:
706
            result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
0.200.941 by Jelmer Vernooij
Pass update_refs argument to fetch_refs.
707
        result.new_revid = new_refs[main_ref]
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
708
        return result
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
709
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
710
    def lossy_push(self, stop_revision=None):
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
711
        result = GitBranchPushResult()
0.200.503 by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push.
712
        result.source_branch = self.source
713
        result.target_branch = self.target
0.200.942 by Jelmer Vernooij
pass update_refs to dfetch_refs.
714
        new_refs, main_ref = self._get_new_refs(stop_revision)
715
        def update_refs(old_refs):
716
            refs = dict(old_refs)
0.200.945 by Jelmer Vernooij
Move fixmes
717
            # FIXME: Check for diverged branches
0.200.942 by Jelmer Vernooij
pass update_refs to dfetch_refs.
718
            refs.update(new_refs)
719
            return refs
720
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
721
            update_refs)
0.200.969 by Jelmer Vernooij
Use tuples with bzr revid and git sha to avoid lookups.
722
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
723
        result.new_revid = new_refs[main_ref][1]
0.200.503 by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push.
724
        return result
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
725
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
726
727
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
728
branch.InterBranch.register_optimiser(InterFromGitBranch)
729
branch.InterBranch.register_optimiser(InterToGitBranch)
0.200.512 by Jelmer Vernooij
Support pushing git->git.
730
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)