Mercurial Mercurial > hg > stx-libbasic3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged b02354ae5ecf and d78776a464e4 (branch default - CVS HEAD) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 25 Nov 2013 10:37:57 +0000
branchjv
changeset 3419 96c5f010e49d
parent 3416 b02354ae5ecf (current diff)
parent 3418 d78776a464e4 (diff)
child 3420 de9c10ef92a2
Merged b02354ae5ecf and d78776a464e4 (branch default - CVS HEAD)
AbstractSourceCodeManager.st file | annotate | diff | comparison | revisions
CVSSourceCodeManager.st file | annotate | diff | comparison | revisions 
--- a/.hgtags	Thu Nov 14 14:47:40 2013 +0000
+++ b/.hgtags	Mon Nov 25 10:37:57 2013 +0000
@@ -26,6 +26,7 @@
 7e98ed39d4fd9dbabf33dac219211e9b26b0ec49 rel2_10_8_6_last_before_vmData_change
 83824ad8d5cb4b9564a8d61d4eaea720e383ee4f rel5_1_3
 83824ad8d5cb4b9564a8d61d4eaea720e383ee4f stx_513
+848ad94c1e8f5888798d9820432781d73b0c338d expecco_2_6_0
 882d87800deaf0bb95f7d7cdefb4622997dd4543 expeccoNET_1_5_0rc1
 882d87800deaf0bb95f7d7cdefb4622997dd4543 expecco_1_8_2rc1
 891d18a71bbf9f1df5d102cd44ee0393d298aa66 rel5_4_6
--- a/AbstractSourceCodeManager.st	Thu Nov 14 14:47:40 2013 +0000
+++ b/AbstractSourceCodeManager.st	Mon Nov 25 10:37:57 2013 +0000
@@ -1598,35 +1598,7 @@
 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
+    ^ (revision1 compareAsVersionNumberWith:revision2) > 0
 
     "
      SourceCodeManager isRevision:'1' after:'2'      
@@ -1636,6 +1608,7 @@
      SourceCodeManager isRevision:'1' after:'1.1'    
      SourceCodeManager isRevision:'1.1' after:'1'    
      SourceCodeManager isRevision:'1.1' after:'1.2' 
+     SourceCodeManager isRevision:'1.10' 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' 
@@ -1649,8 +1622,7 @@
 isRevision:revision1 sameOrAfter:revision2
     "true, if the dotted revision string revision1 is >= than revision2"
 
-    revision1 = revision2 ifTrue:[^ true].
-    ^ self isRevision:revision1 after:revision2
+    ^ (revision1 compareAsVersionNumberWith:revision2) >= 0
 
     "Created: / 26-09-2012 / 18:15:58 / cg"
 !
@@ -3821,11 +3793,11 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 !
 
 version_HG
@@ -3834,7 +3806,7 @@
 !
 
 version_SVN
-    ^ '$Id: AbstractSourceCodeManager.st,v 1.317 2013-09-05 23:17:52 cg Exp $'
+    ^ '$Id: AbstractSourceCodeManager.st,v 1.318 2013-11-14 15:34:21 stefan Exp $'
 ! !
 
 
--- a/CVSSourceCodeManager.st	Thu Nov 14 14:47:40 2013 +0000
+++ b/CVSSourceCodeManager.st	Mon Nov 25 10:37:57 2013 +0000
@@ -185,10 +185,19 @@
 
 !CVSSourceCodeManager class methodsFor:'initialization'!
 
+addExeptsPrivateRepositoryToModuleRoots
+    CVSModuleRoots at:'stx' put:(self exeptsPrivateSTXRepositoryModuleRoot).
+    CVSModuleRoots at:'exept' put:(self exeptsPrivateSTXRepositoryModuleRoot).
+!
+
 addExeptsPublicRepositoryToModuleRoots
     CVSModuleRoots at:'stx' put:(self exeptsPublicSTXRepositoryModuleRoot)
 !
 
+exeptsPrivateSTXRepositoryModuleRoot
+    ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
+!
+
 exeptsPublicSTXRepositoryModuleRoot
     ^ ':pserver:cvs@cvs.smalltalk-x.de:/cvs/stx'.
 !
@@ -217,8 +226,8 @@
     DisabledModules := nil.
     CVSModuleRoots isNil ifTrue:[
         CVSModuleRoots := Dictionary new.
-        "/ self addExeptsPublicRepositoryToModuleRoots.
     ].
+    "/ self possiblyAddExeptsPrivateRepositoryToModuleRoots.
 
     "/
     "/ if CVSROOT is non-empty and both cvs and co are available
@@ -324,6 +333,22 @@
     "Created: / 13.8.1997 / 17:20:57 / cg"
     "Modified: / 25.9.1997 / 12:28:05 / stefan"
     "Modified: / 2.11.1997 / 17:08:27 / cg"
+!
+
+possiblyAddExeptsPrivateRepositoryToModuleRoots
+    "/ for exept's convenience: if this is a host in our domain,
+    "/ add the exept repository.
+
+    |h addr|
+
+    (h := OperatingSystem getHostName) notEmptyOrNil ifTrue:[
+        addr := IPSocketAddress hostName:h.
+        addr notNil ifTrue:[
+            (addr hostAddress startsWith: #[172 23 1]) ifTrue:[
+                self addExeptsPrivateRepositoryToModuleRoots
+            ]
+        ].
+    ].
 ! !
 
 !CVSSourceCodeManager class methodsFor:'accessing'!
@@ -5316,11 +5341,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.480 2013-08-26 08:41:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.481 2013-11-08 10:34:29 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.480 2013-08-26 08:41:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.481 2013-11-08 10:34:29 cg Exp $'
 !
 
 version_HG
hg/stx-libbasic3