Mercurial Mercurial > hg > stx-libbasic3 / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AbstractSourceCodeManager.st
changeset 2665 279ad76d9372
parent 2654 6cb5bc656e8c
child 2668 283d9824b191 
--- a/AbstractSourceCodeManager.st	Wed Dec 21 19:45:26 2011 +0100
+++ b/AbstractSourceCodeManager.st	Wed Dec 21 20:43:06 2011 +0100
@@ -321,7 +321,6 @@
 !
 
 utilities
-
     "Returns 'utilities' object that can be used by tools. 
 
      By default, it returns an instance of
@@ -329,9 +328,10 @@
      manager, but individual managers may override this
      method and supply its own, customized utilities."
 
-    ^SourceCodeManagerUtilities forManager: self
+    ^ SourceCodeManagerUtilities forManager: self
 
     "Created: / 10-10-2011 / 15:10:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 21-12-2011 / 20:05:31 / cg"
 !
 
 workTreeDirectoryName
@@ -1011,57 +1011,6 @@
     "Created: / 23-08-2006 / 14:10:29 / cg"
 !
 
-isRevision:revision1 after:revision2
-    "true, if the dotted revision string revision1 is > than revision2"
-
-    |idx1 idx2 nr1 nr2 rest1 rest2|
-
-    idx1 := revision1 indexOf:$..
-    idx1 == 0 ifTrue:[
-        nr1 := Integer readFrom:revision1.
-    ] ifFalse:[
-        nr1 := Integer readFrom:(revision1 copyTo:idx1-1).
-        rest1 := revision1 copyFrom:idx1+1.
-    ].
-
-    idx2 := revision2 indexOf:$..
-    idx2 == 0 ifTrue:[
-        nr2 := Integer readFrom:revision2.
-    ] ifFalse:[
-        nr2 := Integer readFrom:(revision2 copyTo:idx2-1).
-        rest2 := revision2 copyFrom:idx2+1.
-    ].
-    nr1 = nr2 ifFalse:[
-        ^ nr1 > nr2
-    ].
-
-    "/ advance...
-    rest1 isEmptyOrNil ifTrue:[
-        ^ false
-    ].
-    rest2 isEmptyOrNil ifTrue:[
-        ^ true
-    ].
-    ^ self isRevision:rest1 after:rest2
-
-    "
-     SourceCodeManager isRevision:'1' after:'2'      
-     SourceCodeManager isRevision:'2' after:'1'      
-     SourceCodeManager isRevision:'1.1' after:'2.1.2' 
-     SourceCodeManager isRevision:'2.1' after:'1.2.3' 
-     SourceCodeManager isRevision:'1' after:'1.1'    
-     SourceCodeManager isRevision:'1.1' after:'1'    
-     SourceCodeManager isRevision:'1.1' after:'1.2' 
-     SourceCodeManager isRevision:'1.2' after:'1.1' 
-     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.5' 
-     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.3' 
-     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3'   
-     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.4'   
-    "
-
-    "Created: / 21-12-2011 / 19:15:35 / cg"
-!
-
 moduleFromContainerPath:containerPath forClass:aClass
     "given a full path as in an RCS header, extract the module."
 
@@ -1238,28 +1187,6 @@
     "Modified: 12.9.1996 / 02:32:40 / cg"
 !
 
-revisionAfter:aRevisionString
-    "generate the next revision number after the given number"
-
-    |idx|
-
-    idx := aRevisionString lastIndexOf:$..
-    idx == 0 ifTrue:[
-        ^ ((Integer readFrom:aRevisionString) + 1) printString
-    ].
-
-    ^ (aRevisionString copyTo:idx) , ((Integer readFrom:(aRevisionString copyFrom:(idx+1)))+1) printString
-
-    "
-     SourceCodeManager revisionAfter:'1.2.3.4' 
-     SourceCodeManager revisionAfter:'123'  
-     SourceCodeManager revisionAfter:'1.24'  
-    "
-
-    "Created: 20.11.1995 / 12:54:05 / cg"
-    "Modified: 12.9.1996 / 02:33:03 / cg"
-!
-
 sourceCacheDirectory
     "return the sourceCache directories name"
 
@@ -1524,6 +1451,57 @@
     "Modified (format): / 01-12-2011 / 20:56:32 / cg"
 !
 
+isRevision:revision1 after:revision2
+    "true, if the dotted revision string revision1 is > than revision2"
+
+    |idx1 idx2 nr1 nr2 rest1 rest2|
+
+    idx1 := revision1 indexOf:$..
+    idx1 == 0 ifTrue:[
+        nr1 := Integer readFrom:revision1.
+    ] ifFalse:[
+        nr1 := Integer readFrom:(revision1 copyTo:idx1-1).
+        rest1 := revision1 copyFrom:idx1+1.
+    ].
+
+    idx2 := revision2 indexOf:$..
+    idx2 == 0 ifTrue:[
+        nr2 := Integer readFrom:revision2.
+    ] ifFalse:[
+        nr2 := Integer readFrom:(revision2 copyTo:idx2-1).
+        rest2 := revision2 copyFrom:idx2+1.
+    ].
+    nr1 = nr2 ifFalse:[
+        ^ nr1 > nr2
+    ].
+
+    "/ advance...
+    rest1 isEmptyOrNil ifTrue:[
+        ^ false
+    ].
+    rest2 isEmptyOrNil ifTrue:[
+        ^ true
+    ].
+    ^ self isRevision:rest1 after:rest2
+
+    "
+     SourceCodeManager isRevision:'1' after:'2'      
+     SourceCodeManager isRevision:'2' after:'1'      
+     SourceCodeManager isRevision:'1.1' after:'2.1.2' 
+     SourceCodeManager isRevision:'2.1' after:'1.2.3' 
+     SourceCodeManager isRevision:'1' after:'1.1'    
+     SourceCodeManager isRevision:'1.1' after:'1'    
+     SourceCodeManager isRevision:'1.1' after:'1.2' 
+     SourceCodeManager isRevision:'1.2' after:'1.1' 
+     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.5' 
+     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.3' 
+     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3'   
+     SourceCodeManager isRevision:'1.2.3.4' after:'1.2.3.4'   
+    "
+
+    "Created: / 21-12-2011 / 19:15:35 / cg"
+!
+
 isVersionMethodSelector: selector 
     "true if the given selector is for one of the manager's version methods.
      These are all named version_XXX, where XXX is manager-specific (CVS, P4, SVN etc.).
@@ -1585,6 +1563,28 @@
     "Created: / 29-09-2011 / 13:26:29 / cg"
 !
 
+revisionAfter:aRevisionString
+    "generate the next revision number after the given number"
+
+    |idx|
+
+    idx := aRevisionString lastIndexOf:$..
+    idx == 0 ifTrue:[
+        ^ ((Integer readFrom:aRevisionString) + 1) printString
+    ].
+
+    ^ (aRevisionString copyTo:idx) , ((Integer readFrom:(aRevisionString copyFrom:(idx+1)))+1) printString
+
+    "
+     SourceCodeManager revisionAfter:'1.2.3.4' 
+     SourceCodeManager revisionAfter:'123'  
+     SourceCodeManager revisionAfter:'1.24'  
+    "
+
+    "Created: 20.11.1995 / 12:54:05 / cg"
+    "Modified: 12.9.1996 / 02:33:03 / cg"
+!
+
 settingsApplicationClass
     "link to my settings application (needed for the settings dialog"
 
@@ -2194,7 +2194,7 @@
 
     doubleColon := source indexOf: $: startingAt: startQuote + 2.
     "/There may be no double colon at all, if the version method
-    "/is fresh, like '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.276 2011-12-21 18:44:26 cg Exp $'
+    "/is fresh, like '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.277 2011-12-21 19:43:06 cg Exp $'
     (doubleColon == 0 or:[doubleColon > endQuote]) ifTrue:[
         doubleColon := endQuote - 1.
     ].
@@ -3418,11 +3418,11 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.276 2011-12-21 18:44:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.277 2011-12-21 19:43:06 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.276 2011-12-21 18:44:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.277 2011-12-21 19:43:06 cg Exp $'
 ! !
 
 AbstractSourceCodeManager initialize!
hg/stx-libbasic3