Rev 4635: Some cleanup. in file:///home/vila/src/bzr/bugs/232113-revert-failure/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/232113-revert-failure/

------------------------------------------------------------
revno: 4635
revision-id: v.ladeuil+lp at free.fr-20100310180436-s308wnjbl7noj1p1
parent: v.ladeuil+lp at free.fr-20100310150458-aziouc6c69gkjakz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 232113-revert-failure
timestamp: Wed 2010-03-10 19:04:36 +0100
message:
  Some cleanup.
  
  * bzrlib/builtins.py:
  (cmd_remerge.run): Shuffle some files to make the code clearer.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-03-03 08:25:15 +0000
+++ b/bzrlib/builtins.py	2010-03-10 18:04:36 +0000
@@ -4060,7 +4060,6 @@
                                          " multi-merges.")
         repository = tree.branch.repository
         interesting_ids = None
-        new_conflicts = []
         conflicts = tree.conflicts()
         if file_list is not None:
             interesting_ids = set()
@@ -4075,15 +4074,15 @@
                 for name, ie in tree.inventory.iter_entries(file_id):
                     interesting_ids.add(ie.file_id)
             new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
+            restore_files = file_list
         else:
             # Remerge only supports resolving contents conflicts
             allowed_conflicts = ('text conflict', 'contents conflict')
             restore_files = [c.path for c in conflicts
                              if c.typestring in allowed_conflicts]
+            new_conflicts = []
         _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
         tree.set_conflicts(ConflictList(new_conflicts))
-        if file_list is not None:
-            restore_files = file_list
         for filename in restore_files:
             try:
                 restore(tree.abspath(filename))