Merge pull request #1054 from jecisc/1036-Debugger-if-we-try-to-merge…

…-without-selecting-a-branch

1036-Debugger-if-we-try-to-merge-without-selecting-a-branch

Iceberg-TipUI.package/IceTipBranchModel.class/instance/printOn..st

@@ -0,0 +1,7 @@
+printing
+printOn: aStream
+	super printOn: aStream.
+	aStream
+		nextPut: $[;
+		nextPutAll: self name;
+		nextPut: $]

Iceberg-TipUI.package/IceTipCachedModel.class/instance/printOn..st

@@ -0,0 +1,6 @@
+printing
+printOn: aStream
+	super printOn: aStream.
+	aStream nextPut: $(.
+	self realObject printOn: aStream.
+	aStream nextPut: $)

Iceberg-TipUI.package/IceTipExistingBranchPanel.class/instance/initializeBranchesList.st

@@ -1,7 +1,15 @@
 initialization
 initializeBranchesList
+	| dataSource |
 	branchesList widget
 		addColumn: (IceTipTableColumn newAction: #shortDescriptionWithDecoration);
-		dataSource: self newBranchListDataSource;
+		dataSource: (dataSource := self newBranchListDataSource);
 		bindKeyCombination: Character cr toAction: [ self accept ];
-		onAnnouncement: FTStrongSelectionChanged do: [ self accept ]
+		onAnnouncement: FTStrongSelectionChanged do: [ self accept ].
+
+	"
+	We would prefere to have this implementation but for now we have a bug with the caches because #branchModels return the same cache used by the datasource but not #defaultBranchSelection. If we correct that later we can clean the code bellow.
+	
+	self model defaultBranchSelection ifNotNil: [ :branchModel | branchesList widget selectRowIndex: (dataSource elements indexOf: branchModel) ]."
+
+	self model branchModels detect: #isHead ifFound: [ :head | branchesList widget selectRowIndex: (dataSource elements indexOf: head) ] ifNone: [ self model hasBranches ifTrue: [ branchesList widget selectFirstVisibleRow ] ]

Iceberg-TipUI.package/IceTipExistingBranchPanel.class/instance/validate.st

@@ -1,5 +1,3 @@
 accessing
 validate
-	self 
-		assert: self selectedBranch isNotNil 
-		description: 'Please select a branch to checkout.'
+	self selectedBranch ifNil: [ IceError signal: 'Please select a branch to checkout.' ]

Iceberg-TipUI.package/IceTipMergeBranchPanel.class/instance/doAccept.st

@@ -1,6 +1,7 @@
 actions
 doAccept
-
+	self validate.
+
 	IceTipStandardAction new 
 		repository: self model entity; 
 		message: ('Verifying merge from {1}' format: { self selectedBranch name });

Iceberg-TipUI.package/IceTipRemoteModel.class/instance/branches.st

@@ -0,0 +1,3 @@
+accessing
+branches
+	^ self entity branches

Iceberg-TipUI.package/IceTipRemoteModel.class/properties.json

@@ -1,11 +1,13 @@
 {
+	"classtraitcomposition" : "TWithBranchModel classTrait",
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "IceTipRemoteModel",
 	"commentStamp" : "EstebanLorenzano 5/30/2018 14:33",
 	"super" : "IceTipEntityModel",
-	"category" : "Iceberg-TipUI-Model",
+	"traitcomposition" : "TWithBranchModel",
+	"type" : "normal",
 	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
-	"name" : "IceTipRemoteModel",
-	"type" : "normal"
+	"category" : "Iceberg-TipUI-Model"
 }

Iceberg-TipUI.package/IceTipRepositoryModel.class/instance/branches.st

@@ -0,0 +1,3 @@
+accessing
+branches
+	^ self entity localBranches

Iceberg-TipUI.package/IceTipRepositoryModel.class/properties.json

@@ -1,11 +1,11 @@
 {
-	"classtraitcomposition" : "TIceCopyCommitId classTrait",
+	"classtraitcomposition" : "TIceCopyCommitId classTrait + TWithBranchModel classTrait",
 	"classvars" : [ ],
 	"instvars" : [ ],
 	"name" : "IceTipRepositoryModel",
 	"commentStamp" : "EstebanLorenzano 5/30/2018 14:33",
 	"super" : "IceTipEntityModel",
-	"traitcomposition" : "TIceCopyCommitId",
+	"traitcomposition" : "TIceCopyCommitId + TWithBranchModel",
 	"type" : "normal",
 	"classinstvars" : [ ],
 	"pools" : [ ],

Iceberg-TipUI.package/TWithBranchModel.trait/instance/branchModels.st

@@ -0,0 +1,3 @@
+branches
+branchModels
+	^ self branches collect: [ :each | (IceTipBranchModel repositoryModel: self repositoryModel on: each) beCached ]

Iceberg-TipUI.package/TWithBranchModel.trait/instance/branches.st

@@ -0,0 +1,3 @@
+branches
+branches
+	^ self explicitRequirement

Iceberg-TipUI.package/TWithBranchModel.trait/instance/defaultBranchSelection.st

@@ -0,0 +1,6 @@
+accessing
+defaultBranchSelection
+	^ self branchModels
+		detect: #isHead
+		ifNone: [ self hasBranches
+				ifTrue: [ self branchModels ifNotEmpty: #anyOne ] ]

Iceberg-TipUI.package/TWithBranchModel.trait/instance/hasBranches.st

@@ -0,0 +1,3 @@
+testing
+hasBranches 
+	^ self branches isNotEmpty

Iceberg-TipUI.package/TWithBranchModel.trait/instance/repositoryModel.st

@@ -0,0 +1,3 @@
+accessing
+repositoryModel 
+	^ self explicitRequirement

Iceberg-TipUI.package/TWithBranchModel.trait/properties.json

@@ -0,0 +1,7 @@
+{
+	"commentStamp" : "",
+	"classinstvars" : [ ],
+	"category" : "Iceberg-TipUI-Model",
+	"instvars" : [ ],
+	"name" : "TWithBranchModel"
+}

Iceberg.package/IceRemote.class/instance/hasBranches.st

@@ -0,0 +1,3 @@
+testing
+hasBranches
+	^ self branches isNotEmpty