Fix pharo-vcs#821

- Extend commits to get properties from them - `IceRepositoryProperties new` should be correctly (lazily) initialized - make Filetree migration condition more robust
philippeback · May 29, 2018 · f34a103 · f34a103
1 parent eb0e5ef
commit f34a103
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/at..st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/at..st
@@ -1,4 +1,4 @@
 accessing
 at: aKey
 
-	^ properties at: aKey
+	^ self properties at: aKey
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/at.put..st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/at.put..st
@@ -1,4 +1,4 @@
 accessing
 at: aKey put: aValue
 
-	properties at: aKey put: aValue
+	self properties at: aKey put: aValue
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/properties.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/properties.st
@@ -1,3 +1,3 @@
 private 
 properties
-	^ properties
+	^ properties ifNil: [ properties := Dictionary new ]
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/readerClass.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/readerClass.st
@@ -1,6 +1,6 @@
 accessing
 readerClass
-	^ properties 
+	^ self properties 
 		at: 'format' 
 		ifPresent: [ :v | TIceRepositoryReader users detect: [ :each | each id = v  ] ]
 		ifAbsent: [ TIceRepositoryReader users detect: #isLegacyDefault ]
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/writerClass.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/writerClass.st
@@ -1,6 +1,6 @@
 accessing
 writerClass
-	^ properties 
+	^ self properties 
 		at: 'format' 
 		ifPresent: [ :v | TIceRepositoryWriter users detect: [ :each | each id = v  ] ]
 		ifAbsent: [ 

diff --git a/...Plugin-Migration.package/IceFiletreeToTonelCommand.class/class/canBeExecutedInContext..st b/...Plugin-Migration.package/IceFiletreeToTonelCommand.class/class/canBeExecutedInContext..st
@@ -1,4 +1,8 @@
 testing
 canBeExecutedInContext: aToolContext
-	self flag: #todo. "Demeters law"
-	^ aToolContext repositoryModel entity writerClass id = #filetree
+
+	| repository |
+	repository := aToolContext repositoryModel entity.
+	^ repository isMissing not 
+		and: [ repository workingCopy isDetached not
+			and: [ repository workingCopy writerClass id = #filetree ] ]
diff --git a/Iceberg.package/IceCommitish.class/instance/properties.st b/Iceberg.package/IceCommitish.class/instance/properties.st
@@ -0,0 +1,4 @@
+API-properties
+properties
+
+	^ IceRepositoryProperties new
diff --git a/Iceberg.package/IceCommitish.class/instance/writerClass.st b/Iceberg.package/IceCommitish.class/instance/writerClass.st
@@ -1,3 +1,4 @@
-accessing
+API-properties
 writerClass
-	^ self commit writerClass
+
+	^ self properties writerClass
diff --git a/Iceberg.package/IceUnknownCommit.class/instance/commit.st b/Iceberg.package/IceUnknownCommit.class/instance/commit.st
@@ -0,0 +1,3 @@
+accessing
+commit
+	self shouldBeImplemented.
diff --git a/Iceberg.package/IceWorkingCopy.class/instance/writerClass.st b/Iceberg.package/IceWorkingCopy.class/instance/writerClass.st
@@ -0,0 +1,4 @@
+API-properties
+writerClass
+
+	^ self referenceCommit writerClass