/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
    )
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.513 by Jelmer Vernooij
Fix imports.
43
from bzrlib.plugins.git import (
44
    get_rich_root_format,
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 (
0.252.49 by Jelmer Vernooij
Avoid trying to set HEAD for remote branches.
54
    branch_name_to_ref,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
55
    ref_to_branch_name,
56
    extract_tags,
0.200.875 by Jelmer Vernooij
Use new tag_name_to_ref function.
57
    tag_name_to_ref,
0.200.872 by Jelmer Vernooij
Move refs code to separate module.
58
    )
0.200.261 by Jelmer Vernooij
More formatting fixes.
59
0.238.5 by Jelmer Vernooij
Remove old backwards compatibility code.
60
from bzrlib.foreign import ForeignBranch
0.200.388 by Jelmer Vernooij
Support bzr 1.14 as well.
61
0.200.261 by Jelmer Vernooij
More formatting fixes.
62
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
63
class GitPullResult(branch.PullResult):
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]
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.462 by Jelmer Vernooij
Import tags when pulling.
117
            self.branch.mapping.revision_id_bzr_to_foreign(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
        """
185
        return get_rich_root_format()
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
        """
199
        return self.name
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,
208
            self.ref)
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):
257
        return self.repository.lookup_foreign_revision_id(foreign_revid, 
258
            self.mapping)
259
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
260
0.200.465 by Jelmer Vernooij
Use dulwich standard functionality for finding missing revisions.
261
class LocalGitBranch(GitBranch):
262
    """A local Git branch."""
263
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
264
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
265
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
266
              lockfiles, tagsdict)
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
267
        if not name in repository._git.get_refs().keys():
0.200.763 by Jelmer Vernooij
Provide proper colocated branch support.
268
            raise errors.NotBranchError(self.base)
269
0.200.261 by Jelmer Vernooij
More formatting fixes.
270
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
271
        accelerator_tree=None, hardlink=False):
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
272
        if lightweight:
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
273
            t = transport.get_transport(to_location)
274
            t.ensure_base()
275
            format = self._get_checkout_format()
276
            checkout = format.initialize_on_transport(t)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
277
            from_branch = branch.BranchReferenceFormat().initialize(checkout,
0.230.1 by Jelmer Vernooij
Support lightweight checkouts.
278
                self)
279
            tree = checkout.create_workingtree(revision_id,
280
                from_branch=from_branch, hardlink=hardlink)
281
            return tree
282
        else:
283
            return self._create_heavyweight_checkout(to_location, revision_id,
0.200.261 by Jelmer Vernooij
More formatting fixes.
284
            hardlink)
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
285
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
286
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
287
                                     hardlink=False):
288
        """Create a new heavyweight checkout of this branch.
289
290
        :param to_location: URL of location to create the new checkout in.
291
        :param revision_id: Revision that should be the tip of the checkout.
292
        :param hardlink: Whether to hardlink
293
        :return: WorkingTree object of checkout.
294
        """
0.200.513 by Jelmer Vernooij
Fix imports.
295
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
0.200.210 by Jelmer Vernooij
properly error out about not support lightweight checkouts.
296
            to_location, force_new_tree=False, format=get_rich_root_format())
297
        checkout = checkout_branch.bzrdir
298
        checkout_branch.bind(self)
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
299
        # 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.
300
        # branch tip correctly, and seed it with history.
301
        checkout_branch.pull(self, stop_revision=revision_id)
302
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
303
0.200.57 by Jelmer Vernooij
Fix more tests.
304
    def _gen_revision_history(self):
0.200.58 by Jelmer Vernooij
Fix remaining tests.
305
        if self.head is None:
306
            return []
0.200.261 by Jelmer Vernooij
More formatting fixes.
307
        ret = list(self.repository.iter_reverse_revision_history(
308
            self.last_revision()))
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
309
        ret.reverse()
0.200.57 by Jelmer Vernooij
Fix more tests.
310
        return ret
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
311
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
312
    def _get_head(self):
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
313
        try:
0.200.770 by Jelmer Vernooij
Proper branch names.
314
            return self.repository._git.ref(self.ref)
0.200.480 by Jelmer Vernooij
Cope with API changes in Dulwich.
315
        except KeyError:
316
            return None
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
317
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
318
    def set_last_revision_info(self, revno, revid):
319
        self.set_last_revision(revid)
320
321
    def set_last_revision(self, revid):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
322
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
0.200.523 by Jelmer Vernooij
Fix undefined error.
323
        self.head = newhead
0.200.507 by Jelmer Vernooij
Implement set_last_revision{_info,}.
324
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
325
    def _set_head(self, value):
326
        self._head = value
0.200.770 by Jelmer Vernooij
Proper branch names.
327
        self.repository._git.refs[self.ref] = self._head
0.200.461 by Jelmer Vernooij
Reduce number of round trips when fetching from Git.
328
        self._clear_cached_state()
329
330
    head = property(_get_head, _set_head)
331
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
332
    def get_config(self):
333
        return GitBranchConfig(self)
334
335
    def get_push_location(self):
336
        """See Branch.get_push_location."""
337
        push_loc = self.get_config().get_user_option('push_location')
338
        return push_loc
339
340
    def set_push_location(self, location):
341
        """See Branch.set_push_location."""
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
342
        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.
343
                                          store=config.STORE_LOCATION)
0.200.43 by David Allouche
Ultra-experimental support for "bzr pull". No test. No sanity.
344
345
    def supports_tags(self):
0.200.82 by Jelmer Vernooij
Support listing tags.
346
        return True
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
347
    
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
348
0.200.342 by Jelmer Vernooij
Report git sha during pull.
349
class GitBranchPullResult(branch.PullResult):
350
0.252.36 by Jelmer Vernooij
Fix pull.
351
    def __init__(self):
352
        super(GitBranchPullResult, self).__init__()
353
        self.new_git_head = None
354
        self._old_revno = None
355
        self._new_revno = None
356
0.200.342 by Jelmer Vernooij
Report git sha during pull.
357
    def report(self, to_file):
358
        if not is_quiet():
359
            if self.old_revid == self.new_revid:
360
                to_file.write('No revisions to pull.\n')
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
361
            elif self.new_git_head is not None:
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
362
                to_file.write('Now on revision %d (git sha: %s).\n' %
0.200.342 by Jelmer Vernooij
Report git sha during pull.
363
                        (self.new_revno, self.new_git_head))
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
364
            else:
365
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
0.200.342 by Jelmer Vernooij
Report git sha during pull.
366
        self._show_tag_conficts(to_file)
367
0.252.36 by Jelmer Vernooij
Fix pull.
368
    def _lookup_revno(self, revid):
369
        assert isinstance(revid, str), "was %r" % revid
370
        # Try in source branch first, it'll be faster
371
        try:
372
            return self.source_branch.revision_id_to_revno(revid)
373
        except errors.NoSuchRevision:
374
            # FIXME: Check using graph.find_distance_to_null() ?
375
            return self.target_branch.revision_id_to_revno(revid)
376
377
    def _get_old_revno(self):
378
        if self._old_revno is not None:
379
            return self._old_revno
380
        return self._lookup_revno(self.old_revid)
381
382
    def _set_old_revno(self, revno):
383
        self._old_revno = revno
384
385
    old_revno = property(_get_old_revno, _set_old_revno)
386
387
    def _get_new_revno(self):
388
        if self._new_revno is not None:
389
            return self._new_revno
390
        return self._lookup_revno(self.new_revid)
391
392
    def _set_new_revno(self, revno):
393
        self._new_revno = revno
394
    
395
    new_revno = property(_get_new_revno, _set_new_revno)
396
0.200.342 by Jelmer Vernooij
Report git sha during pull.
397
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
398
class GitBranchPushResult(branch.BranchPushResult):
399
400
    def _lookup_revno(self, revid):
401
        assert isinstance(revid, str), "was %r" % revid
402
        # Try in source branch first, it'll be faster
403
        try:
404
            return self.source_branch.revision_id_to_revno(revid)
0.200.523 by Jelmer Vernooij
Fix undefined error.
405
        except errors.NoSuchRevision:
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
406
            # FIXME: Check using graph.find_distance_to_null() ?
407
            return self.target_branch.revision_id_to_revno(revid)
408
409
    @property
410
    def old_revno(self):
411
        return self._lookup_revno(self.old_revid)
412
413
    @property
414
    def new_revno(self):
415
        return self._lookup_revno(self.new_revid)
416
417
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
418
class InterFromGitBranch(branch.GenericInterBranch):
0.200.261 by Jelmer Vernooij
More formatting fixes.
419
    """InterBranch implementation that pulls from Git into bzr."""
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
420
421
    @classmethod
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
422
    def _get_interrepo(self, source, target):
423
        return repository.InterRepository.get(source.repository,
424
            target.repository)
425
426
    @classmethod
427
    def is_compatible(cls, source, target):
428
        return (isinstance(source, GitBranch) and
429
                not isinstance(target, GitBranch) and
430
                (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.
431
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
432
    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
433
        graph=None, limit=None):
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
434
        """Like InterBranch.update_revisions(), but with additions.
435
436
        Compared to the `update_revisions()` below, this function takes a
437
        `limit` argument that limits how many git commits will be converted
438
        and returns the new git head.
439
        """
0.200.692 by Jelmer Vernooij
Refuse pulling into non-rich-root branches rather than erroring out with an AttributeError.
440
        interrepo = self._get_interrepo(self.source, self.target)
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
441
        def determine_wants(heads):
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
442
            if not self.source.ref in heads:
443
                raise NoSuchRef(self.source.ref, heads.keys())
0.200.314 by Jelmer Vernooij
Support stop_revision.
444
            if stop_revision is not None:
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
445
                self._last_revid = stop_revision
0.200.912 by Jelmer Vernooij
Merge roundtrip support.
446
                head, mapping = self.source.repository.lookup_bzr_revision_id(
0.200.316 by Jelmer Vernooij
Fix formatting.
447
                    stop_revision)
0.200.314 by Jelmer Vernooij
Support stop_revision.
448
            else:
0.200.777 by Jelmer Vernooij
Fix colocated remote branches.
449
                head = heads[self.source.ref]
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
450
                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.
451
            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.
452
                return []
0.247.6 by Michael Hudson
away with underscore prefixed local variables
453
            return [head]
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
454
        pack_hint, head = interrepo.fetch_objects(
0.247.2 by Michael Hudson
this works for my tests, but i'm pretty sure it's wrong in general
455
            determine_wants, self.source.mapping, limit=limit)
0.252.45 by Jelmer Vernooij
Finish fetching roundtripped revisions back into bzr.
456
        if (pack_hint is not None and
457
            self.target.repository._format.pack_compresses):
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
458
            self.target.repository.pack(hint=pack_hint)
0.200.728 by Jelmer Vernooij
Fix pulling when all revisions are already in the repo.
459
        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.
460
            self._last_revid = self.source.lookup_foreign_revision_id(head)
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
461
        if overwrite:
0.200.314 by Jelmer Vernooij
Support stop_revision.
462
            prev_last_revid = None
0.200.313 by Jelmer Vernooij
Support overwrite parameter.
463
        else:
0.200.314 by Jelmer Vernooij
Support stop_revision.
464
            prev_last_revid = self.target.last_revision()
0.248.5 by Jelmer Vernooij
Reformatting, fix dpush.
465
        self.target.generate_revision_history(self._last_revid,
466
            prev_last_revid)
0.247.6 by Michael Hudson
away with underscore prefixed local variables
467
        return head
0.200.225 by Jelmer Vernooij
Implement custom InterBranch to support fetching from remote git branches.
468
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
469
    def update_revisions(self, stop_revision=None, overwrite=False,
470
                         graph=None):
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
471
        """See InterBranch.update_revisions()."""
472
        self._update_revisions(stop_revision, overwrite, graph)
473
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
474
    def pull(self, overwrite=False, stop_revision=None,
475
             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
476
             _override_hook_target=None, local=False, limit=None):
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
477
        """See Branch.pull.
478
479
        :param _hook_master: Private parameter - set the branch to
480
            be supplied as the master to pull hooks.
481
        :param run_hooks: Private parameter - if false, this branch
482
            is being called because it's the master of the primary branch,
483
            so it should not run its hooks.
484
        :param _override_hook_target: Private parameter - set the branch to be
485
            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
486
        :param limit: Only import this many revisons.  `None`, the default,
487
            means import all revisions.
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
488
        """
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
489
        # This type of branch can't be bound.
490
        if local:
491
            raise errors.LocalRequiresBoundBranch()
0.200.342 by Jelmer Vernooij
Report git sha during pull.
492
        result = GitBranchPullResult()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
493
        result.source_branch = self.source
494
        if _override_hook_target is None:
495
            result.target_branch = self.target
496
        else:
497
            result.target_branch = _override_hook_target
498
        self.source.lock_read()
499
        try:
500
            # We assume that during 'pull' the target repository is closer than
501
            # the source one.
502
            graph = self.target.repository.get_graph(self.source.repository)
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
503
            (result.old_revno, result.old_revid) = \
504
                self.target.last_revision_info()
0.247.7 by Michael Hudson
preserve the interface of update_revisions()
505
            result.new_git_head = self._update_revisions(
0.247.6 by Michael Hudson
away with underscore prefixed local variables
506
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
507
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
508
                overwrite)
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
509
            (result.new_revno, result.new_revid) = \
510
                self.target.last_revision_info()
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
511
            if _hook_master:
512
                result.master_branch = _hook_master
513
                result.local_branch = result.target_branch
514
            else:
515
                result.master_branch = result.target_branch
516
                result.local_branch = None
517
            if run_hooks:
518
                for hook in branch.Branch.hooks['post_pull']:
519
                    hook(result)
520
        finally:
521
            self.source.unlock()
522
        return result
523
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
524
    def _basic_push(self, overwrite=False, stop_revision=None):
525
        result = branch.BranchPushResult()
526
        result.source_branch = self.source
527
        result.target_branch = self.target
0.200.505 by Jelmer Vernooij
Remove duplicate code.
528
        graph = self.target.repository.get_graph(self.source.repository)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
529
        result.old_revno, result.old_revid = self.target.last_revision_info()
0.247.8 by Michael Hudson
incredibly minor tweak
530
        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
531
            stop_revision, overwrite=overwrite, graph=graph)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
532
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
533
            overwrite)
534
        result.new_revno, result.new_revid = self.target.last_revision_info()
535
        return result
536
0.200.338 by Jelmer Vernooij
Fix dpushing without changes necessary.
537
0.200.512 by Jelmer Vernooij
Support pushing git->git.
538
class InterGitBranch(branch.GenericInterBranch):
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
539
    """InterBranch implementation that pulls between Git branches."""
540
0.200.512 by Jelmer Vernooij
Support pushing git->git.
541
542
class InterGitLocalRemoteBranch(InterGitBranch):
543
    """InterBranch that copies from a local to a remote git branch."""
544
545
    @classmethod
546
    def is_compatible(self, source, target):
547
        from bzrlib.plugins.git.remote import RemoteGitBranch
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
548
        return (isinstance(source, LocalGitBranch) and
0.200.512 by Jelmer Vernooij
Support pushing git->git.
549
                isinstance(target, RemoteGitBranch))
550
551
    def _basic_push(self, overwrite=False, stop_revision=None):
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
552
        from dulwich.protocol import ZERO_SHA
0.200.512 by Jelmer Vernooij
Support pushing git->git.
553
        result = GitBranchPushResult()
554
        result.source_branch = self.source
555
        result.target_branch = self.target
556
        if stop_revision is None:
557
            stop_revision = self.source.last_revision()
558
        # FIXME: Check for diverged branches
559
        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.
560
            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.
561
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
0.200.512 by Jelmer Vernooij
Support pushing git->git.
562
            result.new_revid = stop_revision
563
            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.
564
                refs[tag_name_to_ref(name)] = sha
0.200.512 by Jelmer Vernooij
Support pushing git->git.
565
            return refs
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
566
        self.target.repository.send_pack(get_changed_refs,
0.200.726 by Jelmer Vernooij
Factor out conversion of branch names to refs.
567
            self.source.repository._git.object_store.generate_pack_contents)
0.200.512 by Jelmer Vernooij
Support pushing git->git.
568
        return result
569
570
571
class InterGitRemoteLocalBranch(InterGitBranch):
572
    """InterBranch that copies from a remote to a local git branch."""
573
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
574
    @classmethod
575
    def is_compatible(self, source, target):
576
        from bzrlib.plugins.git.remote import RemoteGitBranch
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
577
        return (isinstance(source, RemoteGitBranch) and
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
578
                isinstance(target, LocalGitBranch))
579
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
580
    def _basic_push(self, overwrite=False, stop_revision=None):
581
        result = branch.BranchPushResult()
582
        result.source_branch = self.source
583
        result.target_branch = self.target
584
        result.old_revid = self.target.last_revision()
585
        refs, stop_revision = self.update_refs(stop_revision)
586
        self.target.generate_revision_history(stop_revision, result.old_revid)
587
        self.update_tags(refs)
0.200.505 by Jelmer Vernooij
Remove duplicate code.
588
        result.new_revid = self.target.last_revision()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
589
        return result
590
591
    def update_tags(self, refs):
0.200.648 by Jelmer Vernooij
Fix tag handling when encountering packed refs.
592
        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.
593
            revid = self.target.lookup_foreign_revision_id(v)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
594
            self.target.tags.set_tag(name, revid)
595
596
    def update_refs(self, stop_revision=None):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
597
        interrepo = repository.InterRepository.get(self.source.repository,
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
598
            self.target.repository)
599
        if stop_revision is None:
600
            refs = interrepo.fetch_refs(branches=["HEAD"])
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
601
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
602
        else:
603
            refs = interrepo.fetch_refs(revision_id=stop_revision)
604
        return refs, stop_revision
605
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
606
    def pull(self, stop_revision=None, overwrite=False,
0.200.732 by Jelmer Vernooij
Support run_hooks argument to InterGitRemoteLocalBranch.pull().
607
        possible_transports=None, run_hooks=True,local=False):
0.200.446 by Jelmer Vernooij
Support new 'local' argument.
608
        # This type of branch can't be bound.
609
        if local:
610
            raise errors.LocalRequiresBoundBranch()
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
611
        result = GitPullResult()
612
        result.source_branch = self.source
613
        result.target_branch = self.target
614
        result.old_revid = self.target.last_revision()
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
615
        refs, stop_revision = self.update_refs(stop_revision)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
616
        self.target.generate_revision_history(stop_revision, result.old_revid)
0.200.501 by Jelmer Vernooij
Support push from git into bzr.
617
        self.update_tags(refs)
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
618
        result.new_revid = self.target.last_revision()
619
        return result
620
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
621
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
622
class InterToGitBranch(branch.InterBranch):
623
    """InterBranch implementation that pulls from Git into bzr."""
624
0.200.631 by Jelmer Vernooij
Raise proper exception in Branch.get_stacked_on_url().
625
    @staticmethod
626
    def _get_branch_formats_to_test():
627
        return None, None
628
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
629
    @classmethod
630
    def is_compatible(self, source, target):
0.200.695 by Jelmer Vernooij
Clean up trailing whitespace.
631
        return (not isinstance(source, GitBranch) and
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
632
                isinstance(target, GitBranch))
633
0.200.542 by Jelmer Vernooij
Proper error for push in 1.14.
634
    def update_revisions(self, *args, **kwargs):
635
        raise NoPushSupport()
636
0.252.38 by Jelmer Vernooij
Minor cleanups.
637
    def _get_new_refs(self, stop_revision=None):
638
        if stop_revision is None:
639
            stop_revision = self.source.last_revision()
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
640
        main_ref = self.target.ref or "refs/heads/master"
641
        refs = { main_ref: stop_revision }
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
642
        for name, revid in self.source.tags.get_tag_dict().iteritems():
643
            if self.source.repository.has_revision(revid):
644
                refs[tag_name_to_ref(name)] = revid
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
645
        return refs, main_ref
0.252.37 by Jelmer Vernooij
Factor out some common code for finding refs to send.
646
0.252.36 by Jelmer Vernooij
Fix pull.
647
    def pull(self, overwrite=False, stop_revision=None, local=False,
648
             possible_transports=None):
649
        from dulwich.protocol import ZERO_SHA
650
        result = GitBranchPullResult()
651
        result.source_branch = self.source
652
        result.target_branch = self.target
653
        # FIXME: Check for diverged branches
654
        old_refs = self.target.repository._git.get_refs()
0.252.39 by Jelmer Vernooij
Update rather than overwrite refs.
655
        refs = dict(old_refs)
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
656
        new_refs, main_ref = self._get_new_refs(stop_revision)
657
        refs.update(new_refs)
0.252.36 by Jelmer Vernooij
Fix pull.
658
        self.target.repository.fetch_refs(self.source.repository, refs)
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
659
        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.
660
            old_refs.get(main_ref, ZERO_SHA))
661
        result.new_revid = refs[main_ref]
0.252.36 by Jelmer Vernooij
Fix pull.
662
        return result
663
0.252.38 by Jelmer Vernooij
Minor cleanups.
664
    def push(self, overwrite=False, stop_revision=None,
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
665
             _override_hook_source_branch=None):
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
666
        from dulwich.protocol import ZERO_SHA
667
        result = GitBranchPushResult()
668
        result.source_branch = self.source
669
        result.target_branch = self.target
670
        # FIXME: Check for diverged branches
671
        old_refs = self.target.repository._git.get_refs()
0.252.39 by Jelmer Vernooij
Update rather than overwrite refs.
672
        refs = dict(old_refs)
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
673
        new_refs, main_ref = self._get_new_refs(stop_revision)
674
        refs.update(new_refs)
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
675
        self.target.repository.fetch_refs(self.source.repository, refs)
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
676
        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.
677
            old_refs.get(main_ref, ZERO_SHA))
678
        result.new_revid = refs[main_ref]
0.252.5 by Jelmer Vernooij
enable 'bzr push'.
679
        return result
0.200.472 by Jelmer Vernooij
Fix printing error when user attempts to push into git.
680
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
681
    def lossy_push(self, stop_revision=None):
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
682
        from dulwich.protocol import ZERO_SHA
0.200.504 by Jelmer Vernooij
Lazily find revno's for git branches.
683
        result = GitBranchPushResult()
0.200.503 by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push.
684
        result.source_branch = self.source
685
        result.target_branch = self.target
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
686
        # FIXME: Check for diverged branches
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
687
        refs, main_ref = self._get_new_refs(stop_revision)
0.252.38 by Jelmer Vernooij
Minor cleanups.
688
        result.revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
689
            self.source.repository, refs)
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
690
        result.old_revid = self.target.lookup_foreign_revision_id(
0.200.891 by Jelmer Vernooij
Use ZERO_SHA constant where possible.
691
            old_refs.get(self.target.ref, ZERO_SHA))
0.252.44 by Jelmer Vernooij
Properly look up Bazaar revision ids for revision parents in case they are round-tripped.
692
        result.new_revid = self.target.lookup_foreign_revision_id(
0.200.916 by Jelmer Vernooij
Set refs/heads/master if no ref is set yet.
693
            new_refs[main_ref])
0.200.503 by Jelmer Vernooij
Remove dpull, return BranchPushResult in lossy_push.
694
        return result
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
695
0.200.334 by Jelmer Vernooij
Support pulling from git to git.
696
697
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
0.200.468 by Jelmer Vernooij
Move dpush logic onto InterBranch.
698
branch.InterBranch.register_optimiser(InterFromGitBranch)
699
branch.InterBranch.register_optimiser(InterToGitBranch)
0.200.512 by Jelmer Vernooij
Support pushing git->git.
700
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)