← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-11 19:54:45 UTC
  • mfrom: (0.15.22 unshelve)
  • mto: (0.16.63 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081011195445-0ceqw3nh9x7aebmj
Merge unshelve into shelf-manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
192
192
    def unshelve(self, change_reporter=None):
193
193
        pb = ui.ui_factory.nested_progress_bar()
194
194
        try:
 
195
            merger = self.get_merger()
 
196
            merger.change_reporter = change_reporter
 
197
            merger.do_merge()
 
198
        finally:
 
199
            pb.finished()
 
200
 
 
201
    def get_merger(self):
 
202
        pb = ui.ui_factory.nested_progress_bar()
 
203
        try:
195
204
            target_tree = self.transform.get_preview_tree()
196
205
            merger = merge.Merger.from_uncommitted(self.tree, target_tree, pb,
197
206
                                                   self.base_tree)
198
207
            merger.merge_type = merge.Merge3Merger
199
 
            merger.change_reporter = change_reporter
200
 
            merger.do_merge()
 
208
            return merger
201
209
        finally:
202
210
            pb.finished()
203
211