/brz/remove-bazaar

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