60510

20268 update iceberg v0.5.5
	https://pharo.fogbugz.com/f/cases/20268

http://files.pharo.org/image/60/60510.zip

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/accessing/setLongpaths_global_.st

@@ -0,0 +1,7 @@
+setLongpaths: aBoolean global: globalBoolean 
+	"set user.name and user.email properties. 
+	 this could be a nonsense with other backends, but git has them and needs them :)"
+	self withRepoDo: [ :repo | | config |
+		config := repo config.
+		globalBoolean ifTrue: [ config := config openGlobal ].
+		config setBoolean: 'core.longpaths' to: aBoolean ]

Iceberg-Metacello-Integration.package/IceBitbucketRepositoryType.class/README.md

@@ -0,0 +1 @@
+I resolve Bitbucket repositories

Iceberg-Metacello-Integration.package/IceBitbucketRepositoryType.class/class/accessing/type.st

@@ -0,0 +1,2 @@
+type
+	^ 'bitbucket'

Iceberg-Metacello-Integration.package/IceBitbucketRepositoryType.class/definition.st

@@ -0,0 +1,5 @@
+IceProviderRepositoryType subclass: #IceBitbucketRepositoryType
+	instanceVariableNames: ''
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'Iceberg-Metacello-Integration'

Iceberg-Metacello-Integration.package/IceGithubRepositoryType.class/README.md

@@ -1 +1 @@
-I resolve Github repositories.A github repositoy is composed of: github://username/repository[:commitish][/subdir]github  		- The github identifierusername 	- The github userrepository	- The guthub repositorycommitish	- an optional commitish (a branch, a tag, a commit id)subdir		- an optional subdirectory where the packages exist.		Example: ------------A script to install voyage using this would like more or less like this:Metacello new	repository: 'github://pharo-nosql/voyage:master/mc';	baseline: 'Voyage';	load: 'mongo tests'.
+I resolve Github repositories

Iceberg-Metacello-Integration.package/IceGithubRepositoryType.class/definition.st

@@ -1,4 +1,4 @@
-IceMetacelloRepositoryType subclass: #IceGithubRepositoryType
+IceProviderRepositoryType subclass: #IceGithubRepositoryType
 	instanceVariableNames: ''
 	classVariableNames: ''
 	poolDictionaries: ''

Iceberg-Metacello-Integration.package/IceGithubRepositoryType.class/instance/accessing/mcRepository.st

@@ -2,15 +2,11 @@ mcRepository
 	| baseRepo |
 
 	baseRepo := MCGitHubRepository location: self location.
-	(Iceberg icebergRepositoriesURLs includes: baseRepo scpUrl)
+	^ (Iceberg icebergRepositoriesURLs includes: baseRepo scpUrl)
 		ifTrue: [ 
 			"Do not use Iceberg to load iceberg code, 
-			see https://github.com/npasserini/iceberg/issues/168"
-			^ baseRepo ]
+			see https://github.com/pharo-vcs/iceberg/issues/168"
+			baseRepo ]
 		ifFalse: [  
-			Transcript 
-				show: 'Creating iceberg-metacello adapter for: ';
-				show: self location; 
-				cr.
-			^ baseRepo getOrCreateIcebergRepository metacelloAdapter ]
+			baseRepo getOrCreateIcebergRepository metacelloAdapter ]
 

Iceberg-Metacello-Integration.package/IceGitlabRepositoryType.class/README.md

@@ -0,0 +1 @@
+I resolve Gilab repositories

Iceberg-Metacello-Integration.package/IceGitlabRepositoryType.class/class/accessing/type.st

@@ -0,0 +1,2 @@
+type
+	^ 'gitlab'

Iceberg-Metacello-Integration.package/IceGitlabRepositoryType.class/definition.st

@@ -0,0 +1,5 @@
+IceProviderRepositoryType subclass: #IceGitlabRepositoryType
+	instanceVariableNames: ''
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'Iceberg-Metacello-Integration'

Iceberg-Metacello-Integration.package/IceMetacelloPharoPlatform.class/instance/repository creation/createRepository_.st

@@ -1,6 +1,6 @@
 createRepository: aRepositorySpec
-
 	| type |
+
 	type := aRepositorySpec type.
 	type = 'ftp' ifTrue: [ | description headerSize index host directory |
 		description := aRepositorySpec description.

Iceberg-Metacello-Integration.package/IceMetacelloRepositoryType.class/class/accessing/allTypes.st

@@ -1,2 +1,2 @@
 allTypes
-	^ self allSubclasses 
+	^ self allSubclasses select: [ :each | each isAbstract not ]

Iceberg-Metacello-Integration.package/IceMetacelloRepositoryType.class/class/instance creation/for_.st

@@ -1,4 +1,4 @@
 for: aLocationString
-	^ (self allSubclasses
+	^ (self allTypes
 		detect: [ :each | each isSuitableForLocation: aLocationString ])
 		location: aLocationString

Iceberg-Metacello-Integration.package/IceMetacelloRepositoryType.class/class/testing/isAbstract.st

@@ -0,0 +1,2 @@
+isAbstract
+	^ self = IceMetacelloRepositoryType

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/README.md

@@ -0,0 +1 @@
+I 'm a base class to resolve provider-based repositories.A provider repositoy is composed of: provider://username/repository[:commitish][/subdir]provider  	- The provider identifier (e.g. github, bitbucket, etc.)username 	- The provider userrepository	- The provider repositorycommitish	- an optional commitish (a branch, a tag, a commit id)subdir		- an optional subdirectory where the packages exist.		Example: ------------A script to install voyage using this would like more or less like this:Metacello new	repository: 'github//pharo-nosql/voyage:master/mc';	baseline: 'Voyage';	load: 'mongo tests'.

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/class/testing/isAbstract.st

@@ -0,0 +1,3 @@
+isAbstract
+	^ super isAbstract
+		or: [ self = IceProviderRepositoryType ]

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/definition.st

@@ -0,0 +1,5 @@
+IceMetacelloRepositoryType subclass: #IceProviderRepositoryType
+	instanceVariableNames: ''
+	classVariableNames: ''
+	poolDictionaries: ''
+	category: 'Iceberg-Metacello-Integration'

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/instance/accessing/mcRepository.st

@@ -0,0 +1,5 @@
+mcRepository
+	| baseRepo |
+
+	baseRepo := MCGitHubRepository location: self location.
+	^ baseRepo getOrCreateIcebergRepository metacelloAdapter

Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/accessing/mergeBaseCommitFor_.st

@@ -0,0 +1,2 @@
+mergeBaseCommitFor: commitInfo
+	^ commitInfo repository commitAt: (self mergeBaseFor: commitInfo)

Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/accessing/mergeBaseFor_.st

@@ -0,0 +1,4 @@
+mergeBaseFor: commitInfo
+	^ commitInfo repository
+		mergeBaseBetween: commitInfo commitId 
+		and: self baseSHA

Iceberg-Plugin-GitHub.package/IceGitHubPullRequestBrowser.class/instance/building/addChangesTreeTo_with_.st

@@ -2,7 +2,7 @@ addChangesTreeTo: a with: commitInfo
 	(IceDiffChangeTreeBuilder new
 		entity: commitInfo;
 		diff: (commitInfo ifNotNil: [ 
-			commitInfo diffTo: (commitInfo repository commitAt: self baseSHA)  ]);
+			commitInfo diffTo: (self mergeBaseCommitFor: commitInfo) ]);
 		buildOn: a)
 		title: 'Changes vs. destination' .
 	super addChangesTreeTo: a with: commitInfo

Iceberg-Plugin.package/IcePharoFogbugzModel.class/instance/initialization/initializeWidgets.st

@@ -1,7 +1,7 @@
 initializeWidgets
 	issueNumberText := self newTextInput autoAccept: true.
 	issueText := self newTextInput autoAccept: true.
-	createButton := self newButton.
+	createButton := self newButton enabled: false.
 
 
 	issueNumberText whenBuiltDo: [ :w | w widget wrapFlag: false ]. 

Iceberg-Plugin.package/IcePharoFogbugzModel.class/instance/private/validateIssue_.st

@@ -10,5 +10,7 @@ validateIssue: aString
 			issue := PharoIssue number: number.
 			[ 	"Fork to allow UI to continue"
 				issue downloadTitle.
-				World defer: [ self updateText: (self sanitizeTitle: issue title) ] ] fork ]
+				UIManager default defer: [ 
+					self updateText: (self sanitizeTitle: issue title).
+					self createButton enabled: true ] ] fork ]
 

Iceberg.package/IceCommitInfo.class/instance/accessing/compatibleTimestamp.st

@@ -0,0 +1,7 @@
+compatibleTimestamp
+	"I'm a timestamp as system: likes authorname MM/DD/YYYY HH:MM"
+	^ String streamContents: [ :stream |
+		stream 
+			<< self compatibleUsername 
+			<< ' '
+		 	<< self datetime asStringYMDHM  ]

Iceberg.package/IceRepository.class/instance/accessing/mergeBaseBetween_and_.st

@@ -0,0 +1,4 @@
+mergeBaseBetween: anId and: otherId
+	^ self backend 
+		mergeBaseBetween: anId 
+		and: otherId

ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60509.st → ScriptLoader60.package/ScriptLoader.class/instance/pharo - scripts/script60510.st

@@ -1,4 +1,4 @@
-script60509
+script60510
 
 	^ 'AST-Core-TheIntegrator.496.mcz
 AST-Tests-Core-TheIntegrator.134.mcz
@@ -151,6 +151,7 @@ Iceberg-cypress.1.mcz
 Iceberg-Libgit-cypress.1.mcz
 Iceberg-Metacello-Integration-cypress.1.mcz
 Iceberg-Plugin-cypress.1.mcz
+Iceberg-Plugin-GitHub-cypress.1.mcz
 Iceberg-UI-cypress.1.mcz
 ImportingResource-Help-TheIntegrator.8.mcz
 IssueTracking-TheIntegrator.6.mcz

ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60510.st

@@ -0,0 +1,14 @@
+update60510
+	"self new update60510"
+	self withUpdateLog: '20268 update iceberg v0.5.5
+	https://pharo.fogbugz.com/f/cases/20268'.
+	self loadTogether: self script60510 merge: false.
+
+#('Iceberg-UI' 'Iceberg-Plugin-GitHub' 'Iceberg-Plugin' 'Iceberg-Metacello-Integration' 'Iceberg-Libgit' 'Iceberg' 'BaselineOfIceberg' 'LibGit-Core' 'BaselineOfLibGit') 
+do: [ :each | each asPackage removeFromSystem ].
+Metacello new
+  baseline: 'Iceberg';
+  repository: 'github://pharo-vcs/iceberg:v0.5.5';
+  load.
+(Smalltalk classNamed: #Iceberg) enableMetacelloIntegration: false.
+	self flushCaches.

ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st

@@ -1,3 +1,3 @@
 commentForCurrentUpdate
- ^ '20262 Update Iceberg to 0.5.4
-	https://pharo.fogbugz.com/f/cases/20262'
+ ^ '20268 update iceberg v0.5.5
+	https://pharo.fogbugz.com/f/cases/20268'