Rev 3208: Aaron's review feedback. in file:///v/home/vila/src/bzr/bugs/123363-tmp-pollution/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/123363-tmp-pollution/

------------------------------------------------------------
revno: 3208
revision-id:v.ladeuil+lp at free.fr-20080130081525-i47iawe2ghcowoxt
parent: v.ladeuil+lp at free.fr-20080129170643-rz3wt7z5ryw0s4se
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Wed 2008-01-30 09:15:25 +0100
message:
  Aaron's review feedback.
  
  * bzrlib/builtins.py:
  (cmd_merge._do_preview): Ensure the TransformPreview.finalize is
  always called.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2008-01-29 17:06:43 +0000
+++ b/bzrlib/builtins.py	2008-01-30 08:15:25 +0000
@@ -2874,10 +2874,12 @@
         from bzrlib.diff import show_diff_trees
         tree_merger = merger.make_merger()
         tt = tree_merger.make_preview_transform()
-        result_tree = tt.get_preview_tree()
-        show_diff_trees(merger.this_tree, result_tree, self.outf, old_label='',
-                        new_label='')
-        tt.finalize()
+        try:
+            result_tree = tt.get_preview_tree()
+            show_diff_trees(merger.this_tree, result_tree, self.outf,
+                            old_label='', new_label='')
+        finally:
+            tt.finalize()
 
     def _do_merge(self, merger, change_reporter, allow_pending, verified):
         merger.change_reporter = change_reporter