release 0.6.3

BaselineOfIceberg.package/BaselineOfIceberg.class/instance/tonel..st

@@ -2,4 +2,4 @@ baseline
 tonel: spec
 	spec
 		baseline: 'Tonel' 
-		with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.?' ]
+		with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.4' ]

Iceberg-Libgit-Filetree.package/ManifestIcebergLibgitFiletree.class/README.md

@@ -0,0 +1 @@
+I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser

Iceberg-Libgit-Filetree.package/ManifestIcebergLibgitFiletree.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contain the libgit binding for the FileTree export format. 
+
+Iceberg can manage different export format and FileTree is one of them. It will export with a file per method format. The pro of this format is that it is easy to get a fine grained history. The cons of this format is that it will create a lot of small files. When a project contains a lot of small file it takes much more space on the disk because of the file system''s blocs minimum space. Also it can cause troubles on windows because of the long names of methods. '

Iceberg-Libgit-Filetree.package/ManifestIcebergLibgitFiletree.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "<historical>",
+	"super" : "PackageManifest",
+	"category" : "Iceberg-Libgit-Filetree",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ManifestIcebergLibgitFiletree",
+	"type" : "normal"
+}

Iceberg-Libgit-Tonel.package/ManifestIcebergLibgitTonel.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contain the libgit binding for the Tonel export format. 
+
+Iceberg can manage different export format and Tonel is one of them. It will export with a file per class format. The cons of this format is that it is not easy to get a fine grained history. The pros of this format is that it will create bigger files than FileTree. When a project contains a lot of small file it takes much more space on the disk because of the file system''s blocs minimum space. Tonel also reduce the troubles on windows because of the long files names that can produce FileTree. '

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/addFilesToIndex..st

@@ -4,5 +4,4 @@ addFilesToIndex: aListOfPaths
 		| index |
 		index := repo index.
 		index addAll: aListOfPaths.
-		index writeToDisk.
-	]
+		index writeToDisk ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/commitRepository.mergedIndex.message.mine.theirs..st

@@ -0,0 +1,19 @@
+private merging
+commitRepository: repo mergedIndex: mergedIndex message: aString mine: myCommit theirs: theirCommit
+	"Commit mergedIndex"
+	| signature treeId |
+
+	signature := repo defaultSignature.
+	treeId := mergedIndex writeTreeAndReturnOid.
+	[ repo checkout_treeish: (LGitTree of: repo fromId: treeId) ]
+	on: LGit_GIT_ECONFLICT 
+	do: [ :e | e resignalAs: IceMergeAborted new ].
+
+	(LGitCommitBuilder of: repo)
+		tree: (LGitTree of: repo fromId: treeId);
+		message: 'Merge with ' , aString;
+		parents:{ myCommit. theirCommit };
+		updateReference: repo head name;
+		author: signature;
+		committer: signature;
+		writeCommit

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/createBranchFrom.named..st

@@ -0,0 +1,8 @@
+actions
+createBranchFrom: aCommitInfo named: branchName
+	self withRepoDo: [ :repo | | newBranch |
+		newBranch := repo 
+			createBranch: branchName 
+			targetId: (LGitId fromHexString: aCommitInfo commitId)
+			force: false.
+		repo setHead: newBranch ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/merge..st

@@ -3,44 +3,16 @@ merge: commitId
 	self withRepoDo: [ :repo | 
 		| myCommit theirCommit mergeBase |
 		"Decide if we can fast-forward or we must do a real merge"
-
 		myCommit := repo head object.
 		theirCommit := LGitCommit of: repo fromHexString: commitId.
 		mergeBase := repo mergeBaseBetween: myCommit id and: theirCommit id.
-
-		(mergeBase = myCommit id)
+		mergeBase = myCommit id
 			ifTrue: [ 
 				"No need to merge, just fast-forward current HEAD"
-				repo checkout_treeish: theirCommit.
-				repo head resolve setTargetId: theirCommit id.
-			]
-			ifFalse: [
-				| mergedIndex treeId signature |
-
-				"Merge both commits"
-				mergedIndex := myCommit merge: theirCommit.
-				mergedIndex hasConflicts 
-					ifTrue: [ 
-						"Abort merge and signal for manual merge. 
-						Index is not saved and repository will be discarded, 
-						so no further action is needed to abort the merge" 
-						IceMergeAborted signal 
-					]
-					ifFalse: [
-						"Commit mergedIndex"
-						signature := repo defaultSignature.
-						treeId := mergedIndex writeTreeAndReturnOid.
-						repo checkout_treeish: (LGitTree of: repo fromId: treeId).
-
-						(LGitCommitBuilder of: repo)
-							tree: (LGitTree of: repo fromId: treeId);
-							message: 'Merge with ', commitId;
-							parents: { myCommit. theirCommit };
-							updateReference: repo head name;
-							author: signature;
-							committer: signature;
-							writeCommit.		
-
-					]
-			]
-	]
+				self mergeRepositoryFastForward: repo theirs: theirCommit ]
+			ifFalse: [ 
+				self
+					mergeRepository: repo
+					id: commitId
+					mine: myCommit
+					theirs: theirCommit ] ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/mergeRepository.id.mine.theirs..st

@@ -0,0 +1,19 @@
+private merging
+mergeRepository: repo id: commitId mine: myCommit theirs: theirCommit
+	| mergedIndex |
+
+	mergedIndex := myCommit merge: theirCommit.
+	mergedIndex hasConflicts
+		ifTrue: [ 
+			"Abort merge and signal for manual merge. 
+			 Index is not saved and repository will be discarded, 
+			 so no further action is needed to abort the merge" 
+			IceMergeAborted signal ].
+
+	"Commit mergedIndex"
+	self 
+		commitRepository: repo 
+		mergedIndex: mergedIndex 
+		message: commitId 
+		mine: myCommit 
+		theirs: theirCommit

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/mergeRepositoryFastForward.theirs..st

@@ -0,0 +1,4 @@
+private merging
+mergeRepositoryFastForward: repo theirs: theirCommit
+	repo checkout_treeish: theirCommit.
+	repo head resolve setTargetId: theirCommit id

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/pullFrom..st

@@ -13,28 +13,5 @@ pullFrom: aRemote
 		mergeBase := repo mergeBaseBetween: myCommit id and: theirCommit id.
 
 		(mergeBase = myCommit id)
-			ifTrue: [ 
-				"No need to merge, just fast-forward current HEAD"
-				repo checkout_treeish: repo head upstream object.
-				repo fastForward
-			]
-			ifFalse: [
-				| mergedIndex treeId signature |
-
-				"Merge both commits"
-				mergedIndex := myCommit merge: theirCommit.
-
-				"Commit index"
-				signature := repo defaultSignature.
-				treeId := mergedIndex writeTreeAndReturnOid.
-
-				(LGitCommitBuilder of: repo)
-					tree: (LGitTree of: repo fromId: treeId);
-					message: 'Merge with ', repo head upstream name;
-					parents: { myCommit. theirCommit };
-					updateReference: repo head name;
-					author: signature;
-					committer: signature;
-					writeCommit.		
-			]
-	]
+			ifTrue: [ self pullRepositoryFastForward: repo ]
+			ifFalse: [ self pullRepository: repo merge: myCommit with: theirCommit ] ]

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/pullRepository.merge.with..st

@@ -0,0 +1,16 @@
+private pulling
+pullRepository: repo merge: myCommit with: theirCommit
+	| mergedIndex |
+
+	"Merge both commits"
+	mergedIndex := myCommit merge: theirCommit.
+	mergedIndex hasConflicts 
+		ifTrue: [ IceMergeAborted signal ].
+
+	"Commit index"
+	self 
+		commitRepository: repo 
+		mergedIndex: mergedIndex 
+		message: repo head upstream name 
+		mine: myCommit 
+		theirs: theirCommit

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/pullRepositoryFastForward..st

@@ -0,0 +1,4 @@
+private pulling
+pullRepositoryFastForward: repo
+	repo checkout_treeish: repo head upstream object.
+	repo fastForward 

Iceberg-Libgit.package/IceLibgitLocalRepository.class/instance/pushTo..st

@@ -7,15 +7,19 @@ pushTo: aRemote
 		reference := repo head.	
 		remoteBranchName := reference name. "TODO: https://github.com/npasserini/iceberg/issues/90"
 
-		gitRemote
+		[ gitRemote
 			pushWithRefSpec: (LGitRefSpec new
 				source: reference name;
 				destination: remoteBranchName;
 				yourself)
 			pushOptions: (LGitPushOptions defaults
 				callbacks: (LGitRemoteCallbacks withProvider: IceCredentialsProvider default);
-				yourself).
+				yourself) ]
+		on: LGit_GIT_ENONFASTFORWARD do: [ :e |
+			e resignalAs: (IceRemoteDesynchronized new 
+				remote: aRemote;
+				yourself)].
 
 		"Since the push created the branch in the remote, we can now add an upstream to this branch."
 		reference upstream ifNil: [ 
-			reference setUpstream: aRemote remoteName, '/', reference basename ] ]
+			reference setUpstream: aRemote remoteName, '/', reference basename ] ]

Iceberg-Libgit.package/ManifestIcebergLibgit.class/README.md

@@ -0,0 +1 @@
+I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser

Iceberg-Libgit.package/ManifestIcebergLibgit.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contains the core of the libgit binding of Iceberg. 
+
+Libgit is a backend of Iceberg using the LibGit2 (https://libgit2.github.com/) to manage git communication. This package contains to code common to all export format. '

Iceberg-Libgit.package/ManifestIcebergLibgit.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "<historical>",
+	"super" : "PackageManifest",
+	"category" : "Iceberg-Libgit",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ManifestIcebergLibgit",
+	"type" : "normal"
+}

Iceberg-Metacello-Integration.package/IceGitLocalRepositoryType.class/instance/splitRootAndSubdirectoryFromLocation.st

@@ -1,15 +1,16 @@
 private
 splitRootAndSubdirectoryFromLocation
 	| root subDir |
-	
-	(self location beginsWith: (self class type, '://'))	
+
+	(self location beginsWith: (self class type, '://'))
 		ifFalse: [ self error: 'Invalid URL (It should be ', self class type, '://...)' ].
 	root := (self location allButFirst: self class type size + 3) asFileReference.
 	subDir := #().
 	[ root isNil or: [ self isGitRoot: root ] ] 
-		whileFalse: [ 
-			subDir := subDir copyWithFirst: root basename.
-			root := root parent ].
+	whileFalse: [ 
+		(root asAbsolute = FileSystem workingDirectory)
+			ifFalse: [ subDir := subDir copyWithFirst: root basename ].
+		root := root parent ].
 	root ifNil: [ self error: 'I can''t find a .git/config file.' ].
 
 	^ { 

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

@@ -0,0 +1 @@
+I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser

Iceberg-Metacello-Integration.package/ManifestIcebergMetacelloIntegration.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contains the code related to the Metacello integration of Iceberg. 
+
+Metacello is a Smalltalk''s package manager. It help to creation configurations for project to load them and their dependencies.'

Iceberg-Metacello-Integration.package/ManifestIcebergMetacelloIntegration.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "<historical>",
+	"super" : "PackageManifest",
+	"category" : "Iceberg-Metacello-Integration",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ManifestIcebergMetacelloIntegration",
+	"type" : "normal"
+}

Iceberg-Plugin-GitHub.package/IceGitHubAPI.class/instance/newRequestTo..st

@@ -7,5 +7,7 @@ newRequestTo: aString
 					username: self credentials username 
 					password: self credentials password ] ]; 
 		headerAt: 'Accept' put: 'application/vnd.github.v3+json';
-		url: 'https://api.github.com/', aString;
+		url: 'https://api.github.com/', (aString first = $/
+			ifTrue: [ aString allButFirst ]
+			ifFalse: [ aString ]);
 		yourself

Iceberg-Plugin-GitHub.package/ManifestIcebergPluginGitHub.class/README.md

@@ -0,0 +1 @@
+I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser

Iceberg-Plugin-GitHub.package/ManifestIcebergPluginGitHub.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contains a plugin to ease the integration of Iceberg with GitHub''s services.
+
+It provides, for example, the possibility to manage pull requests. '

Iceberg-Plugin-GitHub.package/ManifestIcebergPluginGitHub.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "<historical>",
+	"super" : "PackageManifest",
+	"category" : "Iceberg-Plugin-GitHub",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ManifestIcebergPluginGitHub",
+	"type" : "normal"
+}

Iceberg-Plugin-GitHub.package/monticello.meta/categories.st

@@ -1,4 +1,4 @@
 SystemOrganization addCategory: #'Iceberg-Plugin-GitHub'!
-SystemOrganization addCategory: 'Iceberg-Plugin-GitHub-Model'!
-SystemOrganization addCategory: 'Iceberg-Plugin-GitHub-Utils'!
-SystemOrganization addCategory: 'Iceberg-Plugin-GitHub-View'!
+SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Model'!
+SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-Utils'!
+SystemOrganization addCategory: #'Iceberg-Plugin-GitHub-View'!

Iceberg-Plugin.package/ManifestIcebergPlugin.class/README.md

@@ -0,0 +1 @@
+I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser

Iceberg-Plugin.package/ManifestIcebergPlugin.class/class/description.st

@@ -0,0 +1,4 @@
+meta-data
+description ^ 'I contains a plugin manager for Iceberg. 
+
+This plugin manager allow to extends Iceberg''s functionnalities with modularity.'

Iceberg-Plugin.package/ManifestIcebergPlugin.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "<historical>",
+	"super" : "PackageManifest",
+	"category" : "Iceberg-Plugin",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "ManifestIcebergPlugin",
+	"type" : "normal"
+}

Iceberg-Plugin.package/monticello.meta/categories.st

@@ -1,4 +1,4 @@
 SystemOrganization addCategory: #'Iceberg-Plugin'!
-SystemOrganization addCategory: 'Iceberg-Plugin-Base'!
-SystemOrganization addCategory: 'Iceberg-Plugin-General'!
-SystemOrganization addCategory: 'Iceberg-Plugin-Pharo-FogBugz'!
+SystemOrganization addCategory: #'Iceberg-Plugin-Base'!
+SystemOrganization addCategory: #'Iceberg-Plugin-General'!
+SystemOrganization addCategory: #'Iceberg-Plugin-Pharo-FogBugz'!

Iceberg-UI.package/IceCommitModel.class/instance/basicCommitWithMessage.ifCancel..st

@@ -7,5 +7,5 @@ basicCommitWithMessage: text ifCancel: cancelBlock
 			self configGitUsernameAndEmailOnCancel: cancelBlock.
 			e retry ].
 		self resetText ]
-	on: NothingToCommit 
-	do: [ :e | UIManager default inform: 'There is nothing to commit.' ]
+	on: IceNothingToCommit, IceWorkingCopyDesyncronized  
+	do: [ :e | e acceptError: (IceInteractiveErrorVisitor repository: self repository) ]

Iceberg-UI.package/IceCommitModel.class/instance/commitPushing..st

@@ -6,6 +6,11 @@ commitPushing: pushBoolean
 	UIManager default
 		informUserDuring: [ :bar | 
 			bar label: ('Commiting changes to {1}' format: { self repository name }).
+			pushBoolean ifTrue: [ 
+				"Validate I can push before I do the commit so I can handle fast-forwards (or merges)"
+				[ self repository validateCanPush ]
+				on: IceRemoteDesynchronized 
+				do: [ :e | e acceptError: (IceInteractiveErrorVisitor repository: self repository) ] ].
 			self basicCommitWithMessage: text ifCancel: [ ^ self ].
 			pushBoolean ifTrue: [ | remote |
 				remote := self repository pushRemote.