Rev 4621: Some notes that should be removed when all is said and done. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4621
revision-id: v.ladeuil+lp at free.fr-20100302171307-eegmomzl9s9jgywn
parent: v.ladeuil+lp at free.fr-20100302133814-m4yvfyl05uh3xk1a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: next
timestamp: Tue 2010-03-02 18:13:07 +0100
message:
  Some notes that should be removed when all is said and done.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2010-03-02 07:58:53 +0000
+++ b/bzrlib/conflicts.py	2010-03-02 17:13:07 +0000
@@ -298,6 +298,7 @@
         """
         path_set = set(paths)
         ids = {}
+        # case insensitive set !
         selected_paths = set()
         new_conflicts = ConflictList()
         selected_conflicts = ConflictList()
@@ -314,10 +315,13 @@
                     continue
                 if cpath in path_set:
                     selected = True
+                    # case insensitive add
                     selected_paths.add(cpath)
                 if recurse:
+                    # eeerk, case insensitive :-/
                     if osutils.is_inside_any(path_set, cpath):
                         selected = True
+                        # case insensitive add
                         selected_paths.add(cpath)
 
             for key in ('file_id', 'conflict_file_id'):
@@ -329,12 +333,14 @@
                 except KeyError:
                     continue
                 selected = True
+                # case insensitive add
                 selected_paths.add(cpath)
             if selected:
                 selected_conflicts.append(conflict)
             else:
                 new_conflicts.append(conflict)
         if ignore_misses is not True:
+            # case insensitive in selected_paths
             for path in [p for p in paths if p not in selected_paths]:
                 if not os.path.exists(tree.abspath(path)):
                     print "%s does not exist" % path
@@ -513,9 +519,14 @@
         op.run_simple(tt, suffix_to_remove)
 
     def action_take_this(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
         self._take_it_with_cleanups(tree, 'OTHER')
 
     def action_take_other(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
+
         self._take_it_with_cleanups(tree, 'THIS')
 
 
@@ -607,10 +618,14 @@
     format = 'Conflict adding file %(conflict_path)s.  %(action)s %(path)s.'
 
     def action_take_this(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
         tree.remove([self.conflict_path], force=True, keep_files=False)
         tree.rename_one(self.path, self.conflict_path)
 
     def action_take_other(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
         tree.remove([self.path], force=True, keep_files=False)
 
 
@@ -710,6 +725,8 @@
         pass
 
     def action_take_other(self, tree):
+        # FIXME: This may remove detritus files which may need to be
+        # quarantined somewhere.
         tree.remove([self.path], force=True, keep_files=False)