← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-02-15 02:37:51 UTC
  • mfrom: (1551.11.13 transform-translation)
  • Revision ID: pqm@pqm.ubuntu.com-20070215023751-277626e9357e8a6c
Generate iter_changes output from TreeTransform, use in merge, revert, etc.

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)