--- a/Tools__NewSystemBrowser.st Sat Dec 16 13:00:07 2017 +0100
+++ b/Tools__NewSystemBrowser.st Mon Dec 18 10:23:26 2017 +0100
@@ -44740,7 +44740,7 @@
First, set a baseTag (<branchName>_0) on the current (as yet not checked in original files);
then, check the modified classes onto that branch (giving it <branchName>_1 as tag);
then, set the branchName as tag for those (this tag will be shifted along the branch)"
-
+
|knownTags defClasses branchName branchTag baseTag allClasses pathInfos anyError missingClasses missingFiles|
defClasses := Set new.
@@ -44759,14 +44759,14 @@
self withWaitCursorDo:[
knownTags := self allKnownTagsInClasses:defClasses.
].
-
+
[
|tagAlreadyUsed answer|
-
+
"/ let user select an existing tag or choose a new one
branchName := Dialog request:'Name of Branch (must be a new symbolic name):'.
branchName isEmptyOrNil ifTrue:[^ self].
-
+
(tagAlreadyUsed := (knownTags includes:(AbstractSourceCodeManager branchTagPrefix,branchName))) ifTrue:[
answer := Dialog confirmWithCancel:'This branch name is already known.\Proceed to check if new files need to be added to the branch...' withCRs.
answer isNil ifTrue:[^ self].
@@ -44775,7 +44775,7 @@
tagAlreadyUsed
] whileTrue.
- "/ pathes for build-support files
+ "/ paths for build-support files
pathInfos := OrderedCollection new.
defClasses do:[:defClass |
|packageId directory module|
@@ -44788,7 +44788,7 @@
directory .
module .
fileName
- }
+ }
].
].
@@ -44796,15 +44796,15 @@
branchTag := branchName.
(branchTag startsWith:(AbstractSourceCodeManager branchTagPrefix)) ifFalse:[
branchTag := AbstractSourceCodeManager branchTagPrefix,branchTag.
- ].
+ ].
baseTag := branchTag,'_0'.
- "/ we don't really care, if the branch already exists;
+ "/ we don't really care, if the branch already exists;
anyError := false.
SourceCodeManagerError handle:[:ex |
anyError := true.
ex proceed.
- ] do:[
+ ] do:[
aManager createBranch:branchName forClasses:allClasses.
aManager createBranch:branchName pathes:(pathInfos collect:[:each | each at:1]).
].
@@ -44814,11 +44814,11 @@
missingClasses := OrderedCollection new.
missingFiles := OrderedCollection new.
anyError := false.
-
+
SourceCodeManagerError handle:[:ex |
anyError := true.
ex proceed.
- ] do:[
+ ] do:[
allClasses do:[:eachClass |
|knownBranchTags|
@@ -44828,8 +44828,8 @@
knownBranchTags := aManager knownBranchTagsAndRevisionsFor:eachClass.
((knownBranchTags includesKey:baseTag) and:[ knownBranchTags includesKey:branchTag ]) ifFalse:[
missingClasses add:eachClass name
- ].
- ].
+ ].
+ ].
].
pathInfos do:[:eachPathInfo |
|knownBranchTags container directory module|
@@ -44843,22 +44843,22 @@
knownBranchTags := aManager knownBranchTagsAndRevisionsForContainer:container directory:directory module:module.
((knownBranchTags includesKey:baseTag) and:[ knownBranchTags includesKey:branchTag ]) ifFalse:[
missingFiles add:container
- ].
- ].
- ].
- ].
-
+ ].
+ ].
+ ].
+ ].
+
missingClasses notEmpty ifTrue:[
Transcript show:'could not create tag on: '; showCR:missingClasses.
Dialog warn:('Could not create a branch for %1 classes' bindWith:missingClasses size).
^ self.
- ].
+ ].
missingFiles notEmpty ifTrue:[
Transcript show:'could not create tag on: '; showCR:missingFiles.
Dialog warn:('Could not create a branch for %1 support files' bindWith:missingFiles size).
^ self.
- ].
- ] ifFalse:[
+ ].
+ ] ifFalse:[
"/ we set a base tag (branchName_0) on the current version (before checking in)
self projectMenuSetTagOfBuildSupportFiles:baseTag usingManager:aManager.
self projectMenuSetTag:baseTag usingManager:aManager.
@@ -44869,6 +44869,7 @@
"Created: / 04-12-2017 / 17:49:16 / cg"
"Modified: / 05-12-2017 / 23:35:58 / cg"
+ "Modified (comment): / 18-12-2017 / 10:21:32 / mawalch"
!
projectMenuStartBranchUsingManagerNamed:sourceCodeManagerClassName