← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-11 02:54:57 UTC
  • mfrom: (2810.2.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070911025457-xd28g5hqu9jco1sm
(vila) avoid repeated connections from bzr update

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1016
1016
 
1017
1017
    def run(self, dir='.'):
1018
1018
        tree = WorkingTree.open_containing(dir)[0]
1019
 
        master = tree.branch.get_master_branch()
 
1019
        possible_transports = []
 
1020
        master = tree.branch.get_master_branch(
 
1021
            possible_transports=possible_transports)
1020
1022
        if master is not None:
1021
1023
            tree.lock_write()
1022
1024
        else:
1032
1034
                    revno = tree.branch.revision_id_to_revno(last_rev)
1033
1035
                    note("Tree is up to date at revision %d." % (revno,))
1034
1036
                    return 0
1035
 
            conflicts = tree.update(delta._ChangeReporter(
1036
 
                                        unversioned_filter=tree.is_ignored))
 
1037
            conflicts = tree.update(
 
1038
                delta._ChangeReporter(unversioned_filter=tree.is_ignored),
 
1039
                possible_transports=possible_transports)
1037
1040
            revno = tree.branch.revision_id_to_revno(
1038
1041
                _mod_revision.ensure_null(tree.last_revision()))
1039
1042
            note('Updated to revision %d.' % (revno,))