Merging with c03e07e

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/cloneRepositoryFrom.branch..st

@@ -7,10 +7,12 @@ cloneRepositoryFrom: aRemote branch: aBranchName
 		| repo cloneOptions |
 		repo := LGitRepository on: self location.
 		cloneOptions := LGitCloneOptions withCredentialsProvider: IceCredentialsProvider default.
-
+		cloneOptions checkoutOptions checkoutStrategy: LGitCheckoutStrategyEnum git_checkout_none.
 		repo clone: url options: cloneOptions.
-		aBranchName ifNotNil: [ 
-			repo checkout: aBranchName ].
+		repo checkout: (aBranchName ifNil: [ 
+			self branch
+				ifNotNil: [ :b | b name ]
+				ifNil: [ 'master' ] ]).
 
 		(LGitRemote of: repo named: 'origin')
 			lookup;

Iceberg-UI.package/IceCachedValue.class/instance/invalidateOn.from..st

@@ -1,3 +1,3 @@
 initialization
 invalidateOn: announcementType from: announcer
-	announcer subscribe: announcementType send: #reset to: self
+	announcer when: announcementType send: #reset to: self

Iceberg-UI.package/IceCloneRepositoryModel.class/instance/configureRepository..st

@@ -0,0 +1,3 @@
+private
+configureRepository: aRepository
+	aRepository register	

Iceberg-UI.package/IceCloneRepositoryModel.class/instance/createRepository.st

@@ -8,7 +8,7 @@ createRepository
 			location: self location;
 			subdirectory: subdirectory text;
 			createRepository.
-		repository register.
+		self configureRepository: repository.
 
 		self window delete. 
 	]

Iceberg-UI.package/IceCreateRepositoryModel.class/instance/guessSubDirectory.st

@@ -0,0 +1,10 @@
+actions
+guessSubDirectory
+	"If a '.filetree' file, there is a high chance that this is a smalltalk code directory. In that case, the directory containing it is probably the subdirectory of the repository."
+
+	| location |
+	location := localDirectoryLocation location.
+	location files
+		detect: [ :file | file basename = '.filetree' ]
+		ifFound: [ :dir | subdirectory text: '' ]
+		ifNone: [ location directories do: [ :directory | directory files detect: [ :file | file basename = '.filetree' ] ifFound: [ :file | subdirectory text: directory basename ] ] ]

Iceberg-UI.package/IceCreateRepositoryModel.class/instance/initializeWidgets.st

@@ -2,6 +2,7 @@ initialization
 initializeWidgets
 	localDirectoryLocation := self instantiate: IceDirectoryModel.
 	localDirectoryLocation 
+		onChoose: [ self guessSubDirectory ];
 		label: 'Local directory';
 		chooseTitle: 'Choose local repository';
 		location: self defaultLocation.

Iceberg-UI.package/IceDiffChangeTreeBuilder.class/instance/buildOn..st

@@ -14,7 +14,7 @@ buildOn: aPresenter
 		onChangeOfPort: #entity act: [ :presentation | 
 			self diff ifNotNil: [  
 				self diff announcer 
-					subscribe: IceChangeSetChanged 
+					when: IceChangeSetChanged 
 					send: #execute:
 					to: (IceChangesTreeResetSelectionHelper for: presentation) ] ];
 		yourself

Iceberg-UI.package/IceDiffCherryPickChangeTreeBuilder.class/instance/buildOn..st

@@ -16,7 +16,7 @@ buildOn: aPresenter
 		onChangeOfPort: #entity act: [ :presentation | 
 			self diff ifNotNil: [
 				self diff announcer 
-					subscribe: IceChangeSetChanged
+					when: IceChangeSetChanged
 					send: #execute:
 					to: (IceChangesTreeResetSelectionHelper for: presentation) ] ];
 		yourself

Iceberg-UI.package/IceLocationModel.class/instance/choose.st

@@ -2,4 +2,5 @@ actions
 choose
 	self chooseReference ifNotNil: [ :reference | 
 		self location: reference.
-		self locationInput text: reference pathString ]
+		self locationInput text: reference pathString.
+		self onChoose ifNotNil: #value ]

Iceberg-UI.package/IceLocationModel.class/instance/onChoose..st

@@ -0,0 +1,5 @@
+hook
+onChoose: aBlockClosure
+	"I allow to set a hook to execute when the user select a location."
+
+	chooseBlock := aBlockClosure

Iceberg-UI.package/IceLocationModel.class/instance/onChoose.st

@@ -0,0 +1,3 @@
+hook
+onChoose
+	^ chooseBlock

Iceberg-UI.package/IceLocationModel.class/properties.json

@@ -10,7 +10,8 @@
 		"locationInput",
 		"chooseButton",
 		"label",
-		"chooseTitle"
+		"chooseTitle",
+		"chooseBlock"
 	],
 	"name" : "IceLocationModel",
 	"type" : "normal"

Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositories.in..st

@@ -17,7 +17,7 @@ composeRepositories: repositories in: composite
 	table updateOn: MCPackageModified from: MCPackageManager announcer.
 
 	Iceberg announcer weak 
-		subscribe: IceRepositoryCreated 
+		when: IceRepositoryCreated 
 		send: #execute:
 		to: (IceRepositoryUpdateHelper for: table).
 

Iceberg-UI.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st

@@ -17,7 +17,7 @@ composeRepositoriesIn: composite
 	table updateOn: MCPackageModified from: MCPackageManager announcer.
 
 	Iceberg announcer weak 
-		subscribe: IceRepositoryCreated 
+		when: IceRepositoryCreated 
 		send: #execute:
 		to: (IceRepositoryUpdateHelper for: table).
 

Iceberg-UI.package/IceRepositoryModel.class/instance/restore.st

@@ -1,4 +1,3 @@
 actions
 restore
-	self repository backend cloneRepository.
-	self repository refresh.
+	(IceRestoreRepositoryModel repository: self repository) openWithSpec

Iceberg-UI.package/IceRestoreRepositoryModel.class/class/new.st

@@ -0,0 +1,3 @@
+instance creation
+new
+	self error: 'Use #repository:'

Iceberg-UI.package/IceRestoreRepositoryModel.class/class/repository..st

@@ -0,0 +1,5 @@
+instance creation
+repository: aRepository
+	^ self basicNew 
+		initializeRepository: aRepository;
+		yourself

Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/configureRepository..st

@@ -0,0 +1,6 @@
+private
+configureRepository: aRepository
+	repository location = aRepository location 
+		ifFalse: [ repository location: aRepository location ].
+	repository subdirectory = aRepository subdirectory 
+		ifFalse: [ repository subdirectory: aRepository subdirectory ]

Iceberg-UI.package/IceRestoreRepositoryModel.class/instance/initializeRepository..st

@@ -0,0 +1,8 @@
+initialization
+initializeRepository: aRepository
+	repository := aRepository.	
+	self initialize.
+	repository location ifNotNil: [ 
+		remoteUrl text: repository origin url.
+		localDirectoryLocation location: repository location ].
+	 subdirectory text: repository subdirectory

Iceberg-UI.package/IceRestoreRepositoryModel.class/properties.json

@@ -0,0 +1,13 @@
+{
+	"commentStamp" : "",
+	"super" : "IceCloneRepositoryModel",
+	"category" : "Iceberg-UI-View",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"repository"
+	],
+	"name" : "IceRestoreRepositoryModel",
+	"type" : "normal"
+}

Iceberg.package/IceDiff.class/instance/repository..st

@@ -2,4 +2,4 @@ accessing
 repository: anObject
 	repository := anObject.
 	repository announcer weak
-		subscribe: IceCommited send: #refresh to: self
+		when: IceCommited send: #refresh to: self

Iceberg.package/monticello.meta/categories.st

@@ -1,8 +1,8 @@
 SystemOrganization addCategory: #Iceberg!
-SystemOrganization addCategory: 'Iceberg-Adapters'!
-SystemOrganization addCategory: 'Iceberg-Announcements'!
-SystemOrganization addCategory: 'Iceberg-Changes'!
-SystemOrganization addCategory: 'Iceberg-Core'!
-SystemOrganization addCategory: 'Iceberg-Core-Remotes'!
-SystemOrganization addCategory: 'Iceberg-Errors'!
-SystemOrganization addCategory: 'Iceberg-Security'!
+SystemOrganization addCategory: #'Iceberg-Adapters'!
+SystemOrganization addCategory: #'Iceberg-Announcements'!
+SystemOrganization addCategory: #'Iceberg-Changes'!
+SystemOrganization addCategory: #'Iceberg-Core'!
+SystemOrganization addCategory: #'Iceberg-Core-Remotes'!
+SystemOrganization addCategory: #'Iceberg-Errors'!
+SystemOrganization addCategory: #'Iceberg-Security'!