/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: Aaron Bentley
  • Date: 2007-02-09 16:26:22 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209162622-mczvdmtgxwwi91mq
Add change reporting to pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1315
1315
                yield stem
1316
1316
 
1317
1317
    @needs_write_lock
1318
 
    def pull(self, source, overwrite=False, stop_revision=None):
 
1318
    def pull(self, source, overwrite=False, stop_revision=None,
 
1319
             change_reporter=None):
1319
1320
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1320
1321
        source.lock_read()
1321
1322
        try:
1336
1337
                                new_basis_tree,
1337
1338
                                basis_tree,
1338
1339
                                this_tree=self,
1339
 
                                pb=pb)
 
1340
                                pb=pb,
 
1341
                                change_reporter=change_reporter)
1340
1342
                    if (basis_tree.inventory.root is None and
1341
1343
                        new_basis_tree.inventory.root is not None):
1342
1344
                        self.set_root_id(new_basis_tree.inventory.root.file_id)