Commits

Steve Borho committed d1aa508

hggtk/status: switch from 'C' to '=' for clean files

ESR posted a bug report (899) for Mercurial to change the way status lists
clean files. 'C' was considered harmful because CVS and SVN users expect
'C' to imply conflicts. A patch was just applied to hg-crew to switch to
'='. This patch echos that change in our status dialog.

  • Participants
  • Parent commits 6fbc53f

Comments (0)

Files changed (1)

         self._menus['A'] = addrem_menu
         self._menus['R'] = addrem_menu
         self._menus['?'] = unknown_menu
-        self._menus['C'] = clean_menu
+        self._menus['='] = clean_menu
         self._menus['I'] = ignored_menu
         self._menus['!'] = deleted_menu
 
                        ('unknown', '?', unknown),
                        ('ignored', 'I', ignored))
     
-        explicit_changetypes = changetypes + (('clean', 'C', clean),)
+        explicit_changetypes = changetypes + (('clean', '=', clean),)
 
         # List of the currently checked and selected files to pass on to the new data
         recheck = [entry[2] for entry in self.model if entry[0]]
 
 
     def _sort_by_stat(self, model, iter1, iter2):
-        order = 'MAR!?IC'
+        order = 'MAR!?I='
         lhs, rhs = (model.get_value(iter1, 1), model.get_value(iter2, 1))
 
         # GTK+ bug that calls sort before a full row is inserted causing values to be None.
             text_renderer.set_property('foreground', '#006400')
         elif stat == 'R':
             text_renderer.set_property('foreground', '#900000')
-        elif stat == 'C':
+        elif stat == '=':
             text_renderer.set_property('foreground', 'black')
         elif stat == '!':
             text_renderer.set_property('foreground', 'red')
 
 
     def _remove_clicked(self, toolbutton, data=None):
-        remove_list = self._relevant_files('C')
+        remove_list = self._relevant_files('=')
         if len(remove_list) > 0:
             self._hg_remove(remove_list)
         else: