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 with /trunk jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 13 Feb 2012 19:20:09 +0000
branchjv
changeset 3021 956028a9df3d
parent 3020 240c299584af
child 3022 d678b271a3f9
Merged with /trunk
CVSSourceCodeManager.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
MethodFinder.st file | annotate | diff | comparison | revisions
SourceCodeManagerUtilities.st file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
libbasic3.rc file | annotate | diff | comparison | revisions
stx_libbasic3.st file | annotate | diff | comparison | revisions 
--- a/CVSSourceCodeManager.st	Mon Feb 13 18:51:07 2012 +0000
+++ b/CVSSourceCodeManager.st	Mon Feb 13 19:20:09 2012 +0000
@@ -4238,9 +4238,9 @@
             ].
         ].
 
-        "/ temporary fix translated (§-sign) and not restored strings:
-        (aString startsWith:'§Header: ') ifTrue:[
-            (aString endsWith:'Exp §') ifTrue:[
+        "/ temporary fix translated (-sign) and not restored strings:
+        (aString startsWith:'Header: ') ifTrue:[
+            (aString endsWith:'Exp ') ifTrue:[
                 fixedString := '$' , (aString copyFrom:2 to:(aString size - 1)) , '$'.
 
                 aClass isNil ifTrue:[
@@ -4420,7 +4420,7 @@
                         ].
                         info at:#symbolicNames put:tags.
                     ].
-                    (line startsWith:'description:') ifTrue:[inHeaderInfo := false].
+                    (line notNil and:[line startsWith:'description:']) ifTrue:[inHeaderInfo := false].
                 ]
             ]
         ].
@@ -4430,6 +4430,10 @@
             ('CVSSourceCodeManager [warning]: no log for ', fullName) errorPrintCR.
             ^ nil
         ].
+        inStream atEnd ifTrue:[
+            ('CVSSourceCodeManager [warning]: empty log for ', fullName) errorPrintCR.
+            ^ nil
+        ].
 
         "/ strip selected revisions from the total-revisions entry
         s := info at:#numberOfRevisions.
@@ -4484,7 +4488,7 @@
 
     "Created: / 16-11-1995 / 13:25:30 / cg"
     "Modified: / 29-01-1997 / 16:51:30 / stefan"
-    "Modified: / 29-08-2006 / 14:57:26 / cg"
+    "Modified: / 05-02-2012 / 19:03:06 / cg"
 !
 
 revisionLogOfPackageInDirectory:packageDir module:moduleDir
@@ -5071,15 +5075,16 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Id: CVSSourceCodeManager.st 1872 2012-01-30 17:19:14Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.428 2012/02/05 18:13:56 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.427 2012/01/20 15:43:48 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.428 2012/02/05 18:13:56 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: CVSSourceCodeManager.st 1872 2012-01-30 17:19:14Z vranyj1 $'
+    ^ '$Id: CVSSourceCodeManager.st 1884 2012-02-13 19:20:09Z vranyj1 $'
 ! !
 
 CVSSourceCodeManager initialize!
+
--- a/Make.proto	Mon Feb 13 18:51:07 2012 +0000
+++ b/Make.proto	Mon Feb 13 19:20:09 2012 +0000
@@ -1,7 +1,7 @@
-# $Header$
+# $Header: /cvs/stx/stx/libbasic3/Make.proto,v 1.125 2012/01/30 18:55:02 vrany Exp $
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-02-06 15:46:26.696.
+# automagically generated from the projectDefinition: stx_libbasic3 at 2012-01-30 18:54:42.721.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -193,3 +193,4 @@
 
 # ENDMAKEDEPEND --- do not remove this line
 
+
--- a/Make.spec	Mon Feb 13 18:51:07 2012 +0000
+++ b/Make.spec	Mon Feb 13 19:20:09 2012 +0000
@@ -1,7 +1,7 @@
-# $Header$
+# $Header: /cvs/stx/stx/libbasic3/Make.spec,v 1.74 2012/01/30 18:54:51 vrany Exp $
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-02-06 15:46:25.911.
+# automagically generated from the projectDefinition: stx_libbasic3 at 2012-01-30 18:54:42.420.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -189,3 +189,4 @@
 
 
 
+
--- a/MethodFinder.st	Mon Feb 13 18:51:07 2012 +0000
+++ b/MethodFinder.st	Mon Feb 13 19:20:09 2012 +0000
@@ -124,7 +124,7 @@
         ^ resultString
 ! !
 
-!MethodFinder methodsFor:'access'!
+!MethodFinder methodsFor:'accessing'!
 
 answers
 
@@ -1301,9 +1301,9 @@
                                         self error: 'bad assn'].
                                 (sub value isKindOf: Class) ifTrue: [
                                         self error: 'class in assn'].
-                                sub value class == Symbol ifTrue: [sub value codePoint = 204 '$̀' ifTrue: [
+                                sub value class == Symbol ifTrue: [sub value codePoint = 204 '$' ifTrue: [
                                         self error: 'Write into char']].
-                                sub value == $̀ ifTrue: [
+                                sub value == $ ifTrue: [
                                         self error: 'Write into char']
         "].
                 sub class == Array ifTrue: [
@@ -1593,13 +1593,14 @@
 !MethodFinder class methodsFor:'documentation'!
 
 version
-    ^ '$Id: MethodFinder.st 1872 2012-01-30 17:19:14Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MethodFinder.st,v 1.28 2012/01/31 09:47:40 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/MethodFinder.st,v 1.27 2010/08/02 11:35:24 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic3/MethodFinder.st,v 1.28 2012/01/31 09:47:40 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: MethodFinder.st 1872 2012-01-30 17:19:14Z vranyj1 $'
+    ^ '$Id: MethodFinder.st 1884 2012-02-13 19:20:09Z vranyj1 $'
 ! !
+
--- a/SourceCodeManagerUtilities.st	Mon Feb 13 18:51:07 2012 +0000
+++ b/SourceCodeManagerUtilities.st	Mon Feb 13 19:20:09 2012 +0000
@@ -2007,12 +2007,16 @@
         diffSet := listHere diffSetsAgainst:listRep.
         changed := diffSet changed.
         onlyHere := diffSet onlyInReceiver.
-        onlyHere := onlyHere select:[:eachDiff|  |methodsPackage|
-                eachDiff isClassDefinitionChange not and:[
-                    methodsPackage := (eachDiff changeClass compiledMethodAt:eachDiff selector) package.
-                    methodsPackage == containerPackage
-                ]
-            ].
+        onlyHere := onlyHere select:[:eachDiff|  
+                        |method methodsPackage|
+                        eachDiff isClassDefinitionChange not 
+                        and:[
+                            eachDiff changeClass isNil
+                            or:[
+                                method := (eachDiff changeClass compiledMethodAt:eachDiff selector).
+                                method isNil or:[ (methodsPackage := method package) == containerPackage ]]
+                        ]
+                    ].
 
         onlyInRep := diffSet onlyInArg.
 
@@ -2146,7 +2150,7 @@
                  eachChange isMethodChange ifTrue:[
                      cClass := eachChange changeClass.
                      cSel := eachChange selector.
-                     cClass basicRemoveSelector:cSel.
+                     cClass notNil ifTrue:[ cClass basicRemoveSelector:cSel ].
                  ]
             ].
 
@@ -2241,7 +2245,7 @@
     ].
 
     "Modified: / 07-02-2001 / 18:18:32 / ps"
-    "Modified: / 05-12-2011 / 21:29:32 / cg"
+    "Modified: / 10-02-2012 / 17:37:55 / cg"
 !
 
 checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge usingManager:aSourceCodeManager
@@ -4325,13 +4329,14 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SourceCodeManagerUtilities.st 1874 2012-02-02 16:09:32Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.241 2012/02/10 17:41:56 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.240 2012/01/14 19:59:35 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.241 2012/02/10 17:41:56 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: SourceCodeManagerUtilities.st 1874 2012-02-02 16:09:32Z vranyj1 $'
+    ^ '$Id: SourceCodeManagerUtilities.st 1884 2012-02-13 19:20:09Z vranyj1 $'
 ! !
+
--- a/abbrev.stc	Mon Feb 13 18:51:07 2012 +0000
+++ b/abbrev.stc	Mon Feb 13 19:20:09 2012 +0000
@@ -66,3 +66,4 @@
 ProjectChecker ProjectChecker stx:libbasic3 'System-Support-Projects' 0
 MercurialSourceCodeManager MercurialSourceCodeManager stx:libbasic3 'System-SourceCodeManagement' 0
 InvalidChange InvalidChange stx:libbasic3 'System-Changes' 0
+
--- a/bc.mak	Mon Feb 13 18:51:07 2012 +0000
+++ b/bc.mak	Mon Feb 13 19:20:09 2012 +0000
@@ -1,7 +1,7 @@
-# $Header$
+# $Header: /cvs/stx/stx/libbasic3/bc.mak,v 1.104 2012/01/30 18:55:19 vrany Exp $
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-02-06 15:46:27.102.
+# automagically generated from the projectDefinition: stx_libbasic3 at 2012-01-30 18:54:42.879.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -134,3 +134,4 @@
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
+
--- a/libInit.cc	Mon Feb 13 18:51:07 2012 +0000
+++ b/libInit.cc	Mon Feb 13 19:20:09 2012 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header$
+ * $Header: /cvs/stx/stx/libbasic3/libInit.cc,v 1.92 2012/01/30 18:56:12 vrany Exp $
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libbasic3.
@@ -96,3 +96,4 @@
 _stx_137libbasic3_extensions_Init(pass,__pRT__,snd);
 __END_PACKAGE__();
 }
+
--- a/libbasic3.rc	Mon Feb 13 18:51:07 2012 +0000
+++ b/libbasic3.rc	Mon Feb 13 19:20:09 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic3.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1872,1872
+  FILEVERSION     6,2,1867,1867
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Additional Developer Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.1872.1872\0"
+      VALUE "FileVersion", "6.2.1867.1867\0"
       VALUE "InternalName", "stx:libbasic3\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Mon, 06 Feb 2012 15:46:27 GMT\0"
+      VALUE "ProductDate", "Mon, 30 Jan 2012 18:54:42 GMT\0"
     END
 
   END
@@ -35,3 +35,4 @@
     VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
   END
 END
+
--- a/stx_libbasic3.st	Mon Feb 13 18:51:07 2012 +0000
+++ b/stx_libbasic3.st	Mon Feb 13 19:20:09 2012 +0000
@@ -42,7 +42,7 @@
 !
 
 extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/extensions.st,v 1.14 2012/01/18 10:00:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/stx_libbasic3.st,v 1.67 2012/01/30 18:56:18 vrany Exp $'
 ! !
 
 !stx_libbasic3 class methodsFor:'description'!
@@ -230,13 +230,14 @@
 !stx_libbasic3 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: stx_libbasic3.st 1875 2012-02-06 15:47:02Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/stx_libbasic3.st,v 1.67 2012/01/30 18:56:18 vrany Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic3/stx_libbasic3.st,v 1.66 2012/01/26 13:14:57 cg Exp §'
+    ^ 'Header: /cvs/stx/stx/libbasic3/stx_libbasic3.st,v 1.67 2012/01/30 18:56:18 vrany Exp '
 !
 
 version_SVN
-    ^ '$Id: stx_libbasic3.st 1875 2012-02-06 15:47:02Z vranyj1 $'
+    ^ '$Id: stx_libbasic3.st 1884 2012-02-13 19:20:09Z vranyj1 $'
 ! !
+
hg/stx-libbasic3