Fix for Smalltalk/X 6.2.2 in HGCommitDialog>>#doShowDiffsForEntry:against:
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 05 Jul 2013 00:50:37 +0100
changeset 311 e8f38dd4af64
parent 310 f5c8d61a488b
child 312 96019ed83851
Fix for Smalltalk/X 6.2.2 in HGCommitDialog>>#doShowDiffsForEntry:against: In 6.2.2, ChangeSet fromFile does not set the name of the ChangeSet. Do not use it to construct label for diff view.
mercurial/HGCommitDialog.st
--- a/mercurial/HGCommitDialog.st	Fri Jul 05 00:37:40 2013 +0100
+++ b/mercurial/HGCommitDialog.st	Fri Jul 05 00:50:37 2013 +0100
@@ -338,7 +338,7 @@
     ].
     wcentry suffix = SmalltalkLanguage instance sourceFileSuffix ifTrue:[
         wcChangeSet := ChangeSet fromFile: wcentry .
-        wcChangeSet name: wcChangeSet name, (resources string: ' (working copy - to be commited)').
+        wcChangeSet name: wcentry baseName, (resources string: ' (working copy - to be commited)').
         repoChangeSet := ChangeSet fromStream: repoentry contents asString readStream.
         repoChangeSet name: wcentry baseName,  ' (' , rev id printString , ')'.
         diffset := ChangeSetDiff versionA:wcChangeSet versionB:repoChangeSet.
@@ -362,7 +362,7 @@
     ]
 
     "Created: / 09-02-2012 / 14:53:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-01-2013 / 19:37:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-07-2013 / 00:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doShowDiffsForEntryAgainstHEAD
@@ -628,4 +628,3 @@
 version_SVN
     ^ '§Id::                                                                                                                        §'
 ! !
-