--- a/.hgtags Mon Apr 13 06:41:26 2015 +0200
+++ b/.hgtags Fri Apr 17 06:46:55 2015 +0200
@@ -2,7 +2,6 @@
010ac94518b347db8dcc0f986d7e0f31cb6369b7 expecco_1_8_2rc1
024c8dc9525e9c6a210ac7cffdda65660112102b expecco_2_7_0
024c8dc9525e9c6a210ac7cffdda65660112102b expecco_2_7_0_49
-024c8dc9525e9c6a210ac7cffdda65660112102b expecco_2_7_5
0345171682c483a27083e267891c5c409672b786 expecco_1_0_3
0b1ad2518a5cd2c8273fb463e370af9d6abfbd97 expecco_2_1_0
0b715d777c488bf60cadb45e1336e6191b713369 rel2_10_8_6_last2
@@ -29,6 +28,7 @@
497ca003a6dcac0b4117fcc8497c11b52bc0aef0 expecco_2_6_0rc1
596696438e67fee735ba71f62177ccc091b9a0bb expecco_1_7_2rc1
5aa270837e0ab5e0fa19d2c02d46c864cc41c859 expeccoNET_1_5_1rc1
+5c469b9c566c86e39278a3c810840bd037cefb62 expecco_2_7_5
62451ecb3d3bbf1f6067c931eda2cdb57aa67ead expeccoNET_1_7_0_0
6ae442626f2090b5275b777f1a9d09ef0e092628 rel3_4_1_2
6ea7ea821b44f30ae3737d4703af910788f4c854 rel3-1-2
--- a/Tools__NewSystemBrowser.st Mon Apr 13 06:41:26 2015 +0200
+++ b/Tools__NewSystemBrowser.st Fri Apr 17 06:46:55 2015 +0200
@@ -34169,7 +34169,16 @@
!
askForTagForClasses:classesToFetchExistingTagsFrom
- |classes tag knownTags allOwners|
+ ^ (self askForTagForClasses:classesToFetchExistingTagsFrom askForRevision:false) key.
+!
+
+askForTagForClasses:classesToFetchExistingTagsFrom askForRevision:askForRevisionBool
+ "open a dialog and ask for a tag name.
+ Fetch existing tag names from classesToFetchExistingTagsFrom.
+ If asskForRevisonBool is true, ask also for a revision number or tag.
+ Answer an association tag -> revision."
+
+ |classes tag knownTags allOwners tagValue revisionValue|
classes := classesToFetchExistingTagsFrom.
@@ -34206,14 +34215,32 @@
].
knownTags addFirst:'stable'.
- tag := Dialog
- request:(resources string:'Tag (possibly multiple, separated by ";"):')
- initialAnswer:(CVSSourceCodeManager recentTag)
- list:knownTags.
- tag isEmptyOrNil ifTrue:[^ nil ].
+ askForRevisionBool ifTrue:[
+ tagValue := CVSSourceCodeManager recentTag asValue.
+ revisionValue := '' asValue.
+ (Dialog new
+ addTextLabel:(resources string:'Tag (possibly multiple, separated by ";"):');
+ addComboBoxOn:tagValue list:knownTags tabable:true;
+ addVerticalSpace;
+ addTextLabel:(resources string:'Revision number or symbolic name to tag (empty if HEAD):');
+ addInputFieldOn:revisionValue;
+ addAbortButton;
+ addOkButton;
+ open
+ ) accepted ifFalse:[
+ ^ nil -> nil.
+ ].
+ tag := tagValue value.
+ ] ifFalse:[
+ tag := Dialog
+ request:(resources string:'Tag (possibly multiple, separated by ";"):')
+ initialAnswer:(CVSSourceCodeManager recentTag)
+ list:knownTags.
+ ].
+ tag isEmptyOrNil ifTrue:[^ nil -> nil ].
CVSSourceCodeManager recentTag:tag.
- ^ tag
+ ^ tag -> revisionValue value
"Created: / 29-07-2013 / 00:56:30 / cg"
!
@@ -35738,22 +35765,25 @@
!
classMenuSetTag
- |classes tag tags|
+ |classes tag tags tagAndRevision revision|
classes := self selectedNonMetaclasses.
SourceCodeManagerError handle:[:ex |
Dialog warn:(resources
stringWithCRs:'Could not fetch tag information.\\Please check your sourcecode manager settings.\(and possibly the network for reachability of the repository)').
] do:[
- tag := self askForTagForClasses:classes.
- ].
+ tagAndRevision := self askForTagForClasses:classes askForRevision:(classes size = 1).
+ ].
+ tag := tagAndRevision key.
tag isEmptyOrNil ifTrue:[^ self ].
+ revision := tagAndRevision value.
+
CVSSourceCodeManager recentTag:tag.
self withWaitCursorDo:[
tags := tag asCollectionOfSubstringsSeparatedByAny:',;'.
tags do:[:eachTag |
- SourceCodeManagerUtilities default tagClasses:classes as:(eachTag withoutSeparators).
+ SourceCodeManagerUtilities default tagClasses:classes as:(eachTag withoutSeparators) revision:revision.
].
]
@@ -57909,7 +57939,6 @@
"Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!NewSystemBrowser methodsFor:'private-semantic checks'!
checkAcceptedMethod:aMethod inClass:aClass
@@ -62385,11 +62414,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2214 2015-04-01 08:47:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2215 2015-04-16 09:36:29 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2214 2015-04-01 08:47:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2215 2015-04-16 09:36:29 stefan Exp $'
!
version_HG
@@ -62398,7 +62427,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st,v 1.2214 2015-04-01 08:47:53 cg Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st,v 1.2215 2015-04-16 09:36:29 stefan Exp $'
! !