Fix #850

- Make text in warning color (set by theme) if head is tagged
pharo-vcs · Jun 18, 2018 · 6c363f7 · 6c363f7
1 parent a258289
commit 6c363f7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/Iceberg-TipUI.package/IceTipEntityModel.class/instance/colorWarning.st b/Iceberg-TipUI.package/IceTipEntityModel.class/instance/colorWarning.st
@@ -0,0 +1,3 @@
+TOMOVE
+colorWarning
+	^ Smalltalk ui theme warningTextColor
diff --git a/Iceberg-TipUI.package/IceTipEntityModel.class/instance/toWarningMessage..st b/Iceberg-TipUI.package/IceTipEntityModel.class/instance/toWarningMessage..st
@@ -0,0 +1,3 @@
+TOMOVE
+toWarningMessage: aString
+	^ aString asText allBold makeAllColor: self colorWarning
diff --git a/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/status.st b/Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/status.st
@@ -8,7 +8,9 @@ status
 		entity workingCopy workingCopyState isUnknownCommitState 
 			ifTrue: [ ^ self toErrorMessage: entity workingCopy workingCopyState description ].	
 		entity workingCopy isDetached 
-			ifTrue: [ ^ self toErrorMessage: 'Detached Working Copy' ].
+			ifTrue: [  ^ self toErrorMessage: 'Detached Working Copy' ].
+		(entity head isDetached and: [ entity head tags notEmpty ])
+			ifTrue: [ ^ self toWarningMessage: 'Detached HEAD' ].
 		entity head isDetached 
 			ifTrue: [ ^ self toErrorMessage: 'Detached HEAD' ].
 

diff --git a/Iceberg.package/IceCommitish.class/instance/isTag.st b/Iceberg.package/IceCommitish.class/instance/isTag.st
@@ -0,0 +1,4 @@
+testing
+isTag
+
+	^ false
diff --git a/Iceberg.package/IceTag.class/instance/isTag.st b/Iceberg.package/IceTag.class/instance/isTag.st
@@ -0,0 +1,4 @@
+testing
+isTag
+
+	^ true
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    testing
+    isTag
+    	^ false