/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to branch.py

Support new 'local' argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
25
25
from bzrlib import (
26
26
    branch,
27
27
    config,
 
28
    errors,
28
29
    foreign,
29
30
    repository,
30
31
    revision,
319
320
 
320
321
    def pull(self, overwrite=False, stop_revision=None,
321
322
             possible_transports=None, _hook_master=None, run_hooks=True,
322
 
             _override_hook_target=None):
 
323
             _override_hook_target=None, local=False):
323
324
        """See Branch.pull.
324
325
 
325
326
        :param _hook_master: Private parameter - set the branch to
330
331
        :param _override_hook_target: Private parameter - set the branch to be
331
332
            supplied as the target_branch to pull hooks.
332
333
        """
 
334
        # This type of branch can't be bound.
 
335
        if local:
 
336
            raise errors.LocalRequiresBoundBranch()
333
337
        result = GitBranchPullResult()
334
338
        result.source_branch = self.source
335
339
        if _override_hook_target is None:
378
382
                isinstance(target, LocalGitBranch))
379
383
 
380
384
    def pull(self, stop_revision=None, overwrite=False, 
381
 
        possible_transports=None):
 
385
        possible_transports=None, local=False):
 
386
        # This type of branch can't be bound.
 
387
        if local:
 
388
            raise errors.LocalRequiresBoundBranch()
382
389
        result = GitPullResult()
383
390
        result.source_branch = self.source
384
391
        result.target_branch = self.target