← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

Fixup pb usage to use nested_progress_bar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
57
57
        garbage_inventories: The number of inventory objects without revisions
58
58
                             that were garbage collected.
59
59
        """
60
 
        self.pb = ui.ui_factory.progress_bar()
 
60
        self.pb = ui.ui_factory.nested_progress_bar()
 
61
        try:
 
62
            self._reconcile()
 
63
        finally:
 
64
            self.pb.finished()
 
65
 
 
66
    def _reconcile(self):
 
67
        """Helper function for performing reconciliation."""
61
68
        self.repo = self.bzrdir.find_repository()
62
69
        self.pb.note('Reconciling repository %s',
63
70
                     self.repo.bzrdir.root_transport.base)
86
93
        garbage_inventories: The number of inventory objects without revisions
87
94
                             that were garbage collected.
88
95
        """
89
 
        self.pb = ui.ui_factory.progress_bar()
90
96
        self.repo.lock_write()
91
97
        try:
92
 
            self._reweave_inventory()
 
98
            self.pb = ui.ui_factory.nested_progress_bar()
 
99
            try:
 
100
                self._reweave_inventory()
 
101
            finally:
 
102
                self.pb.finished()
93
103
        finally:
94
104
            self.repo.unlock()
95
105