/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 bzrlib/builtins.py

  • Committer: Gary van der Merwe
  • Date: 2009-02-26 20:56:25 UTC
  • mto: (4335.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4336.
  • Revision ID: garyvdm@gmail.com-20090226205625-kws76tm1oeqm77hb
https://launchpad.net/bugs/194716
Implement pull --local.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
874
874
        except errors.NoWorkingTree:
875
875
            tree_to = None
876
876
            branch_to = Branch.open_containing(directory)[0]
 
877
        
 
878
        if local and not branch_to.get_bound_location():
 
879
            raise errors.LocalRequiresBoundBranch()
877
880
 
878
881
        possible_transports = []
879
882
        if location is not None:
922
925
                    unversioned_filter=tree_to.is_ignored, view_info=view_info)
923
926
                result = tree_to.pull(branch_from, overwrite, revision_id,
924
927
                                      change_reporter,
925
 
                                      possible_transports=possible_transports)
 
928
                                      possible_transports=possible_transports,
 
929
                                      local=local)
926
930
            else:
927
 
                result = branch_to.pull(branch_from, overwrite, revision_id)
 
931
                result = branch_to.pull(branch_from, overwrite, revision_id,
 
932
                                      local=local)
928
933
 
929
934
            result.report(self.outf)
930
935
            if verbose and result.old_revid != result.new_revid: