← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Fixup pb usage to use nested_progress_bar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
855
855
                else:
856
856
                    other_revision = None
857
857
                repository = self.branch.repository
858
 
                merge_inner(self.branch,
859
 
                            self.branch.basis_tree(),
860
 
                            basis_tree, 
861
 
                            this_tree=self, 
862
 
                            pb=bzrlib.ui.ui_factory.progress_bar())
 
858
                pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
859
                try:
 
860
                    merge_inner(self.branch,
 
861
                                self.branch.basis_tree(),
 
862
                                basis_tree, 
 
863
                                this_tree=self, 
 
864
                                pb=pb)
 
865
                finally:
 
866
                    pb.finished()
863
867
                self.set_last_revision(self.branch.last_revision())
864
868
            return count
865
869
        finally: