← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1561
1561
 
1562
1562
    @needs_write_lock
1563
1563
    def pull(self, source, overwrite=False, stop_revision=None,
1564
 
             change_reporter=None, possible_transports=None):
 
1564
             change_reporter=None, possible_transports=None, local=False):
1565
1565
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1566
1566
        source.lock_read()
1567
1567
        try:
1570
1570
            old_revision_info = self.branch.last_revision_info()
1571
1571
            basis_tree = self.basis_tree()
1572
1572
            count = self.branch.pull(source, overwrite, stop_revision,
1573
 
                                     possible_transports=possible_transports)
 
1573
                                     possible_transports=possible_transports,
 
1574
                                     local=local)
1574
1575
            new_revision_info = self.branch.last_revision_info()
1575
1576
            if new_revision_info != old_revision_info:
1576
1577
                pp.next_phase()