Add branch name to commit button.

pharo-vcs · Oct 21, 2016 · 45306f2 · 45306f2
1 parent 3aa941c
commit 45306f2
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 18 deletions.
diff --git a/Iceberg.package/IceAbstractVersion.class/README.md b/Iceberg.package/IceAbstractVersion.class/README.md
@@ -0,0 +1 @@
+Base class for different types of versions, namely: IceVersion (normal versions) and IceForeignVersion (versions not managed by Ice).
diff --git a/...IceForeignVersion.class/class/package..st → ...bstractVersion.class/class/forPackage..st b/...IceForeignVersion.class/class/package..st → ...bstractVersion.class/class/forPackage..st
@@ -1,3 +1,3 @@
 instance creation
-package: package
+forPackage: package
 	^ self new package: package; yourself
diff --git a/Iceberg.package/IceAbstractVersion.class/instance/beCurrent.st b/Iceberg.package/IceAbstractVersion.class/instance/beCurrent.st
@@ -0,0 +1,3 @@
+as yet unclassified
+beCurrent
+	"By default do not to anything, version should have a package manager that makes them current without Iceberg intervention."
diff --git a/...ForeignVersion.class/instance/package..st → ...bstractVersion.class/instance/package..st b/...ForeignVersion.class/instance/package..st → ...bstractVersion.class/instance/package..st
diff --git a/...eForeignVersion.class/instance/package.st → ...AbstractVersion.class/instance/package.st b/...eForeignVersion.class/instance/package.st → ...AbstractVersion.class/instance/package.st
diff --git a/...PackageVersion.class/instance/snapshot.st → ...bstractVersion.class/instance/snapshot.st b/...PackageVersion.class/instance/snapshot.st → ...bstractVersion.class/instance/snapshot.st
diff --git a/Iceberg.package/IceAbstractVersion.class/instance/updatedVersion.st b/Iceberg.package/IceAbstractVersion.class/instance/updatedVersion.st
@@ -0,0 +1,3 @@
+patches
+updatedVersion
+	^ self
diff --git a/Iceberg.package/IceAbstractVersion.class/properties.json b/Iceberg.package/IceAbstractVersion.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "NicoPasserini 10/20/2016 15:48",
+	"instvars" : [
+		"package" ],
+	"name" : "IceAbstractVersion",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }
diff --git a/Iceberg.package/IceCommitModelNew.class/instance/branchName.st b/Iceberg.package/IceCommitModelNew.class/instance/branchName.st
@@ -0,0 +1,3 @@
+initialization
+branchName
+	^ self model repository branch name
diff --git a/Iceberg.package/IceCommitModelNew.class/instance/initialize.st b/Iceberg.package/IceCommitModelNew.class/instance/initialize.st
@@ -1,4 +1,5 @@
 initialization
 initialize
 	model := nil asValueHolder.
+	model whenChangedDo: [ commitButton label: 'Commit onto branch ', self branchName ].
 	super initialize
diff --git a/Iceberg.package/IceForeignVersion.class/instance/beCurrent.st b/Iceberg.package/IceForeignVersion.class/instance/beCurrent.st
diff --git a/Iceberg.package/IceForeignVersion.class/instance/mcVersion.st b/Iceberg.package/IceForeignVersion.class/instance/mcVersion.st
@@ -0,0 +1,4 @@
+as yet unclassified
+mcVersion
+	self halt.
+	^ mcVersion ifNil: [ mcVersion := self package workingCopy loadedVersion ]
diff --git a/Iceberg.package/IceForeignVersion.class/instance/printOn..st b/Iceberg.package/IceForeignVersion.class/instance/printOn..st
@@ -0,0 +1,9 @@
+printing
+printOn: aStream
+	aStream print: self class;
+		nextPut: $(;
+		nextPutAll: 
+			(mcVersion 
+				ifNotNil: [ mcVersion printString ] 
+				ifNil: [ self package name ]);
+		nextPut: $).
diff --git a/Iceberg.package/IceForeignVersion.class/properties.json b/Iceberg.package/IceForeignVersion.class/properties.json
@@ -1,14 +1,14 @@
 {
-	"category" : "Iceberg-Adapters",
+	"category" : "Iceberg-Core",
 	"classinstvars" : [
 		 ],
 	"classvars" : [
 		 ],
 	"commentStamp" : "NicoPasserini 9/14/2016 18:01",
 	"instvars" : [
-		"package" ],
+		"mcVersion" ],
 	"name" : "IceForeignVersion",
 	"pools" : [
 		 ],
-	"super" : "Object",
+	"super" : "IceAbstractVersion",
 	"type" : "normal" }
diff --git a/Iceberg.package/IceLoadedCode.class/instance/versionFor..st b/Iceberg.package/IceLoadedCode.class/instance/versionFor..st
@@ -1,3 +1,7 @@
 querying
 versionFor: package 
-	^ self loadedVersions at: package ifAbsentPut: [ package computeLoadedVersion ]
+	^ self loadedVersions 
+		at: package 
+		ifPresent: #updatedVersion
+		ifAbsentPut: [ package computeLoadedVersion ]
+
diff --git a/Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/addTo..st b/Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/addTo..st
@@ -1,3 +1,3 @@
 as yet unclassified
 addTo: aMCRepositoryGroup 
-	"For now do not add me as an MCRepository"
+	^ aMCRepositoryGroup addBasicRepository: self
diff --git a/Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/isValid.st b/Iceberg.package/IceMetacelloRepositoryAdapter.class/instance/isValid.st
@@ -0,0 +1,3 @@
+as yet unclassified
+isValid
+	^ true
diff --git a/Iceberg.package/IceSavedPackage.class/instance/computeLoadedVersion.st b/Iceberg.package/IceSavedPackage.class/instance/computeLoadedVersion.st
@@ -2,6 +2,7 @@ private
 computeLoadedVersion
 	| workingCopyAncestors |
 	workingCopyAncestors := self package workingCopy ancestors.
+	workingCopyAncestors ifEmpty: [ ^ IceTemporaryVersion forPackage: self ].
 
 	self workingCopy ancestors
 		detect: [ :ancestor | (ancestor respondsTo: #iceVersion) and: [ ancestor commit notNil ] ]
@@ -15,5 +16,5 @@ computeLoadedVersion
 					^ (self repository commitAt: commitId) versionFor: self ]
 			].
 
-			^ IceForeignVersion package: self.
+			^ IceForeignVersion forPackage: self.
 		]
diff --git a/Iceberg.package/IceSavedPackageVersion.class/class/forPackage..st b/Iceberg.package/IceSavedPackageVersion.class/class/forPackage..st
@@ -0,0 +1,4 @@
+instance creation
+forPackage: package
+	"Use fromCommit:package: instead"
+	self shouldNotImplement 
diff --git a/Iceberg.package/IceSavedPackageVersion.class/instance/package..st b/Iceberg.package/IceSavedPackageVersion.class/instance/package..st
diff --git a/Iceberg.package/IceSavedPackageVersion.class/instance/package.st b/Iceberg.package/IceSavedPackageVersion.class/instance/package.st
diff --git a/Iceberg.package/IceSavedPackageVersion.class/properties.json b/Iceberg.package/IceSavedPackageVersion.class/properties.json
@@ -6,13 +6,12 @@
 		 ],
 	"commentStamp" : "NicoPasserini 9/26/2016 11:11",
 	"instvars" : [
-		"package",
 		"entry",
 		"info",
 		"commit",
 		"originatingCommit" ],
 	"name" : "IceSavedPackageVersion",
 	"pools" : [
 		 ],
-	"super" : "Object",
+	"super" : "IceAbstractVersion",
 	"type" : "normal" }
diff --git a/Iceberg.package/IceTemporaryVersion.class/README.md b/Iceberg.package/IceTemporaryVersion.class/README.md
@@ -0,0 +1 @@
+I am a temporary place holder for a version. Someone asked for a version but the package is still being loaded, at some point a real version will replace me. In the meanwhile I can respond to some messages as a version would do.
diff --git a/Iceberg.package/IceTemporaryVersion.class/instance/updatedVersion.st b/Iceberg.package/IceTemporaryVersion.class/instance/updatedVersion.st
@@ -0,0 +1,6 @@
+patches
+updatedVersion
+	| newVersion |
+	newVersion := self package computeLoadedVersion.
+	self package repository loadedCode versionLoaded: newVersion.
+	^ newVersion
diff --git a/Iceberg.package/IceTemporaryVersion.class/properties.json b/Iceberg.package/IceTemporaryVersion.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "NicoPasserini 10/20/2016 18:24",
+	"instvars" : [
+		 ],
+	"name" : "IceTemporaryVersion",
+	"pools" : [
+		 ],
+	"super" : "IceAbstractVersion",
+	"type" : "normal" }
diff --git a/Iceberg.package/MCWorkingCopy.extension/instance/loadedVersion.st b/Iceberg.package/MCWorkingCopy.extension/instance/loadedVersion.st
@@ -0,0 +1,8 @@
+*Iceberg-Adapters
+loadedVersion
+	self ancestors do: [ :ancestor |
+		(self repositoryGroup 
+			versionWithInfo: ancestor
+			ifNone: [ MCRepositoryGroup default versionWithInfo: ancestor ifNone: [] ])
+			ifNotNil: [ :version | ^ version ]
+	].
diff --git a/Iceberg.package/MCWorkingCopy.extension/properties.json b/Iceberg.package/MCWorkingCopy.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "MCWorkingCopy" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Base class for different types of versions, namely: IceVersion (normal versions) and IceForeignVersion (versions not managed by Ice).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		I am a temporary place holder for a version. Someone asked for a version but the package is still being loaded, at some point a real version will replace me. In the meanwhile I can respond to some messages as a version would do.