/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/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2007-10-04 15:48:44 UTC
  • mfrom: (2885.1.2 140432)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20071004154844-6an068lo9akzt2oh
Fix #140432 by handling the fixes parameter default value

Show diffs side-by-side

added added

removed removed

Lines of Context:
1522
1522
 
1523
1523
    @needs_write_lock
1524
1524
    def pull(self, source, overwrite=False, stop_revision=None,
1525
 
             change_reporter=None):
 
1525
             change_reporter=None, possible_transports=None):
1526
1526
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1527
1527
        source.lock_read()
1528
1528
        try:
1530
1530
            pp.next_phase()
1531
1531
            old_revision_info = self.branch.last_revision_info()
1532
1532
            basis_tree = self.basis_tree()
1533
 
            count = self.branch.pull(source, overwrite, stop_revision)
 
1533
            count = self.branch.pull(source, overwrite, stop_revision,
 
1534
                                     possible_transports=possible_transports)
1534
1535
            new_revision_info = self.branch.last_revision_info()
1535
1536
            if new_revision_info != old_revision_info:
1536
1537
                pp.next_phase()