Merge pull request #1798 from jecisc/set-tonel-version

Allow to set tonel writer version to use for export
pharo-vcs · Jan 31, 2024 · b25aa14 · b25aa14
2 parents 79ade7c + b63f84e
commit b25aa14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st
@@ -37,9 +37,10 @@ IceLibgitTonelWriter class >> forInternalStore [
 
 { #category : 'writing' }
 IceLibgitTonelWriter class >> forInternalStoreFileOut: aMCVersion on: aRepository [
-	self forInternalStore 
-		fileOut: aMCVersion
-		on: aRepository subdirectoryReference
+
+	(self forInternalStore forVersion: (aRepository properties tonelVersion ifNil: [ self forInternalStore defaultVersion ])) new
+		directoryReference: aRepository subdirectoryReference;
+		writeVersion: aMCVersion
 ]
 
 { #category : 'accessing' }

diff --git a/Iceberg-Libgit/IceRepositoryProperties.class.st b/Iceberg-Libgit/IceRepositoryProperties.class.st
@@ -50,9 +50,8 @@ IceRepositoryProperties class >> propertiesFileName [
 
 { #category : 'instance creation' }
 IceRepositoryProperties class >> readPropertiesFrom: aFileReference [
-	self flag: #pharoFixMe.	"When Pharo 6.1 will not be supported anymore we can directly use: `ref readStreamDo: [ :stream | STON fromStream: stream ]` but currently FileReference>>readStream return a ZnBufferedStream in Pharo 61 and a ZnCharacterReadStream decoding utf8 in Pharo 7."
-	^ aFileReference
-		binaryReadStreamDo: [ :stream | STON fromStream: (ZnCharacterReadStream on: stream encoding: 'utf8') ]
+
+	^ aFileReference readStreamDo: [ :stream | STON fromStream: stream ]
 ]
 
 { #category : 'comparing' }
@@ -210,6 +209,12 @@ IceRepositoryProperties >> storeOnFileReference: aFileReference [
 				nextPut: self properties  ]
 ]
 
+{ #category : 'private' }
+IceRepositoryProperties >> tonelVersion [
+
+	^ self properties at: #version ifAbsent: [ nil ]
+]
+
 { #category : 'accessing' }
 IceRepositoryProperties >> writerClass [
 	^ self properties