Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 02 Jun 2016 09:19:54 +0100
branchjv
changeset 4053 7817fc8db06e
parent 4041 71b5dc4ee4c0 (current diff)
parent 4046 1d63073ace00 (diff)
child 4054 e1d270d3c382
Merge
AbstractSourceCodeManager.st
CVSSourceCodeManager.st
GitSourceCodeManager.st
MercurialSourceCodeManager.st
--- a/AbstractSourceCodeManager.st	Tue May 31 22:19:30 2016 +0100
+++ b/AbstractSourceCodeManager.st	Thu Jun 02 09:19:54 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -102,9 +104,9 @@
 !
 
 initialize
-    "setup for no caching and no workTree"
-
-    CachingSources isNil ifTrue:[CachingSources := false].
+    "setup for caching and no workTree"
+
+    CachingSources isNil ifTrue:[CachingSources := true].
     UseWorkTree    isNil ifTrue:[UseWorkTree := false].
     ManagerForPackageCache := Dictionary new.
 
@@ -206,8 +208,17 @@
     "enable/disable the caching of source files.
      (see cacheDirectoryName for what that means)"
 
-    CachingSources := aBoolean
-
+    CachingSources := aBoolean.
+    aBoolean ifTrue:[
+        CacheDirectoryName isNil ifTrue:[
+            self validateCacheDirPath
+        ].    
+    ].    
+
+    "
+     AbstractSourceCodeManager cachingSources:true
+    "
+    
     "Created: 16.12.1995 / 15:18:13 / cg"
     "Modified: 12.9.1996 / 02:22:42 / cg"
 !
@@ -2609,7 +2620,7 @@
 
     "
      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:
@@ -2696,17 +2707,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§'' '   
     "
 !
 
@@ -2719,23 +2730,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§'' '             
 
     "
 !
--- a/CVSSourceCodeManager.st	Tue May 31 22:19:30 2016 +0100
+++ b/CVSSourceCodeManager.st	Thu Jun 02 09:19:54 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -255,13 +257,6 @@
 
     UseWorkTree := false.
 
-"/    CacheDirectoryName isNil ifTrue:[
-"/        self initCacheDirPath.
-"/    ].
-"/    CachingSources isNil ifTrue:[
-"/        CachingSources := true.
-"/    ].
-
     "/
     "/ check if there is an stx directory there
     "/
@@ -4704,17 +4699,17 @@
             "/ The repair code will be removed at some time in the future...
 
             "/ temporary fix Felix' bad string translation:
-            (aString startsWith:'§Header:') ifTrue:[
-                (aString endsWith:'Exp §') ifTrue:[
+            (aString startsWith:'§Header:') ifTrue:[
+                (aString endsWith:'Exp §') ifTrue:[
                     fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
 
                     aClass isNil ifTrue:[
                         autoFixHolder value ifFalse:[
-                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
                         ]
                     ] ifFalse:[
                         (autoFixHolder value 
-                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
                         ) ifTrue:[
                             self updateVersionMethodOf:aClass for:fixedString.
                         ].
@@ -4722,7 +4717,7 @@
                 ].
             ].
 
-            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
             (aString startsWith:'Header: ') ifTrue:[
                 (aString endsWith:'Exp ') ifTrue:[
                     fixedString := '$' , aString , '$'.
--- a/GitSourceCodeManager.st	Tue May 31 22:19:30 2016 +0100
+++ b/GitSourceCodeManager.st	Thu Jun 02 09:19:54 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2012 by Claus Gittinger
               All Rights Reserved
@@ -81,13 +83,6 @@
 "/        ^ self
 "/    ].
 
-"/    CacheDirectoryName isNil ifTrue:[
-"/        self initCacheDirPath.
-"/    ].
-"/    CachingSources isNil ifTrue:[
-"/        CachingSources := true.
-"/    ].
-
     "/
     "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
     "/ if non-nil, a working tree is kept there
--- a/MercurialSourceCodeManager.st	Tue May 31 22:19:30 2016 +0100
+++ b/MercurialSourceCodeManager.st	Thu Jun 02 09:19:54 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2012 by Claus Gittinger
               All Rights Reserved
@@ -81,13 +83,6 @@
 "/        ^ self
 "/    ].
 
-"/    CacheDirectoryName isNil ifTrue:[
-"/        self initCacheDirPath.
-"/    ].
-"/    CachingSources isNil ifTrue:[
-"/        CachingSources := true.
-"/    ].
-
     "/
     "/ optionally set the WorkTreeDirectoryName from $STX_WORKTREE;
     "/ if non-nil, a working tree is kept there