--- a/Tools__CheckinInfoDialog.st Tue Dec 05 20:34:12 2017 +0100
+++ b/Tools__CheckinInfoDialog.st Wed Dec 06 03:33:54 2017 +0100
@@ -19,7 +19,7 @@
warningMessageHolder logHistory logHistoryHeadLineSelectionHolder
validateConsistencyHolder validateConsistencyVisibleHolder
checkinReasonHolder validateConsistencyEnabledHolder
- quickCheckInEnabledHolder description2Holder'
+ quickCheckInEnabledHolder repositoryInfoHolder branchInfoHolder'
classVariableNames:'RecentlyUsedTags LastReason'
poolDictionaries:''
category:'System-SourceCodeManagement'
@@ -188,7 +188,7 @@
^
#(FullSpec
name: windowSpec
- uuid: '76e4d760-d9ef-11e7-a8cd-c42c033b4871'
+ uuid: '2d2af946-da09-11e7-a8cd-c42c033b4871'
window:
(WindowSpec
label: 'Enter Log Message'
@@ -231,13 +231,22 @@
)
)
(LabelSpec
- label: 'Enter checkIn log-message for:'
- name: 'Label7'
- layout: (LayoutFrame 0 0 31 0 0 1 57 0)
- style: (FontDescription helvetica medium roman 12 #'iso10646-1')
+ name: 'BranchInfoLabel'
+ layout: (LayoutFrame 0 0 31 0 200 0 57 0)
+ style: (FontDescription helvetica medium roman 12 #'iso10646-1' nil nil)
uuid: '35293166-d93d-11e7-8a1e-c42c033b4871'
translateLabel: true
- labelChannel: description2Holder
+ labelChannel: branchInfoHolder
+ resizeForLabel: true
+ adjust: left
+ )
+ (LabelSpec
+ name: 'RepositoryInfoLabel'
+ layout: (LayoutFrame 200 0 31 0 0 1 57 0)
+ style: (FontDescription helvetica medium roman 12 #'iso10646-1' nil nil)
+ uuid: '35293166-d93d-11e7-8a1e-c42c033b4871'
+ translateLabel: true
+ labelChannel: repositoryInfoHolder
resizeForLabel: true
adjust: right
)
@@ -544,14 +553,19 @@
warnMessage := nil.
[
- |lines infoString1|
+ |lines infoString1 repositoryInfo branchInfo|
dialog := self new.
infoString1 := infoString.
lines := infoString asStringCollection.
lines size > 1 ifTrue:[
- dialog description2:lines second string.
+ repositoryInfo := lines second string.
+ dialog repositoryInfo:repositoryInfo.
+ lines size > 2 ifTrue:[
+ branchInfo := lines third string.
+ dialog branchInfo:branchInfo.
+ ].
infoString1 := lines first.
].
@@ -586,7 +600,7 @@
"
"Created: / 12-03-2012 / 12:36:26 / cg"
- "Modified: / 04-12-2017 / 23:18:31 / cg"
+ "Modified: / 05-12-2017 / 23:07:06 / cg"
! !
!CheckinInfoDialog methodsFor:'accessing'!
@@ -603,6 +617,12 @@
"Created: / 06-07-2010 / 11:23:31 / cg"
!
+branchInfo:aString
+ self branchInfoHolder value:aString
+
+ "Created: / 05-12-2017 / 23:08:09 / cg"
+!
+
checkinReason
"returns one of: #(reasonBugfix reasonFeature reasonRefactoring reasonDocumentation reasonOther)"
@@ -620,12 +640,6 @@
^ self descriptionHolder value
!
-description2:aString
- self description2Holder value:aString
-
- "Created: / 04-12-2017 / 22:51:29 / cg"
-!
-
description:aString
self descriptionHolder value:aString allBold
!
@@ -658,6 +672,12 @@
self quickCheckInHolder value:aBoolean
!
+repositoryInfo:aString
+ self repositoryInfoHolder value:aString
+
+ "Created: / 05-12-2017 / 23:08:05 / cg"
+!
+
tag
^ (self tagHolder value ? '') withoutSeparators
!
@@ -690,6 +710,15 @@
!CheckinInfoDialog methodsFor:'aspects'!
+branchInfoHolder
+ branchInfoHolder isNil ifTrue:[
+ branchInfoHolder := ValueHolder new.
+ ].
+ ^ branchInfoHolder
+
+ "Created: / 05-12-2017 / 23:07:40 / cg"
+!
+
checkinReasonHolder
checkinReasonHolder isNil ifTrue:[
checkinReasonHolder := (LastReason ? self class reasonBugfix) asValue.
@@ -697,15 +726,6 @@
^ checkinReasonHolder
!
-description2Holder
- description2Holder isNil ifTrue:[
- description2Holder := ValueHolder new.
- ].
- ^ description2Holder
-
- "Created: / 04-12-2017 / 22:51:14 / cg"
-!
-
descriptionHolder
descriptionHolder isNil ifTrue:[
descriptionHolder := ValueHolder new.
@@ -783,6 +803,15 @@
^ [ CVSSourceCodeManager recentTags ]
!
+repositoryInfoHolder
+ repositoryInfoHolder isNil ifTrue:[
+ repositoryInfoHolder := ValueHolder new.
+ ].
+ ^ repositoryInfoHolder
+
+ "Created: / 05-12-2017 / 23:07:34 / cg"
+!
+
tagHolder
tagHolder isNil ifTrue:[
tagHolder := ("CVSSourceCodeManager recentTag ?" '') asValue.