--- a/.hgtags Tue Jun 04 16:21:20 2013 +0100
+++ b/.hgtags Mon Jun 10 15:36:00 2013 +0100
@@ -1,19 +1,23 @@
-041df7e717bcf33be0e7395c3d27c1556a43e537 expeccoNET_1_8_0_0
+0d1ea2b387778c72b831a513f999a87c7845748c expecco_2_5_0
+0d1ea2b387778c72b831a513f999a87c7845748c stable
175391e950e95ff4b4ee8e5a266932142bcdfa8f rel3_4_3_1
191e0970f4057c201caecd1b577f706087b3599c rel2_10_8_6_last2
-1956dcff8f883126b8d97f5c5ccf8029feaa662b expecco_2_2_0
-1956dcff8f883126b8d97f5c5ccf8029feaa662b expecco_2_2_5
+197192cec3c79b0522e9ed3353edebbf1c15505f expecco_2_1_0
1a6b647d1b431062d1c29c5f29d1351215d8ffe0 rel3_6_4
+1fd8091099ef14226141fb91ac3c4b3ae540fd50 expecco_2_4_0
+1fd8091099ef14226141fb91ac3c4b3ae540fd50 expecco_2_4_1
2728a446d0378631cc65d957dbde4925f2492619 rel4_1_3_1
2cb761062819d9cadd5782b8bfaf1c82d2656afa expeccoNET_1_4_0rc1
2cb761062819d9cadd5782b8bfaf1c82d2656afa expecco_1_7_0rc3
2cb761062819d9cadd5782b8bfaf1c82d2656afa expecco_1_7_0rc5
3078dab499cac148fd66922bcb86068a123ddfeb expecco_1_7_2rc1
-30a7c14267d908eb6a6bb88dfacbd7a7b1762e82 initialR
-347a30ec4e098b60c2cfee02ae6849467e1289f3 expeccoNET_1_7_0_0
+31706d7a4429ca736588ba15eb5f417b37c4d616 stx_6_2_2
4365130e896fd4c2cb711c6952be502f8322abe3 expecco_1_0_3
-522db5b8131543cf84a4ff84ebd01616ad0a18fb expecco_2_1_0
-5cd37b9583067ef5015439e4b22463a158a7fa23 stx_6_2_2
+450f48a124dba8810e2a24cedb761012ca4f8865 expeccoNET_1_7_0_0
+47bec7c32db6aa543dc7f3c87c5480a52a2c902b expeccoNET_1_6_8_0
+5850af7e86ab9454071c469f9311b93f659559b0 expecco_2_2_0
+5850af7e86ab9454071c469f9311b93f659559b0 expecco_2_2_5
+62c8ea518b599f65ea8731f5d9b6ae644e44bba1 expeccoNET_1_6_0_0
66aedd4a8a11214fc43c4a7c50350ad5ec9fbf25 expecco_1_9_1_iX
71dae0da5f448f474fa10638a5684913ab2a42f6 expecco_1_7_0b1
71dae0da5f448f474fa10638a5684913ab2a42f6 expecco_1_7_0b2
@@ -28,10 +32,7 @@
882d87800deaf0bb95f7d7cdefb4622997dd4543 expecco_1_8_2rc1
891d18a71bbf9f1df5d102cd44ee0393d298aa66 rel5_4_6
892db18f8b482d6aaf0f728a4d436ab4965fae64 rel5_2_8
-8e2ea84ce5da97377d52e639b7a5c5009c6183d0 expecco_2_5_0
-8e2ea84ce5da97377d52e639b7a5c5009c6183d0 stable
91cb79a651aac697d484aad12987c5b0d0b57f58 expecco_1_3_4
-9c4eba6eac26ef2049993bd8fa6368f9c0aeacc0 expeccoNET_1_6_0_0
b54eeae38942103e87cdfaf3110a0228c8827258 testTagging
b9e4b4465a2c3cd844ac12cedcab8efc84fde6f3 rel3_4_1_1
b9e4b4465a2c3cd844ac12cedcab8efc84fde6f3 rel3_4_1_2
@@ -45,14 +46,13 @@
c8a7c7f580a85f476ea085979d2dd842e78938d5 expecco_1_7_1rc4
cc7dd729c2a63686729c206a8f1a31f6e21d8aab expeccoNET_1_5_1rc1
cd22e54333338ca2523c75c747377620600753f4 expecco_1_8_0rc1
-cd6dc0f1d994a4d22fb1c7d4532d2757f84d9714 expecco_2_4_0
cdbd6a3ada7b4d839bc9443cdd0d4807b6618492 expecco_1_7_0rc8
de51055f13615567a9dd2d55521d6979074e8f41 rel3-1-2
e749382ae30a3f36c3bf556d60a3bfd43127d059 expecco_1_6_0
e749382ae30a3f36c3bf556d60a3bfd43127d059 expecco_1_6_0rc5
+ecf651f066384225889b4c4aa54b91f2b321e612 expeccoNET_1_8_0_0
f3966132ad652151a5deb3b56a9eabedfd9b3146 rel4_1_7
f3966132ad652151a5deb3b56a9eabedfd9b3146 release
f5a8ddd00d66842de1b66d65cd2ffde97bc31090 rel2_10_8_5
-f5eb4f468ae3052a5d9f6869c66d9387ede01067 expeccoNET_1_6_8_0
f8314a9474cf3bd4d5d84837c82c442f9e6f1e48 stable_expecco_sel
f832f7ec6ccffb81a23a346e4df659417fde1264 expecco_1_5_0
--- a/CVSSourceCodeManager.st Tue Jun 04 16:21:20 2013 +0100
+++ b/CVSSourceCodeManager.st Mon Jun 10 15:36:00 2013 +0100
@@ -16,7 +16,7 @@
classVariableNames:'CVSRoot RemoteCVS CVSModuleRoots CMD_checkout CVSTempDir
DisabledModules CVSCommandSemaphore CVSExecutable
CVSCommitOptions CVSUpdateOptions CVSCommandTimeout
- RecentlyCheckedModulesAndPackages'
+ RecentlyCheckedModulesAndPackages RecentTag'
poolDictionaries:''
category:'System-SourceCodeManagement'
!
@@ -429,6 +429,18 @@
^ CVSModuleRoots values copyWith:CVSRoot
!
+recentTag
+ "a place to remember recently set tags (to share between File and SystemBrowser)"
+
+ ^ RecentTag
+!
+
+recentTag:aString
+ "a place to remember recently set tags (to share between File and SystemBrowser)"
+
+ RecentTag := aString
+!
+
repositoryForPackage:packageId
"superclass AbstractSourceCodeManager class says that I am responsible to implement this method"
@@ -1559,7 +1571,7 @@
"/
"/ synchronize i.e. merge in any changes
"/
- self activityNotification:'merging ' , containerFilename , ' with repository version...'.
+ self activityNotification:'Merging ' , containerFilename , ' with repository version...'.
cmd := 'update ', CVSUpdateOptions, ' ', containerFilename, ' >', '"' , cmdOut name , '"'.
(self
@@ -1872,7 +1884,7 @@
"/
"/ now check it in again
"/
- self activityNotification:'saving ' , containerFilename , ' in repository...'.
+ self activityNotification:'Saving ' , containerFilename , ' in repository...'.
logMsg := logMsg replChar:$" withString:'\"'.
@@ -2068,7 +2080,7 @@
"/
"/ synchronize i.e. merge in any changes
"/
- self activityNotification:'merging ' , cls name , ' with repository version...'.
+ self activityNotification:'Merging ' , cls name , ' with repository version...'.
cmd := 'update %1 %2 >"%3"'
bindWith:CVSUpdateOptions
@@ -2485,7 +2497,7 @@
"/
"/ now check it in again
"/
- self activityNotification:'saving ' , cls name , ' in repository...'.
+ self activityNotification:'Saving ' , cls name , ' in repository...'.
logMsg := logMsg replChar:$" withString:'\"'.
@@ -2567,7 +2579,7 @@
"/
newRevision notNil ifTrue:[
(didMerge or:[conflictResolvedManually]) ifFalse:[
- self activityNotification:'fetch new revision number of ', cls name.
+ self activityNotification:'Fetch new revision number of ', cls name.
changeLog := self revisionLogOf:cls fromRevision:newRevision toRevision:newRevision.
(changeLog isNil or:[(changeLog at:#revisions) size ~~ 1]) ifTrue:[
@@ -2981,7 +2993,7 @@
].
].
- self activityNotification:'checking for existing module ' , moduleDir.
+ self activityNotification:'Checking for existing module ' , moduleDir.
cvsRoot := self getCVSROOTForModule:moduleDir.
cvsRoot isNil ifTrue:[^ false].
@@ -3052,7 +3064,7 @@
].
].
- self activityNotification:'checking for existing package ' , directory.
+ self activityNotification:'Checking for existing package ' , directory.
cvsRoot := self getCVSROOTForModule:moduleDir.
cvsRoot isNil ifTrue:[^ false].
@@ -3130,7 +3142,7 @@
"/ required later.
"/
- self activityNotification:'checking for directory ' , checkoutName.
+ self activityNotification:'Checking for directory ' , checkoutName.
tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
tempdir isNil ifTrue:[
('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
@@ -3168,7 +3180,7 @@
"/
"/ and add it to the repository
"/
- self activityNotification:'adding ' , fileName.
+ self activityNotification:'Adding ' , fileName.
OperatingSystem isUNIXlike ifTrue:[
checkInDir := tempdir constructString:checkoutName.
@@ -3195,7 +3207,7 @@
"/
"/ commit
"/
- self activityNotification:'committing ' , fileName.
+ self activityNotification:'Committing ' , fileName.
OperatingSystem isUNIXlike ifFalse:[
"/ save the log message into another tempFile ...
@@ -3337,7 +3349,7 @@
"/ required later.
"/
- self activityNotification:'checking for directory ' , checkoutName.
+ self activityNotification:'Checking for directory ' , checkoutName.
tempdir := self createLocalDirectory:packageDir inModule:moduleDir.
tempdir isNil ifTrue:[
('CVSSourceCodeManager [error]: cannot checkout ' , checkoutName) errorPrintCR.
@@ -3367,7 +3379,7 @@
"/
"/ and add it to the repository
"/
- self activityNotification:'adding ' , fileName.
+ self activityNotification:'Adding ' , fileName.
OperatingSystem isUNIXlike ifTrue:[
checkInDir := tempdir constructString:checkoutName.
@@ -3393,7 +3405,7 @@
"/
"/ commit
"/
- self activityNotification:'committing ' , fileName.
+ self activityNotification:'Committing ' , fileName.
OperatingSystem isUNIXlike ifFalse:[
"/ save the log message into another tempFile ...
@@ -4395,9 +4407,9 @@
].
headerOnly ifTrue:[
- msg := 'fetching revision info '
+ msg := 'Fetching revision info '
] ifFalse:[
- msg := 'reading revision log '
+ msg := 'Reading revision log '
].
clsOrNil isNil ifTrue:[
msg := msg , 'in ' , fullName.
@@ -4601,9 +4613,9 @@
headerOnly := false.
headerOnly ifTrue:[
- msg := 'fetching revision info '
+ msg := 'Fetching revision info '
] ifFalse:[
- msg := 'reading revision log '
+ msg := 'Reading revision log '
].
msg := msg , 'in package ' , modulePath.
self activityNotification:msg,'...'.
@@ -5027,6 +5039,7 @@
log:true
outputTo:outStream
errorTo:errorStream.
+ self activityNotification:nil.
(result not or:[errorStream size ~~ 0]) ifTrue:[
SourceCodeManagerError raiseRequestWith:errorStream contents errorString:' cvs tag failed: ', pathesInModuleAsArgument.
] ifFalse:[
@@ -5178,11 +5191,11 @@
!CVSSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.460 2013-05-29 14:58:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.463 2013-06-06 20:23:29 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.460 2013-05-29 14:58:33 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.463 2013-06-06 20:23:29 cg Exp $'
!
version_HG
--- a/MessageTracer.st Tue Jun 04 16:21:20 2013 +0100
+++ b/MessageTracer.st Mon Jun 10 15:36:00 2013 +0100
@@ -2314,9 +2314,9 @@
Use untrap:/untrace: to remove this trace.
The current implementation does not allow integers or nil to be traced."
- |methodName|
-
aCollectionOfSelectors do:[:aSelector |
+ |methodName|
+
methodName := anObject class name , '>>' , aSelector.
self
wrap:anObject
@@ -3367,7 +3367,7 @@
!MessageTracer class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.122 2013-06-03 10:43:50 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.123 2013-06-04 13:23:03 cg Exp $'
!
version_HG
--- a/SourceCodeManagerUtilities.st Tue Jun 04 16:21:20 2013 +0100
+++ b/SourceCodeManagerUtilities.st Mon Jun 10 15:36:00 2013 +0100
@@ -1439,12 +1439,12 @@
and:[change changeClass isMeta]])].
"/ compare all but the version methods
- listHere := listHere select:[:change | (change isMethodChange
+ listHere := listHere reject:[:change | (change isMethodChange
and:[(AbstractSourceCodeManager isVersionMethodSelector:change selector)
- and:[change changeClass isMeta]]) not].
- listRep := listRep select:[:change | (change isMethodChange
+ and:[change changeClass isMeta]])].
+ listRep := listRep reject:[:change | (change isMethodChange
and:[(AbstractSourceCodeManager isVersionMethodSelector:change selector)
- and:[change changeClass isMeta]]) not].
+ and:[change changeClass isMeta]])].
diffSet := listHere diffSetsAgainst:listRep.
changed := diffSet changed.
@@ -1687,8 +1687,7 @@
"check-out a class from the source repository.
If askForRevision is false, check-out the newest version."
- |inChangeSet extensionMethods
- rev msg
+ |inChangeSet extensionMethods msg
listHere listRep diffSet
changed onlyHere onlyInRep answer labels values singleChangeSelector
changedClasses default |
@@ -3140,7 +3139,7 @@
knownContainers := allPackageIDs collect:[:package | (package upTo:$:)] as:Set.
knownContainers := knownContainers asOrderedCollection.
- knownContainers := knownContainers select:[:module | module isBlank not].
+ knownContainers := knownContainers reject:[:module | module isBlank].
knownContainers sort.
packageUpdater := [
@@ -3157,7 +3156,7 @@
(package copyFrom:idx + 1)].
knownPackages := knownPackages asSet asOrderedCollection.
- knownPackages := knownPackages select:[:package | package isBlank not].
+ knownPackages := knownPackages reject:[:package | package isBlank].
knownPackages sort.
packageBoxComponent list:knownPackages.
].
@@ -3729,7 +3728,7 @@
select:[:aChange | aChange className = aClass theNonMetaclass name
or:[aChange className = aClass theMetaclass name] ].
- definitionChangesForThisClass := changesForThisClass select:[:aChange | aChange isMethodChange not].
+ definitionChangesForThisClass := changesForThisClass reject:[:aChange | aChange isMethodChange].
categoryChanges := changesForThisClass select:[:aChange | aChange isMethodCategoryChange].
categoryChangeSelectors := categoryChanges collect:[:aChange | aChange changeSelector] as:Set.
allMethodChangesForThisClass := changesForThisClass select:[:aChange | aChange isMethodCodeChange].
@@ -3879,11 +3878,11 @@
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.278 2013-06-03 10:44:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.282 2013-06-05 13:22:03 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.278 2013-06-03 10:44:15 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.282 2013-06-05 13:22:03 stefan Exp $'
!
version_HG
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st Tue Jun 04 16:21:20 2013 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st Mon Jun 10 15:36:00 2013 +0100
@@ -34,7 +34,6 @@
"
! !
-
!SourceCodeManagerUtilitiesForContainerBasedManagers methodsFor:'utilities-cvs'!
checkinBuildSupportFilesForPackage:packageID
@@ -262,9 +261,12 @@
self tagClass:aClass as:#stable.
].
checkinInfo tagIt ifTrue:[
- "set an additional tag for class that has been checked in"
- self tagClass:aClass as:(checkinInfo tag).
+ "set any additional tags for the class that has been checked in"
+ (checkinInfo tag asCollectionOfSubstringsSeparatedByAny:',;') do:[:eachTag |
+ self tagClass:aClass as:eachTag withoutSeparators.
+ ].
].
+ CVSSourceCodeManager recentTag:checkinInfo tag.
].
].
aborted ifTrue:[
@@ -388,7 +390,7 @@
ifTrue:[
"/mhmh - but tag should be set on all (even unchanged ones)
"/ the other onces have already been tagged
- unchangedClasses := allClasses select:[:eachClass | (classes includes:eachClass) not].
+ unchangedClasses := allClasses reject:[:eachClass | (classes includes:eachClass)].
"mhmh - could still have to tag them"
checkinInfoOrString isStable ifTrue:[
@@ -760,15 +762,14 @@
"Modified: / 04-09-2012 / 14:05:36 / cg"
! !
-
!SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.11 2013-05-07 16:45:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.15 2013-06-09 14:31:45 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.11 2013-05-07 16:45:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.15 2013-06-09 14:31:45 cg Exp $'
!
version_HG
--- a/WrappedMethod.st Tue Jun 04 16:21:20 2013 +0100
+++ b/WrappedMethod.st Mon Jun 10 15:36:00 2013 +0100
@@ -50,11 +50,10 @@
"
! !
-
!WrappedMethod class methodsFor:'others'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.33 2012-10-22 08:13:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.34 2013-06-09 13:32:56 cg Exp $'
!
version_HG
@@ -62,7 +61,6 @@
^ '$Changeset: <not expanded> $'
! !
-
!WrappedMethod class methodsFor:'registration'!
allInstancesDo:aBlock
@@ -90,7 +88,6 @@
"Created: / 01-07-2011 / 10:03:55 / cg"
! !
-
!WrappedMethod methodsFor:'accessing'!
annotations
@@ -232,7 +229,6 @@
^ self originalMethod source
! !
-
!WrappedMethod methodsFor:'misc'!
makeLocalStringSource
@@ -254,7 +250,6 @@
"Created: / 01-07-2011 / 10:03:32 / cg"
! !
-
!WrappedMethod methodsFor:'private'!
annotationAtIndex: index
@@ -278,7 +273,6 @@
"Created: / 16-12-2011 / 19:53:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!WrappedMethod methodsFor:'queries'!
argSignature
@@ -287,6 +281,12 @@
"Created: / 27.1.1999 / 20:23:17 / cg"
!
+hasAnnotation
+ "Return true iff the method has any annotation"
+
+ ^ self originalMethod hasAnnotation
+!
+
hasResource
"return the wrapped methods hasResource"
@@ -345,6 +345,10 @@
^ self originalMethod messagesSentToSuper
!
+refersToLiteral: anObject
+ ^ self originalMethod refersToLiteral: anObject
+!
+
resources
"return the wrapped methods resources"
@@ -363,7 +367,6 @@
"Created: / 27.1.1999 / 20:52:25 / cg"
! !
-
!WrappedMethod class methodsFor:'documentation'!
version
@@ -371,6 +374,6 @@
!
version_SVN
- ^ '§Id: WrappedMethod.st 1909 2012-03-31 00:14:49Z vranyj1 §'
+ ^ '$Id: WrappedMethod.st,v 1.34 2013-06-09 13:32:56 cg Exp $'
! !