AbstractSourceCodeManager.st
branchjv
changeset 3936 669dd820f259
parent 3934 a5520a0cce2e
parent 3930 aecdc8ea19d8
child 3940 2a94c0dfac98
--- a/AbstractSourceCodeManager.st	Tue Dec 22 09:17:01 2015 +0100
+++ b/AbstractSourceCodeManager.st	Fri Jan 15 13:10:13 2016 +0000
@@ -2153,7 +2153,7 @@
     className := aClass name.
     nameOfVersionMethodInClasses := self nameOfVersionMethodInClasses.
 
-    (revision := aClass revisionOfManager:self "revision") isNil ifTrue:[ 
+    (revision := aClass revisionOfManager:self) isNil ifTrue:[ 
         force ifFalse:[
             ('SourceCodeManager [warning]: class ' , className, ' has no revision string') errorPrintCR.
 
@@ -2168,11 +2168,15 @@
             ((aClass theMetaclass includesSelector:#version)
                or:[aClass theMetaclass includesSelector: nameOfVersionMethodInClasses]) ifTrue:[
                 answer := OptionBox 
-                            request:('Class %1 has no (usable) revision string.\\Check in as newest ?' bindWith:className allBold) withCRs
+                            request:('Class %1 has unusable or broken revision string.\\Check in as newest ?' bindWith:className allBold) withCRs
                             label:'Confirm'
-                            buttonLabels:(allLabel , #('Cancel' 'CheckIn')) 
-                            values:(allValue , #(false #checkIn))
+                            buttonLabels:(allLabel , #('Cancel' 'Browse & Cancel' 'CheckIn')) 
+                            values:(allValue , #(false #browse #checkIn))
                             default:#checkIn.
+                answer == #browse ifTrue:[
+                    UserPreferences browserClass openInClass:aClass theMetaclass.
+                    AbortOperationRequest raise. ^ false
+                ].    
             ] ifFalse:[
                 force ifTrue:[
                     revision := self newestRevisionInFile:classFileName directory:packageDir module:moduleDir.
@@ -2572,12 +2576,12 @@
 
     |versionString|
 
-    versionString := aString copyWithout: $§.
+    versionString := aString copyWithout: $.
     ^ self ensureKeywordExpansionWith: $$ inVersionMethod:versionString.
 
     "
      self ensureDollarsInVersionMethod:'foo ^ ''hello'' ' 
-     self ensureDollarsInVersionMethod:'foo ^ ''§hello§'' ' 
+     self ensureDollarsInVersionMethod:'foo ^ ''hello'' ' 
      self ensureDollarsInVersionMethod:'foo ^ ''   hello   '' '    
      self ensureDollarsInVersionMethod:'foo ^ ''$','Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.228 2009/10/20 09:55:58 fm Exp $'' '      
     -- errors:
@@ -2662,17 +2666,17 @@
         ,aCharacter asString ,(aString copyFrom:indexOfLastQuote)
 
     "
-     self ensureKeywordExpansionWith: $§ inVersionMethod: 'foo ^ ''hello'' '  
-     self ensureKeywordExpansionWith: $§ inVersionMethod: 'foo ^ ''   hello   '' '
-     self ensureKeywordExpansionWith: $§ inVersionMethod: 'foo ^ ''§Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.218 2009/10/07 12:12:30 fm Exp §'' '    
+     self ensureKeywordExpansionWith: $ inVersionMethod: 'foo ^ ''hello'' '  
+     self ensureKeywordExpansionWith: $ inVersionMethod: 'foo ^ ''   hello   '' '
+     self ensureKeywordExpansionWith: $ inVersionMethod: 'foo ^ ''Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.218 2009/10/07 12:12:30 fm Exp '' '    
 
      self ensureKeywordExpansionWith: $$ inVersionMethod: 'foo ^ ''hello'' '  
      self ensureKeywordExpansionWith: $$ inVersionMethod: 'foo ^ ''   hello   '' '
      self ensureKeywordExpansionWith: $$ inVersionMethod: 'foo ^ ''$','Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.228 2009/10/20 09:55:58 fm Exp $'' '    
 
     -- errors:
-     self ensureKeywordExpansionWith: $§ inVersionMethod: 'foo ^ ''§Head'' '  
-     self ensureKeywordExpansionWith: $§ inVersionMethod: 'foo ^ ''Header§'' '   
+     self ensureKeywordExpansionWith: $ inVersionMethod: 'foo ^ ''Head'' '  
+     self ensureKeywordExpansionWith: $ inVersionMethod: 'foo ^ ''Header'' '   
     "
 !
 
@@ -2685,23 +2689,23 @@
 
 ensureNoDollarsInVersionMethod:aString
     "given the source code of another manager's version method, ensure that it does NOT
-     contain dollars and add $§ instead, to avoid that CVS expands keywords in it"
+     contain dollars and add $ instead, to avoid that CVS expands keywords in it"
 
     |versionString|
 
     versionString := aString copyWithout: $$.
-    ^ self ensureKeywordExpansionWith: $§ inVersionMethod:versionString.
+    ^ self ensureKeywordExpansionWith: $ inVersionMethod:versionString.
 
     "
         self ensureNoDollarsInVersionMethod:'foo ^ ''$','Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.228 2009/10/20 09:55:58 fm Exp $'' '           
         self ensureNoDollarsInVersionMethod:'foo ^ ''$','Head'' '                
         self ensureNoDollarsInVersionMethod:'foo ^ ''Header$'' '             
-        self ensureNoDollarsInVersionMethod:'foo ^ ''§Header§'' '    
+        self ensureNoDollarsInVersionMethod:'foo ^ ''Header'' '    
 
       -- errors:
 
-        self ensureNoDollarsInVersionMethod:'foo ^ ''§Header'' '   
-        self ensureNoDollarsInVersionMethod:'foo ^ ''Header§'' '             
+        self ensureNoDollarsInVersionMethod:'foo ^ ''Header'' '   
+        self ensureNoDollarsInVersionMethod:'foo ^ ''Header'' '             
 
     "
 !