--- a/mercurial/HGCommitDialog.st	Thu Nov 14 13:33:16 2013 +0000
+++ b/mercurial/HGCommitDialog.st	Fri Nov 29 15:49:36 2013 +0000
@@ -237,65 +237,6 @@
          
         )
       )
-!
-
-fileListColumnSpec
-    "This resource specification was automatically generated
-     by the DataSetBuilder of ST/X."
-
-    "Do not manually edit this!! If it is corrupted,
-     the DataSetBuilder may not be able to read the specification."
-
-    "
-     DataSetBuilder new openOnClass:HGCommitDialog andSelector:#fileListColumnSpec
-    "
-
-    <resource: #tableColumns>
-
-    ^#(
-      (DataSetColumnSpec
-         label: ''
-         activeHelpKey: ''
-         activeHelpKeyForLabel: ''
-         labelButtonType: None
-         width: 22
-         minWidth: 22
-         editorType: CheckToggle
-         rendererType: CheckToggle
-         model: include
-         menuFromApplication: false
-         printSelector: include
-         selectSelector: includeEditable
-         showRowSeparator: false
-         showColSeparator: false
-       )
-      (DataSetColumnSpec
-         label: ''
-         activeHelpKey: ''
-         activeHelpKeyForLabel: ''
-         labelButtonType: Button
-         width: 22
-         minWidth: 22
-         menuFromApplication: false
-         printSelector: statusIcon
-         canSelect: false
-         showRowSeparator: false
-         showColSeparator: false
-       )
-      (DataSetColumnSpec
-         label: 'Container'
-         labelAlignment: left
-         activeHelpKey: ''
-         activeHelpKeyForLabel: ''
-         labelButtonType: Button
-         menuFromApplication: false
-         printSelector: pathText
-         canSelect: false
-         showRowSeparator: false
-         showColSeparator: false
-       )
-      )
-    
 ! !
 
 !HGCommitDialog methodsFor:'actions'!
@@ -376,14 +317,14 @@
         "/Argh...backward compatibility..."
         (Tools::TextDiff2Tool ? Tools::TextDiffTool) new
             labelA: 'Working copy';
-            labelB: ('r %1' bindWith: rev printString);
+            labelB: ('%1' bindWith: rev printString);
             textA: text1; textB: text2;
             title:('%1: Diffbetween working copy and rev. %2 ' bindWith: wcentry pathNameRelative with: rev printString);
             open
     ]
 
     "Created: / 09-02-2012 / 14:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-07-2013 / 00:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2013 / 11:50:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doShowDiffsForEntryAgainstHEAD
@@ -568,15 +509,17 @@
     statuses do:[:statusAndPath|
         (fileListShowOnlyModifiedHolder value not
             or:[statusAndPath first isCleanOrIgnoredOrNotTracked not]) ifTrue:[
-            | nm entry |
+            | nm status entry |
 
             (statusAndPath second startsWith: wcrootPathNameRelative) ifTrue:[
+                status := statusAndPath first.
                 nm := statusAndPath second.
                 wcrootPathNameRelativeLen ~~ 0 ifTrue:[
                     nm := nm copyFrom:wcrootPathNameRelativeLen + 2.
                 ].
                 entry := SCMAbstractCommitDialog::FileEntry application: self entry: wcroot / nm name: nm.
                 entry includeEditable: notMerge.
+                entry icon: status icon.
                 entries add: entry
             ].
         ].
@@ -584,7 +527,7 @@
     self fileListHolder value: entries
 
     "Created: / 08-02-2012 / 18:05:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 01-04-2013 / 13:35:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-11-2013 / 15:14:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGCommitDialog methodsFor:'private'!