GemTalk / Rowan

a new project/package manager for Smalltalk that supports FileTree and Tonel repositories, and is independent of Monticello and Metacello
MIT License
14 stars 7 forks source link

(v3) need to handle class types "variable" and "bytes" when read from filetree repositories #924

Open dalehenrich opened 6 months ago

dalehenrich commented 6 months ago

Related to dalehenrich/Rowan4GsDevKit#1.

Here's an example git diff ... the chagnes in order are not an issue, but the type fields are causing the definitions to be rewritten which is not ideal ...

bosch:glass>git remote -v
origin  git@github.com:glassdb/glass.git (fetch)
origin  git@github.com:glassdb/glass.git (push)
bosch:glass>git status
On branch rowan4gsdevkit
Your branch is up to date with 'origin/rowan4gsdevkit'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   repository/Core.v37.package/UUID.class/properties.json
    modified:   repository/GsSqueakCommon-Core.package/Stack.class/properties.json

no changes added to commit (use "git add" and/or "git commit -a")
bosch:glass>git diff
diff --git a/repository/Core.v37.package/UUID.class/properties.json b/repository/Core.v37.package/UUID.class/properties.json
index fe3ff400..0b1f4ecb 100644
--- a/repository/Core.v37.package/UUID.class/properties.json
+++ b/repository/Core.v37.package/UUID.class/properties.json
@@ -1,14 +1,13 @@
 {
+       "commentStamp" : "",
+       "super" : "ByteArray",
        "category" : "Core-Squeak",
-       "classinstvars" : [
-                ],
+       "classinstvars" : [ ],
+       "pools" : [ ],
        "classvars" : [
-               "GeneratorClass" ],
-       "commentStamp" : "",
-       "instvars" : [
-                ],
+               "GeneratorClass"
+       ],
+       "instvars" : [ ],
        "name" : "UUID",
-       "pools" : [
-                ],
-       "super" : "ByteArray",
-       "type" : "bytes" }
+       "type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
index 6b116819..9ddeabb6 100644
--- a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
+++ b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
@@ -1,14 +1,11 @@
 {
-       "category" : "GsSqueakCommon-Core",
-       "classinstvars" : [
-                ],
-       "classvars" : [
-                ],
        "commentStamp" : "",
-       "instvars" : [
-                ],
-       "name" : "Stack",
-       "pools" : [
-                ],
        "super" : "OrderedCollection",
-       "type" : "variable" }
+       "category" : "GsSqueakCommon-Core",
+       "classinstvars" : [ ],
+       "pools" : [ ],
+       "classvars" : [ ],
+       "instvars" : [ ],
+       "name" : "Stack",
+       "type" : "normal"
+}
\ No newline at end of file
bosch:glass>git diff
diff --git a/repository/Core.v37.package/UUID.class/properties.json b/repository/Core.v37.package/UUID.class/properties.json
index fe3ff400..0b1f4ecb 100644
--- a/repository/Core.v37.package/UUID.class/properties.json
+++ b/repository/Core.v37.package/UUID.class/properties.json
@@ -1,14 +1,13 @@
 {
+       "commentStamp" : "",
+       "super" : "ByteArray",
        "category" : "Core-Squeak",
-       "classinstvars" : [
-                ],
+       "classinstvars" : [ ],
+       "pools" : [ ],
        "classvars" : [
-               "GeneratorClass" ],
-       "commentStamp" : "",
-       "instvars" : [
-                ],
+               "GeneratorClass"
+       ],
+       "instvars" : [ ],
        "name" : "UUID",
-       "pools" : [
-                ],
-       "super" : "ByteArray",
-       "type" : "bytes" }
+       "type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
index 6b116819..9ddeabb6 100644
--- a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
+++ b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
@@ -1,14 +1,11 @@
 {
-       "category" : "GsSqueakCommon-Core",
-       "classinstvars" : [
-                ],
-       "classvars" : [
-                ],
        "commentStamp" : "",
-       "instvars" : [
-                ],
-       "name" : "Stack",
-       "pools" : [
-                ],
        "super" : "OrderedCollection",
-       "type" : "variable" }
+       "category" : "GsSqueakCommon-Core",
+       "classinstvars" : [ ],
+       "pools" : [ ],
+       "classvars" : [ ],
+       "instvars" : [ ],
+       "name" : "Stack",
+       "type" : "normal"
+}
\ No newline at end of file
(END)
        "classvars" : [
-               "GeneratorClass" ],
-       "commentStamp" : "",
-       "instvars" : [
-                ],
+               "GeneratorClass"
+       ],
+       "instvars" : [ ],
        "name" : "UUID",
-       "pools" : [
-                ],
-       "super" : "ByteArray",
-       "type" : "bytes" }
+       "type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
index 6b116819..9ddeabb6 100644
--- a/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
+++ b/repository/GsSqueakCommon-Core.package/Stack.class/properties.json
@@ -1,14 +1,11 @@
 {
-       "category" : "GsSqueakCommon-Core",
-       "classinstvars" : [
-                ],
-       "classvars" : [
-                ],
        "commentStamp" : "",
-       "instvars" : [
-                ],
-       "name" : "Stack",
-       "pools" : [
-                ],
        "super" : "OrderedCollection",
-       "type" : "variable" }
+       "category" : "GsSqueakCommon-Core",
+       "classinstvars" : [ ],
+       "pools" : [ ],
+       "classvars" : [ ],
+       "instvars" : [ ],
+       "name" : "Stack",
+       "type" : "normal"
+}
\ No newline at end of file
dalehenrich commented 6 months ago

These changes show up in tode, glass, and Grease ...