From e5146249618e153171591923b0b87fd2dc1f40ac Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 29 Oct 2018 17:55:29 +0100 Subject: [PATCH 001/170] U work? --- .filetree | 2 ++ LBGitTests.package/.filetree | 4 ++++ LBGitTests.package/LBGitTestClass.class/README.md | 0 .../LBGitTestClass.class/class/newWithFoo..st | 5 +++++ .../LBGitTestClass.class/instance/bar..st | 4 ++++ .../LBGitTestClass.class/instance/bar.st | 4 ++++ .../LBGitTestClass.class/instance/foo..st | 4 ++++ .../LBGitTestClass.class/instance/foo.st | 4 ++++ .../LBGitTestClass.class/methodProperties.json | 8 ++++++++ .../LBGitTestClass.class/properties.json | 15 +++++++++++++++ LBGitTests.package/monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 LBGitTests.package/monticello.meta/package | 1 + LBGitTests.package/monticello.meta/version | 1 + LBGitTests.package/properties.json | 2 ++ aFile.txt | 0 16 files changed, 55 insertions(+) create mode 100644 .filetree create mode 100644 LBGitTests.package/.filetree create mode 100644 LBGitTests.package/LBGitTestClass.class/README.md create mode 100644 LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar.st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo.st create mode 100644 LBGitTests.package/LBGitTestClass.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitTestClass.class/properties.json create mode 100644 LBGitTests.package/monticello.meta/categories.st create mode 100644 LBGitTests.package/monticello.meta/initializers.st create mode 100644 LBGitTests.package/monticello.meta/package create mode 100644 LBGitTests.package/monticello.meta/version create mode 100644 LBGitTests.package/properties.json create mode 100644 aFile.txt diff --git a/.filetree b/.filetree new file mode 100644 index 000000000..1616d042c --- /dev/null +++ b/.filetree @@ -0,0 +1,2 @@ +{"propertyFileExtension" : ".json", +"packageExtension" : ".package" } \ No newline at end of file diff --git a/LBGitTests.package/.filetree b/LBGitTests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/LBGitTests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/LBGitTests.package/LBGitTestClass.class/README.md b/LBGitTests.package/LBGitTestClass.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st new file mode 100644 index 000000000..bbdb65107 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st @@ -0,0 +1,5 @@ +as yet unclassified +newWithFoo: aBar + + ^ self new + foo: aBar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar..st b/LBGitTests.package/LBGitTestClass.class/instance/bar..st new file mode 100644 index 000000000..0e6e9cb79 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/bar..st @@ -0,0 +1,4 @@ +accessing +bar: anObject + + bar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar.st b/LBGitTests.package/LBGitTestClass.class/instance/bar.st new file mode 100644 index 000000000..2565d11d7 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/bar.st @@ -0,0 +1,4 @@ +accessing +bar + + ^ bar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st new file mode 100644 index 000000000..7b9989ef8 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo..st @@ -0,0 +1,4 @@ +accessing +foo: anObject + + foo := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo.st b/LBGitTests.package/LBGitTestClass.class/instance/foo.st new file mode 100644 index 000000000..a3edf1751 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo.st @@ -0,0 +1,4 @@ +accessing +foo + + ^ foo \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/methodProperties.json b/LBGitTests.package/LBGitTestClass.class/methodProperties.json new file mode 100644 index 000000000..64b29cc0c --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "newWithFoo:" : "LB 10/29/2018 17:52" }, + "instance" : { + "bar" : "LB 10/29/2018 17:52", + "bar:" : "LB 10/29/2018 17:52", + "foo" : "LB 10/29/2018 17:52", + "foo:" : "LB 10/29/2018 17:52" } } diff --git a/LBGitTests.package/LBGitTestClass.class/properties.json b/LBGitTests.package/LBGitTestClass.class/properties.json new file mode 100644 index 000000000..04963c3b2 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + "static" ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "foo", + "bar" ], + "name" : "LBGitTestClass", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/monticello.meta/categories.st b/LBGitTests.package/monticello.meta/categories.st new file mode 100644 index 000000000..9b204d6b5 --- /dev/null +++ b/LBGitTests.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #LBGitTests! diff --git a/LBGitTests.package/monticello.meta/initializers.st b/LBGitTests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/monticello.meta/package b/LBGitTests.package/monticello.meta/package new file mode 100644 index 000000000..1de3e788a --- /dev/null +++ b/LBGitTests.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'LBGitTests') \ No newline at end of file diff --git a/LBGitTests.package/monticello.meta/version b/LBGitTests.package/monticello.meta/version new file mode 100644 index 000000000..cada80414 --- /dev/null +++ b/LBGitTests.package/monticello.meta/version @@ -0,0 +1 @@ +(name 'LBGitTests-LB.1' message 'Super duper commit' id 'f4a7e01e-82c2-0547-91fa-8370249c3110' date '29 October 2018' time '5:54:29.840336 pm' author 'LB' ancestors () stepChildren ()) \ No newline at end of file diff --git a/LBGitTests.package/properties.json b/LBGitTests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/LBGitTests.package/properties.json @@ -0,0 +1,2 @@ +{ + } diff --git a/aFile.txt b/aFile.txt new file mode 100644 index 000000000..e69de29bb From e6fc35a25c9e4f94aa277c9bfb620e899835d295 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 29 Oct 2018 17:57:51 +0100 Subject: [PATCH 002/170] Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..e1e133e75 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# SmalltalkGitTesting From 052c308b8844c6d78908258a609110e7959d1630 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 29 Oct 2018 17:59:49 +0100 Subject: [PATCH 003/170] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e1e133e75..396c420c2 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # SmalltalkGitTesting +I added a line to the readme. From 49bf0ab81edfef9f50c329847a4d697a48ffbd2a Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 29 Oct 2018 18:00:33 +0100 Subject: [PATCH 004/170] revert? --- LBGitTests.package/monticello.meta/version | 2 +- README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/LBGitTests.package/monticello.meta/version b/LBGitTests.package/monticello.meta/version index cada80414..cc106e474 100644 --- a/LBGitTests.package/monticello.meta/version +++ b/LBGitTests.package/monticello.meta/version @@ -1 +1 @@ -(name 'LBGitTests-LB.1' message 'Super duper commit' id 'f4a7e01e-82c2-0547-91fa-8370249c3110' date '29 October 2018' time '5:54:29.840336 pm' author 'LB' ancestors () stepChildren ()) \ No newline at end of file +(name 'LBGitTests-LB.2' message 'empty' id '7704d208-a693-304d-a119-287ad83b5375' date '29 October 2018' time '5:58:19.935336 pm' author 'LB' ancestors ((name 'LBGitTests-LB.1' message 'Super duper commit' id 'f4a7e01e-82c2-0547-91fa-8370249c3110' date '29 October 2018' time '5:54:29.840336 pm' author 'LB' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/README.md b/README.md index 396c420c2..e1e133e75 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ # SmalltalkGitTesting -I added a line to the readme. From 1343c8c3812f53f44a4abc884499ff51cdab1bd9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 29 Oct 2018 18:08:10 +0100 Subject: [PATCH 005/170] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e1e133e75..ea162d817 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # SmalltalkGitTesting +Add line again From 8a73010567a511abef5b2b2033409713381c1625 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 29 Oct 2018 18:13:06 +0100 Subject: [PATCH 006/170] Update readme again --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ea162d817..62fd5521f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # SmalltalkGitTesting Add line again +Another line From f787cefb5bccd2157d583f6951653a7dfbaa4a83 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 29 Oct 2018 18:19:55 +0100 Subject: [PATCH 007/170] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 62fd5521f..ead5f44c8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # SmalltalkGitTesting Add line again Another line +* Line three From b4b8e07fa4007e572e0ce32b7e7a58a8c9699cd8 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 30 Oct 2018 10:52:55 +0100 Subject: [PATCH 008/170] Update foo..st --- LBGitTests.package/LBGitTestClass.class/instance/foo..st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st index 7b9989ef8..d959e0c4d 100644 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo..st +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo..st @@ -1,4 +1,4 @@ accessing -foo: anObject +foo: aFoo - foo := anObject. \ No newline at end of file + foo := aFoo. From 0ef9c52972c09faea5680533d84785645b9d9372 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 31 Oct 2018 20:12:59 +0100 Subject: [PATCH 009/170] Create newFile.txt --- newFile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newFile.txt diff --git a/newFile.txt b/newFile.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/newFile.txt @@ -0,0 +1 @@ + From 2d796c1ef1d9684f95ee65a4b6c52c97ea5dc8dc Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 31 Oct 2018 20:23:58 +0100 Subject: [PATCH 010/170] Update newFile.txt --- newFile.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/newFile.txt b/newFile.txt index 8b1378917..6c2f85dd3 100644 --- a/newFile.txt +++ b/newFile.txt @@ -1 +1,3 @@ - +This content +shall be +recognizable From 6059aec63e6ac5db768a0131cc64bf9fae00510e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 31 Oct 2018 20:49:20 +0100 Subject: [PATCH 011/170] Create aVeryRecognizableFile.txt --- aVeryRecognizableFile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 aVeryRecognizableFile.txt diff --git a/aVeryRecognizableFile.txt b/aVeryRecognizableFile.txt new file mode 100644 index 000000000..4eaa6ccf1 --- /dev/null +++ b/aVeryRecognizableFile.txt @@ -0,0 +1 @@ +I contain pFhfDaSsd483 From 72cdddd276d39501a5fe389a257af96d0493dc51 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 31 Oct 2018 21:47:11 +0100 Subject: [PATCH 012/170] Update aVeryRecognizableFile.txt --- aVeryRecognizableFile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/aVeryRecognizableFile.txt b/aVeryRecognizableFile.txt index 4eaa6ccf1..da7de635e 100644 --- a/aVeryRecognizableFile.txt +++ b/aVeryRecognizableFile.txt @@ -1 +1,2 @@ I contain pFhfDaSsd483 +I was edited From b32469ceea1b2abd62314e80ca3159aa8bf20fd5 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 10:29:02 +0100 Subject: [PATCH 013/170] Create thisIsNoOverwrite.md --- thisIsNoOverwrite.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 thisIsNoOverwrite.md diff --git a/thisIsNoOverwrite.md b/thisIsNoOverwrite.md new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/thisIsNoOverwrite.md @@ -0,0 +1 @@ + From 40bd1d3585f74661a434d76208a0d4ed5d2560ad Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 10:29:23 +0100 Subject: [PATCH 014/170] Update aVeryRecognizableFile.txt --- aVeryRecognizableFile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/aVeryRecognizableFile.txt b/aVeryRecognizableFile.txt index da7de635e..98764b65e 100644 --- a/aVeryRecognizableFile.txt +++ b/aVeryRecognizableFile.txt @@ -1,2 +1,3 @@ I contain pFhfDaSsd483 I was edited +thisIsNoOverwrite.dasadsd From a73794b48205cd88664133e4e7894f465c4ca18c Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 17:19:24 +0100 Subject: [PATCH 015/170] Commit another I want --- aFile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/aFile.txt b/aFile.txt index e69de29bb..7d74a8ab7 100644 --- a/aFile.txt +++ b/aFile.txt @@ -0,0 +1 @@ +I just want another commit. From 249bc75271155773de93a0635c955a80d0f7e976 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 17:32:23 +0100 Subject: [PATCH 016/170] Plus commit --- aFile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aFile.txt b/aFile.txt index 7d74a8ab7..3793b7cdb 100644 --- a/aFile.txt +++ b/aFile.txt @@ -1 +1 @@ -I just want another commit. +More commits. From 38396bd7c663aacd1f31242017ab5aa70c103ba1 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 18:05:29 +0100 Subject: [PATCH 017/170] Create cheating.package --- cheating.package | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 cheating.package diff --git a/cheating.package b/cheating.package new file mode 100644 index 000000000..bccb61900 --- /dev/null +++ b/cheating.package @@ -0,0 +1,2 @@ +This is no correct package!! +asdfsa From 8761240e543fdde022717456af5622d344b69ef8 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 1 Nov 2018 18:15:48 +0100 Subject: [PATCH 018/170] Delete cheating.package --- cheating.package | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 cheating.package diff --git a/cheating.package b/cheating.package deleted file mode 100644 index bccb61900..000000000 --- a/cheating.package +++ /dev/null @@ -1,2 +0,0 @@ -This is no correct package!! -asdfsa From f89a8d557b10613d0cd2c6604590084ebdfdd74c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 11:31:03 +0100 Subject: [PATCH 019/170] Added second test class --- .squot | 3 +++ LBGitTests.package/.squot-contents | 4 ++++ LBGitTests.package/LBGTCNumeroDos.class/README.md | 0 .../LBGTCNumeroDos.class/instance/boar..st | 4 ++++ .../LBGTCNumeroDos.class/instance/boar.st | 4 ++++ .../LBGTCNumeroDos.class/instance/fee..st | 4 ++++ .../LBGTCNumeroDos.class/instance/fee.st | 4 ++++ .../LBGTCNumeroDos.class/methodProperties.json | 8 ++++++++ .../LBGTCNumeroDos.class/properties.json | 15 +++++++++++++++ LBGitTests.package/monticello.meta/package | 1 - LBGitTests.package/monticello.meta/version | 1 - 11 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 .squot create mode 100644 LBGitTests.package/.squot-contents create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/README.md create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/properties.json delete mode 100644 LBGitTests.package/monticello.meta/package delete mode 100644 LBGitTests.package/monticello.meta/version diff --git a/.squot b/.squot new file mode 100644 index 000000000..c664d34d7 --- /dev/null +++ b/.squot @@ -0,0 +1,3 @@ +OrderedDictionary { + 'LBGitTests.package' : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/LBGitTests.package/.squot-contents b/LBGitTests.package/.squot-contents new file mode 100644 index 000000000..3f40cf5f9 --- /dev/null +++ b/LBGitTests.package/.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #serializer : #SquotCypressCodeSerializer, + #objectClassName : #PackageInfo +} \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/README.md b/LBGitTests.package/LBGTCNumeroDos.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st new file mode 100644 index 000000000..6f0b81ec1 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st @@ -0,0 +1,4 @@ +accessing +boar: anObject + + boar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st new file mode 100644 index 000000000..819733fa2 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st @@ -0,0 +1,4 @@ +accessing +boar + + ^ boar \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st new file mode 100644 index 000000000..2cef768d7 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st @@ -0,0 +1,4 @@ +accessing +fee: anObject + + fee := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st new file mode 100644 index 000000000..4525b6127 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st @@ -0,0 +1,4 @@ +accessing +fee + + ^ fee \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json new file mode 100644 index 000000000..497c8ec3a --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + }, + "instance" : { + "boar" : "LB 11/10/2018 11:29", + "boar:" : "LB 11/10/2018 11:29", + "fee" : "LB 11/10/2018 11:29", + "fee:" : "LB 11/10/2018 11:29" } } diff --git a/LBGitTests.package/LBGTCNumeroDos.class/properties.json b/LBGitTests.package/LBGTCNumeroDos.class/properties.json new file mode 100644 index 000000000..18e617c80 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "fee", + "boar" ], + "name" : "LBGTCNumeroDos", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/monticello.meta/package b/LBGitTests.package/monticello.meta/package deleted file mode 100644 index 1de3e788a..000000000 --- a/LBGitTests.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'LBGitTests') \ No newline at end of file diff --git a/LBGitTests.package/monticello.meta/version b/LBGitTests.package/monticello.meta/version deleted file mode 100644 index cc106e474..000000000 --- a/LBGitTests.package/monticello.meta/version +++ /dev/null @@ -1 +0,0 @@ -(name 'LBGitTests-LB.2' message 'empty' id '7704d208-a693-304d-a119-287ad83b5375' date '29 October 2018' time '5:58:19.935336 pm' author 'LB' ancestors ((name 'LBGitTests-LB.1' message 'Super duper commit' id 'f4a7e01e-82c2-0547-91fa-8370249c3110' date '29 October 2018' time '5:54:29.840336 pm' author 'LB' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file From a78ae6e2a7799a33fcd71c44f7dee326222f4eab Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 12:26:48 +0100 Subject: [PATCH 020/170] Added aFile.txt --- .aFile.txt.squot-contents | 4 ++++ .squot | 4 +++- LBGitTests.package/LBGitFileInfo.class/README.md | 0 .../instance/browseFromSquot..st | 4 ++++ .../instance/captureWithSquot..st | 4 ++++ .../instance/captureWithSquot.st | 4 ++++ .../instance/squotAddTransientStoreInfoTo..st | 4 ++++ .../squotRemoveTransientStoreInfoFrom..st | 4 ++++ .../instance/squotShadowFactory.st | 4 ++++ .../instance/squotShouldKeepIdentity.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 11 +++++++++++ .../LBGitFileInfo.class/properties.json | 14 ++++++++++++++ .../LBGitFileShadow.class/README.md | 0 .../instance/squotPreferredSerializer.st | 5 +++++ .../LBGitFileShadow.class/methodProperties.json | 5 +++++ .../LBGitFileShadow.class/properties.json | 16 ++++++++++++++++ .../LBGitTestClass.class/instance/foo..st | 4 ++-- .../LBGitTestClass.class/methodProperties.json | 2 +- LBOtherGitTests.package/.filetree | 4 ++++ LBOtherGitTests.package/.squot-contents | 5 +++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 LBOtherGitTests.package/properties.json | 2 ++ aFile.txt | 2 +- 24 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 .aFile.txt.squot-contents create mode 100644 LBGitTests.package/LBGitFileInfo.class/README.md create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileInfo.class/properties.json create mode 100644 LBGitTests.package/LBGitFileShadow.class/README.md create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileShadow.class/properties.json create mode 100644 LBOtherGitTests.package/.filetree create mode 100644 LBOtherGitTests.package/.squot-contents create mode 100644 LBOtherGitTests.package/monticello.meta/categories.st create mode 100644 LBOtherGitTests.package/monticello.meta/initializers.st create mode 100644 LBOtherGitTests.package/properties.json diff --git a/.aFile.txt.squot-contents b/.aFile.txt.squot-contents new file mode 100644 index 000000000..fa105e049 --- /dev/null +++ b/.aFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #SquotTextFileCodec +} \ No newline at end of file diff --git a/.squot b/.squot index c664d34d7..d038b72a6 100644 --- a/.squot +++ b/.squot @@ -1,3 +1,5 @@ OrderedDictionary { - 'LBGitTests.package' : #SquotCypressCodeSerializer + 'LBGitTests.package' : #SquotCypressCodeSerializer, + 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, + 'aFile.txt' : #SquotTextFileCodec } \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/README.md b/LBGitTests.package/LBGitFileInfo.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st new file mode 100644 index 000000000..c580153ae --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +browseFromSquot: aSquotLiveObject + + self shouldBeImplemented. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st new file mode 100644 index 000000000..cd2676963 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot: aCapturer + + ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st new file mode 100644 index 000000000..0fb6842cf --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot + + ^ self squotShadowFactory new \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st new file mode 100644 index 000000000..62db22e86 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st @@ -0,0 +1,4 @@ +as yet unclassified +squotAddTransientStoreInfoTo: aTrackableObjectMetadata + + self flag: #TODO. "What does it do?" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st new file mode 100644 index 000000000..af53bdb2e --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st @@ -0,0 +1,4 @@ +as yet unclassified +squotRemoveTransientStoreInfoFrom: aDictionary + + self shouldBeImplemented. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st new file mode 100644 index 000000000..92de5ef7e --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShadowFactory + + ^ LBGitFileShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st new file mode 100644 index 000000000..026d9db0c --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShouldKeepIdentity + + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json new file mode 100644 index 000000000..91f362465 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -0,0 +1,11 @@ +{ + "class" : { + }, + "instance" : { + "browseFromSquot:" : "LB 11/10/2018 12:00", + "captureWithSquot" : "LB 11/10/2018 12:19", + "captureWithSquot:" : "LB 11/10/2018 12:14", + "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", + "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:00", + "squotShadowFactory" : "LB 11/10/2018 12:18", + "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json new file mode 100644 index 000000000..5a8d1cca0 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileInfo", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileShadow.class/README.md b/LBGitTests.package/LBGitFileShadow.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st new file mode 100644 index 000000000..0bcb2f43c --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st @@ -0,0 +1,5 @@ +Squot-shadow +squotPreferredSerializer + + self flag: #TODO. "Make own serializer one day". + ^ SquotTextFileCodec \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json new file mode 100644 index 000000000..7bfd370b8 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "squotPreferredSerializer" : "LB 11/10/2018 12:25" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json new file mode 100644 index 000000000..ba835d244 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotDiffableShadow classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileShadow", + "pools" : [ + ], + "super" : "Object", + "traitcomposition" : "TSquotDiffableShadow", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st index d959e0c4d..f179a17cf 100644 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo..st +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo..st @@ -1,4 +1,4 @@ accessing -foo: aFoo +foo: aFo - foo := aFoo. + foo := aFo. diff --git a/LBGitTests.package/LBGitTestClass.class/methodProperties.json b/LBGitTests.package/LBGitTestClass.class/methodProperties.json index 64b29cc0c..1933e0bd2 100644 --- a/LBGitTests.package/LBGitTestClass.class/methodProperties.json +++ b/LBGitTests.package/LBGitTestClass.class/methodProperties.json @@ -5,4 +5,4 @@ "bar" : "LB 10/29/2018 17:52", "bar:" : "LB 10/29/2018 17:52", "foo" : "LB 10/29/2018 17:52", - "foo:" : "LB 10/29/2018 17:52" } } + "foo:" : "LB 10/30/2018 10:53" } } diff --git a/LBOtherGitTests.package/.filetree b/LBOtherGitTests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/LBOtherGitTests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/LBOtherGitTests.package/.squot-contents b/LBOtherGitTests.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/LBOtherGitTests.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/LBOtherGitTests.package/monticello.meta/categories.st b/LBOtherGitTests.package/monticello.meta/categories.st new file mode 100644 index 000000000..87aca10a0 --- /dev/null +++ b/LBOtherGitTests.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #LBOtherGitTests! diff --git a/LBOtherGitTests.package/monticello.meta/initializers.st b/LBOtherGitTests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/LBOtherGitTests.package/properties.json b/LBOtherGitTests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/LBOtherGitTests.package/properties.json @@ -0,0 +1,2 @@ +{ + } diff --git a/aFile.txt b/aFile.txt index 3793b7cdb..62419b50e 100644 --- a/aFile.txt +++ b/aFile.txt @@ -1 +1 @@ -More commits. +I uploaded text stuff from git \ No newline at end of file From b593f683749b4d4d6e66d4a662eb8bfa2d8a02d9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 12:38:22 +0100 Subject: [PATCH 021/170] Update aFile.txt --- aFile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aFile.txt b/aFile.txt index 62419b50e..53ca066af 100644 --- a/aFile.txt +++ b/aFile.txt @@ -1 +1 @@ -I uploaded text stuff from git \ No newline at end of file +I downloaded text stuff from git From 596b11896951f69c589f642bdd26500bfbc118b0 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:08:30 +0100 Subject: [PATCH 022/170] Added diff and stuff --- LBGitTests.package/LBGitDiff.class/README.md | 0 .../LBGitDiff.class/instance/left..st | 4 ++++ .../LBGitDiff.class/instance/left.st | 4 ++++ .../LBGitDiff.class/instance/right..st | 4 ++++ .../LBGitDiff.class/instance/right.st | 4 ++++ .../LBGitDiff.class/instance/squotHasChanges.st | 4 ++++ .../instance/squotHasConflicts.st | 4 ++++ .../LBGitDiff.class/methodProperties.json | 10 ++++++++++ .../LBGitDiff.class/properties.json | 17 +++++++++++++++++ .../squotRemoveTransientStoreInfoFrom..st | 4 ++-- .../LBGitFileInfo.class/methodProperties.json | 2 +- .../LBGitFileShadow.class/instance/content.st | 4 ++++ .../instance/squotDiffAgainst.with..st | 6 ++++++ .../instance/squotDiffAgainst.withBase.with..st | 4 ++++ .../LBGitFileShadow.class/instance/writeTo..st | 3 +++ .../LBGitFileShadow.class/methodProperties.json | 6 +++++- .../LBGitFileShadow.class/properties.json | 2 +- aFile.txt | 2 +- 18 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 LBGitTests.package/LBGitDiff.class/README.md create mode 100644 LBGitTests.package/LBGitDiff.class/instance/left..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/left.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/right..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/right.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st create mode 100644 LBGitTests.package/LBGitDiff.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitDiff.class/properties.json create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st diff --git a/LBGitTests.package/LBGitDiff.class/README.md b/LBGitTests.package/LBGitDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitDiff.class/instance/left..st b/LBGitTests.package/LBGitDiff.class/instance/left..st new file mode 100644 index 000000000..b701cc139 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/left..st @@ -0,0 +1,4 @@ +accessing +left: anObject + + left := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left.st b/LBGitTests.package/LBGitDiff.class/instance/left.st new file mode 100644 index 000000000..7a159c36d --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/left.st @@ -0,0 +1,4 @@ +accessing +left + + ^ left \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right..st b/LBGitTests.package/LBGitDiff.class/instance/right..st new file mode 100644 index 000000000..9e650c91e --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/right..st @@ -0,0 +1,4 @@ +accessing +right: anObject + + right := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right.st b/LBGitTests.package/LBGitDiff.class/instance/right.st new file mode 100644 index 000000000..85787af13 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/right.st @@ -0,0 +1,4 @@ +accessing +right + + ^ right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st new file mode 100644 index 000000000..8692b8936 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasChanges + "Answer false if the two compared objects were equal, answer true if there were diffs." + ^ self left content = self right content \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st new file mode 100644 index 000000000..77972d642 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasConflicts + "Answer whether a choice must be made before this can be applied to something." + ^ self squotHasChanges \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json new file mode 100644 index 000000000..80c285ed1 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + }, + "instance" : { + "left" : "LB 11/10/2018 13:00", + "left:" : "LB 11/10/2018 13:00", + "right" : "LB 11/10/2018 13:00", + "right:" : "LB 11/10/2018 13:00", + "squotHasChanges" : "LB 11/10/2018 13:01", + "squotHasConflicts" : "LB 11/10/2018 13:01" } } diff --git a/LBGitTests.package/LBGitDiff.class/properties.json b/LBGitTests.package/LBGitDiff.class/properties.json new file mode 100644 index 000000000..b2b3d7baf --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotDiff classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "left", + "right" ], + "name" : "LBGitDiff", + "pools" : [ + ], + "super" : "Object", + "traitcomposition" : "TSquotDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st index af53bdb2e..de82a5bdc 100644 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st @@ -1,4 +1,4 @@ as yet unclassified squotRemoveTransientStoreInfoFrom: aDictionary - - self shouldBeImplemented. \ No newline at end of file + + self flag: #TODO. "What does it do?". \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 91f362465..63c14ed1a 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -6,6 +6,6 @@ "captureWithSquot" : "LB 11/10/2018 12:19", "captureWithSquot:" : "LB 11/10/2018 12:14", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", - "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:00", + "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st new file mode 100644 index 000000000..e15467953 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -0,0 +1,4 @@ +as yet unclassified +content + + ^ content ifNil: [content := ''] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st new file mode 100644 index 000000000..fb2b5ef59 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -0,0 +1,6 @@ +Squot-shadow-diffing +squotDiffAgainst: otherShadow with: aDiffBuilder + "Answer an object that describes the differences between me and otherContent." + ^ aDiffBuilder diffFrom: self to: otherShadow + ifNew: [LBGitDiff new left: self; right: otherShadow.] + andInitialize: [:diff | diff diff: self against: otherShadow with: aDiffBuilder] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st new file mode 100644 index 000000000..ab99dee99 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st @@ -0,0 +1,4 @@ +Squot-shadow-diffing +squotDiffAgainst: otherShadow withBase: baseShadow with: aDiffBuilder + "Answer an object that describes the merge between me and otherContent based on baseContent." + ^ self squotDiffAgainst: otherShadow with: aDiffBuilder \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st new file mode 100644 index 000000000..42fd7720b --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st @@ -0,0 +1,3 @@ +as yet unclassified +writeTo: aStream + aStream nextPutAll: 'I uploaded text stuff from git'. self flag: #TODO. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 7bfd370b8..86c2e39fb 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -2,4 +2,8 @@ "class" : { }, "instance" : { - "squotPreferredSerializer" : "LB 11/10/2018 12:25" } } + "content" : "LB 11/10/2018 12:41", + "squotDiffAgainst:with:" : "LB 11/10/2018 13:07", + "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", + "squotPreferredSerializer" : "LB 11/10/2018 12:25", + "writeTo:" : "LB 11/10/2018 12:31" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index ba835d244..3669456fd 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -7,7 +7,7 @@ ], "commentStamp" : "", "instvars" : [ - ], + "content" ], "name" : "LBGitFileShadow", "pools" : [ ], diff --git a/aFile.txt b/aFile.txt index 53ca066af..62419b50e 100644 --- a/aFile.txt +++ b/aFile.txt @@ -1 +1 @@ -I downloaded text stuff from git +I uploaded text stuff from git \ No newline at end of file From 4173f322c0c930b179657e76dcaab689917d30eb Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:12:54 +0100 Subject: [PATCH 023/170] See --- LBGitTests.package/LBGitFileShadow.class/instance/value.st | 4 ++++ .../LBGitFileShadow.class/methodProperties.json | 1 + 2 files changed, 5 insertions(+) create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/value.st diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/value.st b/LBGitTests.package/LBGitFileShadow.class/instance/value.st new file mode 100644 index 000000000..323347cb2 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/value.st @@ -0,0 +1,4 @@ +as yet unclassified +value + + ^ self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 86c2e39fb..38682766d 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -6,4 +6,5 @@ "squotDiffAgainst:with:" : "LB 11/10/2018 13:07", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", "squotPreferredSerializer" : "LB 11/10/2018 12:25", + "value" : "LB 11/10/2018 13:09", "writeTo:" : "LB 11/10/2018 12:31" } } From e5e6e12e4853df0c03de651765d855c04f4ad0b8 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:26:51 +0100 Subject: [PATCH 024/170] Errr --- LBGitTests.package/LBGitFileShadow.class/instance/content..st | 4 ++++ .../LBGitFileShadow.class/instance/squotDiffAgainst.with..st | 2 +- .../LBGitFileShadow.class/methodProperties.json | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content..st diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st new file mode 100644 index 000000000..e62a976db --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -0,0 +1,4 @@ +as yet unclassified +content: aByteArray + + content := aByteArray. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st index fb2b5ef59..4961a536f 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -3,4 +3,4 @@ squotDiffAgainst: otherShadow with: aDiffBuilder "Answer an object that describes the differences between me and otherContent." ^ aDiffBuilder diffFrom: self to: otherShadow ifNew: [LBGitDiff new left: self; right: otherShadow.] - andInitialize: [:diff | diff diff: self against: otherShadow with: aDiffBuilder] \ No newline at end of file + andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 38682766d..8cf36ab99 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -3,7 +3,8 @@ }, "instance" : { "content" : "LB 11/10/2018 12:41", - "squotDiffAgainst:with:" : "LB 11/10/2018 13:07", + "content:" : "LB 11/10/2018 13:14", + "squotDiffAgainst:with:" : "LB 11/10/2018 13:12", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", "squotPreferredSerializer" : "LB 11/10/2018 12:25", "value" : "LB 11/10/2018 13:09", From 899d983395097124787437d11884357f691469f7 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:29:59 +0100 Subject: [PATCH 025/170] Next --- .../LBGitDiff.class/instance/squotHasChanges.st | 2 +- LBGitTests.package/LBGitDiff.class/methodProperties.json | 2 +- .../LBGitFileShadow.class/instance/squotDiffAgainst.with..st | 2 +- .../instance/squotWith.diffFromSequence..st | 4 ++++ .../LBGitFileShadow.class/instance/writeTo..st | 2 +- .../LBGitFileShadow.class/methodProperties.json | 5 +++-- 6 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st index 8692b8936..a261cc255 100644 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st @@ -1,4 +1,4 @@ Squot-diff-testing squotHasChanges "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self left content = self right content \ No newline at end of file + ^ self left = self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json index 80c285ed1..5e93e5e30 100644 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -6,5 +6,5 @@ "left:" : "LB 11/10/2018 13:00", "right" : "LB 11/10/2018 13:00", "right:" : "LB 11/10/2018 13:00", - "squotHasChanges" : "LB 11/10/2018 13:01", + "squotHasChanges" : "LB 11/10/2018 13:26", "squotHasConflicts" : "LB 11/10/2018 13:01" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st index 4961a536f..5124065c9 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -2,5 +2,5 @@ Squot-shadow-diffing squotDiffAgainst: otherShadow with: aDiffBuilder "Answer an object that describes the differences between me and otherContent." ^ aDiffBuilder diffFrom: self to: otherShadow - ifNew: [LBGitDiff new left: self; right: otherShadow.] + ifNew: [LBGitDiff new left: self content; right: otherShadow content.] andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st new file mode 100644 index 000000000..cb274bde7 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st @@ -0,0 +1,4 @@ +as yet unclassified +squotWith: aDiffBuilder diffFromSequence: leftSequence + + ^ LBGitDiff new left: leftSequence; right: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st index 42fd7720b..10e0a12a6 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st @@ -1,3 +1,3 @@ as yet unclassified writeTo: aStream - aStream nextPutAll: 'I uploaded text stuff from git'. self flag: #TODO. \ No newline at end of file + aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 8cf36ab99..584af4dd6 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -4,8 +4,9 @@ "instance" : { "content" : "LB 11/10/2018 12:41", "content:" : "LB 11/10/2018 13:14", - "squotDiffAgainst:with:" : "LB 11/10/2018 13:12", + "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", "squotPreferredSerializer" : "LB 11/10/2018 12:25", + "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", - "writeTo:" : "LB 11/10/2018 12:31" } } + "writeTo:" : "LB 11/10/2018 13:29" } } From 2c497e23174e27c1824a3a84f078b4d3c12260c0 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:42:03 +0100 Subject: [PATCH 026/170] Serializer --- .../instance/squotPreferredSerializer.st | 3 +-- .../LBGitFileShadow.class/methodProperties.json | 2 +- .../LBGitSerializer.class/README.md | 0 .../instance/fillContentOf.from..st | 7 +++++++ .../LBGitSerializer.class/instance/version.st | 4 ++++ .../LBGitSerializer.class/instance/write..st | 4 ++++ .../LBGitSerializer.class/methodProperties.json | 7 +++++++ .../LBGitSerializer.class/properties.json | 16 ++++++++++++++++ 8 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 LBGitTests.package/LBGitSerializer.class/README.md create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/version.st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/write..st create mode 100644 LBGitTests.package/LBGitSerializer.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitSerializer.class/properties.json diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st index 0bcb2f43c..dfaee424a 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st @@ -1,5 +1,4 @@ Squot-shadow squotPreferredSerializer - self flag: #TODO. "Make own serializer one day". - ^ SquotTextFileCodec \ No newline at end of file + ^ LBGitSerializer \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 584af4dd6..8116f0cb0 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -6,7 +6,7 @@ "content:" : "LB 11/10/2018 13:14", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotPreferredSerializer" : "LB 11/10/2018 12:25", + "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", "writeTo:" : "LB 11/10/2018 13:29" } } diff --git a/LBGitTests.package/LBGitSerializer.class/README.md b/LBGitTests.package/LBGitSerializer.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st new file mode 100644 index 000000000..156730c0f --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -0,0 +1,7 @@ +as yet unclassified +fillContentOf: anArtifact from: aFileOrDirectoryReference + + anArtifact content: + (SquotShadowGraph withSingleShadow: + (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]) + captureWithSquot undecorated) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/version.st b/LBGitTests.package/LBGitSerializer.class/instance/version.st new file mode 100644 index 000000000..860f89248 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/version.st @@ -0,0 +1,4 @@ +as yet unclassified +version + + ^ '1.0.0' \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/write..st b/LBGitTests.package/LBGitSerializer.class/instance/write..st new file mode 100644 index 000000000..8d39ba2ac --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/write..st @@ -0,0 +1,4 @@ +as yet unclassified +write: anArtifact + + self atPathOf: anArtifact writeStreamDo: [:stream | anArtifact shadowOfTrackedObject writeTo: stream]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json new file mode 100644 index 000000000..faeb30f1c --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "fillContentOf:from:" : "LB 11/10/2018 13:41", + "version" : "LB 11/10/2018 13:33", + "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/LBGitSerializer.class/properties.json b/LBGitTests.package/LBGitSerializer.class/properties.json new file mode 100644 index 000000000..b8779549c --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotCodec classTrait + TSquotSingleFileSerializer classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitSerializer", + "pools" : [ + ], + "super" : "SquotSerializer", + "traitcomposition" : "TSquotCodec + TSquotSingleFileSerializer", + "type" : "normal" } From 3db0bfbd5f8394c3ceb681475a81e915cae65d32 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:49:30 +0100 Subject: [PATCH 027/170] Remove aFile --- .aFile.txt.squot-contents | 4 ---- .squot | 3 +-- aFile.txt | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 .aFile.txt.squot-contents delete mode 100644 aFile.txt diff --git a/.aFile.txt.squot-contents b/.aFile.txt.squot-contents deleted file mode 100644 index fa105e049..000000000 --- a/.aFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #SquotTextFileCodec -} \ No newline at end of file diff --git a/.squot b/.squot index d038b72a6..c426bff5d 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,4 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, - 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'aFile.txt' : #SquotTextFileCodec + 'LBOtherGitTests.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/aFile.txt b/aFile.txt deleted file mode 100644 index 62419b50e..000000000 --- a/aFile.txt +++ /dev/null @@ -1 +0,0 @@ -I uploaded text stuff from git \ No newline at end of file From dbfc6dd12841bfe34f32d39f3a833ec2aad871f3 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:52:07 +0100 Subject: [PATCH 028/170] Added bFile? --- .squot | 3 ++- bFile.txt/LBGitTests.package/.filetree | 4 ++++ .../LBGitFileInfo.class/.squot-contents | 5 +++++ .../LBGitFileInfo.class/README.md | 0 .../instance/browseFromSquot..st | 4 ++++ .../instance/captureWithSquot..st | 4 ++++ .../instance/captureWithSquot.st | 4 ++++ .../instance/squotAddTransientStoreInfoTo..st | 4 ++++ .../instance/squotRemoveTransientStoreInfoFrom..st | 4 ++++ .../instance/squotShadowFactory.st | 4 ++++ .../instance/squotShouldKeepIdentity.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 11 +++++++++++ .../LBGitFileInfo.class/properties.json | 14 ++++++++++++++ .../monticello.meta/initializers.st | 0 bFile.txt/LBGitTests.package/properties.json | 2 ++ 15 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 bFile.txt/LBGitTests.package/.filetree create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json create mode 100644 bFile.txt/LBGitTests.package/monticello.meta/initializers.st create mode 100644 bFile.txt/LBGitTests.package/properties.json diff --git a/.squot b/.squot index c426bff5d..4701cf8bf 100644 --- a/.squot +++ b/.squot @@ -1,4 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, - 'LBOtherGitTests.package' : #SquotCypressCodeSerializer + 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/.filetree b/bFile.txt/LBGitTests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/bFile.txt/LBGitTests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents new file mode 100644 index 000000000..df48d2dd2 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : 'LBGitFileInfo class', + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st new file mode 100644 index 000000000..c580153ae --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +browseFromSquot: aSquotLiveObject + + self shouldBeImplemented. \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st new file mode 100644 index 000000000..cd2676963 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot: aCapturer + + ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st new file mode 100644 index 000000000..0fb6842cf --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot + + ^ self squotShadowFactory new \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st new file mode 100644 index 000000000..62db22e86 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st @@ -0,0 +1,4 @@ +as yet unclassified +squotAddTransientStoreInfoTo: aTrackableObjectMetadata + + self flag: #TODO. "What does it do?" \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st new file mode 100644 index 000000000..de82a5bdc --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st @@ -0,0 +1,4 @@ +as yet unclassified +squotRemoveTransientStoreInfoFrom: aDictionary + + self flag: #TODO. "What does it do?". \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st new file mode 100644 index 000000000..92de5ef7e --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShadowFactory + + ^ LBGitFileShadow \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st new file mode 100644 index 000000000..026d9db0c --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShouldKeepIdentity + + ^ true \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json new file mode 100644 index 000000000..63c14ed1a --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -0,0 +1,11 @@ +{ + "class" : { + }, + "instance" : { + "browseFromSquot:" : "LB 11/10/2018 12:00", + "captureWithSquot" : "LB 11/10/2018 12:19", + "captureWithSquot:" : "LB 11/10/2018 12:14", + "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", + "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", + "squotShadowFactory" : "LB 11/10/2018 12:18", + "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json new file mode 100644 index 000000000..5a8d1cca0 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileInfo", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/bFile.txt/LBGitTests.package/monticello.meta/initializers.st b/bFile.txt/LBGitTests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/bFile.txt/LBGitTests.package/properties.json b/bFile.txt/LBGitTests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/bFile.txt/LBGitTests.package/properties.json @@ -0,0 +1,2 @@ +{ + } From a36b7608dd72542965490c4999dea856c1d9a851 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 13:56:23 +0100 Subject: [PATCH 029/170] Added cfile --- .cFile.txt.squot-contents | 4 ++++ .squot | 3 ++- cFile.txt | 0 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .cFile.txt.squot-contents create mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents new file mode 100644 index 000000000..5ce3a879f --- /dev/null +++ b/.cFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #LBGitSerializer +} \ No newline at end of file diff --git a/.squot b/.squot index 4701cf8bf..201d3c0ed 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,6 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, + 'cFile.txt' : #LBGitSerializer } \ No newline at end of file diff --git a/cFile.txt b/cFile.txt new file mode 100644 index 000000000..e69de29bb From 921cb08b6ef056e698b774c94be20a8fe8d4676d Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 14:07:49 +0100 Subject: [PATCH 030/170] Enter commit log message here --- .cFile.txt.squot-contents | 4 ---- .squot | 3 +-- .../LBGitSerializer.class/instance/fillContentOf.from..st | 1 + .../LBGitSerializer.class/methodProperties.json | 2 +- cFile.txt | 0 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 .cFile.txt.squot-contents delete mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents deleted file mode 100644 index 5ce3a879f..000000000 --- a/.cFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #LBGitSerializer -} \ No newline at end of file diff --git a/.squot b/.squot index 201d3c0ed..4701cf8bf 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, - 'cFile.txt' : #LBGitSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index 156730c0f..8a09005da 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -1,6 +1,7 @@ as yet unclassified fillContentOf: anArtifact from: aFileOrDirectoryReference + self halt. anArtifact content: (SquotShadowGraph withSingleShadow: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]) diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index faeb30f1c..e48287700 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -2,6 +2,6 @@ "class" : { }, "instance" : { - "fillContentOf:from:" : "LB 11/10/2018 13:41", + "fillContentOf:from:" : "LB 11/10/2018 14:03", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/cFile.txt b/cFile.txt deleted file mode 100644 index e69de29bb..000000000 From cf44a876435e58dd3b897c98c196bb2c379ec56e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 14:08:40 +0100 Subject: [PATCH 031/170] Add c again --- .cFile.txt.squot-contents | 4 ++++ .squot | 3 ++- cFile.txt | 0 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .cFile.txt.squot-contents create mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents new file mode 100644 index 000000000..5ce3a879f --- /dev/null +++ b/.cFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #LBGitSerializer +} \ No newline at end of file diff --git a/.squot b/.squot index 4701cf8bf..201d3c0ed 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,6 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, + 'cFile.txt' : #LBGitSerializer } \ No newline at end of file diff --git a/cFile.txt b/cFile.txt new file mode 100644 index 000000000..e69de29bb From 1dd5ef00426ec56a58bd760c36c69bafea6f2349 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 14:14:03 +0100 Subject: [PATCH 032/170] Update cFile.txt --- cFile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cFile.txt b/cFile.txt index e69de29bb..da7ca3c44 100644 --- a/cFile.txt +++ b/cFile.txt @@ -0,0 +1 @@ +cFile cool content. From 280f3ca4bfa9d7f0278a5a4e0f65b2ad9ccff78c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 14:24:06 +0100 Subject: [PATCH 033/170] Added path to shadow --- LBGitTests.package/LBGitFileInfo.class/class/on..st | 6 ++++++ .../LBGitFileInfo.class/instance/captureWithSquot.st | 2 +- LBGitTests.package/LBGitFileInfo.class/instance/path..st | 4 ++++ LBGitTests.package/LBGitFileInfo.class/instance/path.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 6 ++++-- LBGitTests.package/LBGitFileInfo.class/properties.json | 2 +- LBGitTests.package/LBGitFileShadow.class/class/of..st | 5 +++++ LBGitTests.package/LBGitFileShadow.class/instance/path..st | 4 ++++ LBGitTests.package/LBGitFileShadow.class/instance/path.st | 4 ++++ .../LBGitFileShadow.class/methodProperties.json | 4 +++- LBGitTests.package/LBGitFileShadow.class/properties.json | 3 ++- .../instance/atPathOf.writeStreamDo..st | 5 +++++ .../LBGitSerializer.class/instance/fillContentOf.from..st | 3 +-- .../LBGitSerializer.class/methodProperties.json | 3 ++- .../SquotWorkingCopy.extension/instance/addFile..st | 6 ++++++ .../SquotWorkingCopy.extension/methodProperties.json | 5 +++++ .../SquotWorkingCopy.extension/properties.json | 2 ++ .../LBGitFileInfo.class/instance/captureWithSquot.st | 2 +- .../LBGitFileInfo.class/instance/path..st | 4 ++++ .../LBGitTests.package/LBGitFileInfo.class/instance/path.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 4 +++- .../LBGitTests.package/LBGitFileInfo.class/properties.json | 2 +- 22 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/class/of..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path.st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/properties.json create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on..st b/LBGitTests.package/LBGitFileInfo.class/class/on..st new file mode 100644 index 000000000..97d004153 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/on..st @@ -0,0 +1,6 @@ +as yet unclassified +on: aString + + ^ self new + path: aString; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st index 0fb6842cf..5fc4f558b 100644 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -1,4 +1,4 @@ as yet unclassified captureWithSquot - ^ self squotShadowFactory new \ No newline at end of file + ^ self squotShadowFactory of: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/LBGitTests.package/LBGitFileInfo.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/LBGitTests.package/LBGitFileInfo.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 63c14ed1a..48dbec52e 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,10 +1,12 @@ { "class" : { - }, + "on:" : "LB 11/10/2018 14:18" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/10/2018 12:19", + "captureWithSquot" : "LB 11/10/2018 14:16", "captureWithSquot:" : "LB 11/10/2018 12:14", + "path" : "LB 11/10/2018 14:18", + "path:" : "LB 11/10/2018 14:18", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json index 5a8d1cca0..c4f76173c 100644 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -6,7 +6,7 @@ ], "commentStamp" : "", "instvars" : [ - ], + "path" ], "name" : "LBGitFileInfo", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitFileShadow.class/class/of..st new file mode 100644 index 000000000..b1a524e21 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/class/of..st @@ -0,0 +1,5 @@ +as yet unclassified +of: aFileInfo + + ^ self new + path: aFileInfo path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path..st b/LBGitTests.package/LBGitFileShadow.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path.st b/LBGitTests.package/LBGitFileShadow.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 8116f0cb0..ebc7bd272 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -1,9 +1,11 @@ { "class" : { - }, + "of:" : "LB 11/10/2018 14:22" }, "instance" : { "content" : "LB 11/10/2018 12:41", "content:" : "LB 11/10/2018 13:14", + "path" : "LB 11/10/2018 14:16", + "path:" : "LB 11/10/2018 14:16", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", "squotPreferredSerializer" : "LB 11/10/2018 13:41", diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index 3669456fd..2de2da79a 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -7,7 +7,8 @@ ], "commentStamp" : "", "instvars" : [ - "content" ], + "content", + "path" ], "name" : "LBGitFileShadow", "pools" : [ ], diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st new file mode 100644 index 000000000..bdcaec448 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st @@ -0,0 +1,5 @@ +private +atPathOf: anArtifact writeStreamDo: aBlock + + self halt. + ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index 8a09005da..1501c0429 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -4,5 +4,4 @@ fillContentOf: anArtifact from: aFileOrDirectoryReference self halt. anArtifact content: (SquotShadowGraph withSingleShadow: - (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]) - captureWithSquot undecorated) \ No newline at end of file + (LBGitFileShadow new content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index e48287700..6972f8f81 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -2,6 +2,7 @@ "class" : { }, "instance" : { - "fillContentOf:from:" : "LB 11/10/2018 14:03", + "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", + "fillContentOf:from:" : "LB 11/10/2018 14:12", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st new file mode 100644 index 000000000..edd356db4 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st @@ -0,0 +1,6 @@ +*LBGitTests +addFile: aString + + | path | + path := aString. self flag: #TODO. "resolve path" + self add: (LBGitFileInfo on: path) at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json new file mode 100644 index 000000000..2a6055df0 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "addFile:" : "LB 11/10/2018 14:20" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/properties.json b/LBGitTests.package/SquotWorkingCopy.extension/properties.json new file mode 100644 index 000000000..b5406e048 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotWorkingCopy" } diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st index 0fb6842cf..5fc4f558b 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -1,4 +1,4 @@ as yet unclassified captureWithSquot - ^ self squotShadowFactory new \ No newline at end of file + ^ self squotShadowFactory of: self \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 63c14ed1a..92926dd6c 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -3,8 +3,10 @@ }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/10/2018 12:19", + "captureWithSquot" : "LB 11/10/2018 14:16", "captureWithSquot:" : "LB 11/10/2018 12:14", + "path" : "LB 11/10/2018 14:18", + "path:" : "LB 11/10/2018 14:18", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json index 5a8d1cca0..c4f76173c 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -6,7 +6,7 @@ ], "commentStamp" : "", "instvars" : [ - ], + "path" ], "name" : "LBGitFileInfo", "pools" : [ ], From 8608c6413ea37264a6f50295d454b8ea09ec0e85 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 14:25:39 +0100 Subject: [PATCH 034/170] Update cFile.txt --- cFile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cFile.txt b/cFile.txt index da7ca3c44..25a49d399 100644 --- a/cFile.txt +++ b/cFile.txt @@ -1 +1 @@ -cFile cool content. +even cooler content. From 514da1f5c03c08725dde0d3059d9d8e0f292ddab Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 15:08:43 +0100 Subject: [PATCH 035/170] Difffnstuff --- .../LBGitDiff.class/instance/chosenOption.st | 6 ++++++ .../instance/initializeSquotDiffNodes.with..st | 12 ++++++++++++ .../LBGitDiff.class/instance/isLeftChosen.st | 5 +++++ .../LBGitDiff.class/instance/newSquotDiffNodes.st | 8 ++++++++ .../LBGitDiff.class/instance/options.st | 4 ++++ .../LBGitDiff.class/instance/squotApplyTo.with..st | 4 ++++ .../instance/squotApplyToLoaded.with..st | 5 +++++ .../LBGitDiff.class/methodProperties.json | 7 +++++++ .../LBGitFileShadow.class/instance/content..st | 3 ++- .../LBGitFileShadow.class/instance/content.st | 2 +- .../LBGitFileShadow.class/methodProperties.json | 4 ++-- .../LBGitFileShadow.class/properties.json | 1 - .../instance/fillContentOf.from..st | 7 +++++-- .../LBGitSerializer.class/methodProperties.json | 2 +- cFile.txt | 1 - 15 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 LBGitTests.package/LBGitDiff.class/instance/chosenOption.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/options.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st diff --git a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st new file mode 100644 index 000000000..5a210b635 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st @@ -0,0 +1,6 @@ +as yet unclassified +chosenOption + + ^ self isLeftChosen + ifTrue: [self options first] + ifFalse: [self options second] \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st new file mode 100644 index 000000000..10f6ec245 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st @@ -0,0 +1,12 @@ +Squot-diff-converting +initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder + "Initialize the previously allocated diff nodes in aCollection, using the builder to convert + the diffs of related objects." + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure and you chose to initialize all nodes upon their allocation already, + you may implement this method to do nothing." + aCollection first + title: 'changes' + content: self + children: Array empty. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st new file mode 100644 index 000000000..ec6574c1b --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st @@ -0,0 +1,5 @@ +as yet unclassified +isLeftChosen + + self flag: #TODO."Later allow to choose which version to take" + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st new file mode 100644 index 000000000..03901d2fa --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st @@ -0,0 +1,8 @@ +Squot-diff-converting +newSquotDiffNodes + "Answer new, uninitialized SquotDiffNodes that will later be initialized + in #initializeSquotDiffNodes:with:" + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure, you may also fully initialize the nodes here already." + ^ Array with: SquotDiffNode new \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/options.st b/LBGitTests.package/LBGitDiff.class/instance/options.st new file mode 100644 index 000000000..2834ddca1 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/options.st @@ -0,0 +1,4 @@ +as yet unclassified +options + + ^ {self left. self right} \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st new file mode 100644 index 000000000..2031ed160 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st @@ -0,0 +1,4 @@ +Squot-diff-patching +squotApplyTo: aShadow with: aPatcher + "Apply my changes to aShadow (the representation of an object in a snapshot) and answer the result." + aShadow content: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st new file mode 100644 index 000000000..8fb1815a5 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st @@ -0,0 +1,5 @@ +Squot-diff-patching +squotApplyToLoaded: anObject with: aPatcher + "Modify anObject such that it matches what I model and answer the modified object, even if it was modified in-place." + "Here the fileInfo object is modified" + ^ anObject \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json index 5e93e5e30..a64cd095b 100644 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -2,9 +2,16 @@ "class" : { }, "instance" : { + "chosenOption" : "LB 11/10/2018 14:49", + "initializeSquotDiffNodes:with:" : "LB 11/10/2018 15:05", + "isLeftChosen" : "LB 11/10/2018 14:48", "left" : "LB 11/10/2018 13:00", "left:" : "LB 11/10/2018 13:00", + "newSquotDiffNodes" : "LB 11/10/2018 15:05", + "options" : "LB 11/10/2018 14:46", "right" : "LB 11/10/2018 13:00", "right:" : "LB 11/10/2018 13:00", + "squotApplyTo:with:" : "LB 11/10/2018 14:49", + "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", "squotHasChanges" : "LB 11/10/2018 13:26", "squotHasConflicts" : "LB 11/10/2018 13:01" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st index e62a976db..fc620a3ef 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -1,4 +1,5 @@ as yet unclassified content: aByteArray - content := aByteArray. \ No newline at end of file + "content := aByteArray." + (FileStream fileNamed: self path) readWrite binary nextPutAll: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index e15467953..3a2563c5d 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -1,4 +1,4 @@ as yet unclassified content - ^ content ifNil: [content := ''] \ No newline at end of file + ^ (FileStream fileNamed: self path) binary contents \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index ebc7bd272..eb4da861b 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -2,8 +2,8 @@ "class" : { "of:" : "LB 11/10/2018 14:22" }, "instance" : { - "content" : "LB 11/10/2018 12:41", - "content:" : "LB 11/10/2018 13:14", + "content" : "LB 11/10/2018 14:53", + "content:" : "LB 11/10/2018 14:33", "path" : "LB 11/10/2018 14:16", "path:" : "LB 11/10/2018 14:16", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index 2de2da79a..1c4333873 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -7,7 +7,6 @@ ], "commentStamp" : "", "instvars" : [ - "content", "path" ], "name" : "LBGitFileShadow", "pools" : [ diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index 1501c0429..7569e65a2 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -1,7 +1,10 @@ as yet unclassified fillContentOf: anArtifact from: aFileOrDirectoryReference - + | path | self halt. + path := ''. + aFileOrDirectoryReference path do: [:each | path := path,'/',each]. anArtifact content: (SquotShadowGraph withSingleShadow: - (LBGitFileShadow new content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file + (LBGitFileShadow new path: path; + content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index 6972f8f81..ff6b6957e 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", - "fillContentOf:from:" : "LB 11/10/2018 14:12", + "fillContentOf:from:" : "LB 11/10/2018 14:41", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/cFile.txt b/cFile.txt index 25a49d399..e69de29bb 100644 --- a/cFile.txt +++ b/cFile.txt @@ -1 +0,0 @@ -even cooler content. From 285ae999fa3f8839638467f6cca686a31e666d72 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 15:16:07 +0100 Subject: [PATCH 036/170] Enter commit log message here --- .../LBGitDiff.class/instance/squotAdjustToResemble..st | 4 ++++ .../instance/squotChangeAsStringOrText.st | 9 +++++++++ LBGitTests.package/LBGitDiff.class/instance/writeTo..st | 4 ++++ LBGitTests.package/LBGitDiff.class/methodProperties.json | 5 ++++- cFile.txt | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/writeTo..st diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st new file mode 100644 index 000000000..6dfbbc0ec --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st @@ -0,0 +1,4 @@ +Squot-diff-manipulation +squotAdjustToResemble: aSquotDiffNode + "Answer an object of the same type as me that describes the changes in aSquotDiffNode." + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..33c918cfe --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,9 @@ +as yet unclassified +squotChangeAsStringOrText + + ^ +'Left: +', self left, ' + +Right: +', self right. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st new file mode 100644 index 000000000..f939af043 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st @@ -0,0 +1,4 @@ +as yet unclassified +writeTo: aStream + + aStream nextPutAll: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json index a64cd095b..87a79bbe3 100644 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -11,7 +11,10 @@ "options" : "LB 11/10/2018 14:46", "right" : "LB 11/10/2018 13:00", "right:" : "LB 11/10/2018 13:00", + "squotAdjustToResemble:" : "LB 11/10/2018 15:08", "squotApplyTo:with:" : "LB 11/10/2018 14:49", "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", + "squotChangeAsStringOrText" : "LB 11/10/2018 15:07", "squotHasChanges" : "LB 11/10/2018 13:26", - "squotHasConflicts" : "LB 11/10/2018 13:01" } } + "squotHasConflicts" : "LB 11/10/2018 13:01", + "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/cFile.txt b/cFile.txt index e69de29bb..00e5de20b 100644 --- a/cFile.txt +++ b/cFile.txt @@ -0,0 +1 @@ +i changed it. do you notice? \ No newline at end of file From 8cf8035549cab1ffd01d9d0bda51cc098ee1e35e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 15:17:58 +0100 Subject: [PATCH 037/170] Update cFile.txt --- cFile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cFile.txt b/cFile.txt index 00e5de20b..53e51a678 100644 --- a/cFile.txt +++ b/cFile.txt @@ -1 +1 @@ -i changed it. do you notice? \ No newline at end of file +Will you write the online change? From e43807a150079cd982dda78a626cd538f6738f32 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:00:08 +0100 Subject: [PATCH 038/170] Much stuff --- .cFile.txt.squot-contents | 4 ---- .squot | 3 +-- .../LBGitFileInfo.class/class/{on..st => on.in..st} | 3 ++- .../LBGitFileInfo.class/instance/rootDirectory..st | 4 ++++ .../LBGitFileInfo.class/instance/rootDirectory.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 4 +++- .../LBGitFileInfo.class/properties.json | 3 ++- .../LBGitFileShadow.class/class/of..st | 2 +- .../LBGitFileShadow.class/instance/content..st | 2 +- .../LBGitFileShadow.class/instance/content.st | 2 +- .../LBGitFileShadow.class/instance/fileInfo..st | 4 ++++ .../LBGitFileShadow.class/instance/fileInfo.st | 4 ++++ .../LBGitFileShadow.class/instance/path..st | 4 ---- .../LBGitFileShadow.class/instance/path.st | 2 +- .../LBGitFileShadow.class/instance/rootDirectory.st | 4 ++++ .../LBGitFileShadow.class/methodProperties.json | 12 +++++++----- .../LBGitFileShadow.class/properties.json | 2 +- .../SquotWorkingCopy.extension/instance/addFile..st | 2 +- .../instance/rootDirectory.st | 5 +++++ .../SquotWorkingCopy.extension/methodProperties.json | 3 ++- .../LBGitFileInfo.class/instance/rootDirectory..st | 4 ++++ .../LBGitFileInfo.class/instance/rootDirectory.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 2 ++ .../LBGitFileInfo.class/properties.json | 3 ++- cFile.txt | 1 - 25 files changed, 60 insertions(+), 27 deletions(-) delete mode 100644 .cFile.txt.squot-contents rename LBGitTests.package/LBGitFileInfo.class/class/{on..st => on.in..st} (50%) create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st create mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st delete mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents deleted file mode 100644 index 5ce3a879f..000000000 --- a/.cFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #LBGitSerializer -} \ No newline at end of file diff --git a/.squot b/.squot index 201d3c0ed..4701cf8bf 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, - 'cFile.txt' : #LBGitSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st similarity index 50% rename from LBGitTests.package/LBGitFileInfo.class/class/on..st rename to LBGitTests.package/LBGitFileInfo.class/class/on.in..st index 97d004153..62f9bca86 100644 --- a/LBGitTests.package/LBGitFileInfo.class/class/on..st +++ b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st @@ -1,6 +1,7 @@ as yet unclassified -on: aString +on: aString in: aFSReference ^ self new path: aString; + rootDirectory: aFSReference yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st new file mode 100644 index 000000000..87a97cde3 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st @@ -0,0 +1,4 @@ +accessing +rootDirectory: anObject + + rootDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st new file mode 100644 index 000000000..5d66c63e9 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 48dbec52e..cb1226866 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,12 +1,14 @@ { "class" : { - "on:" : "LB 11/10/2018 14:18" }, + "on:in:" : "LB 11/10/2018 15:56" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", "captureWithSquot" : "LB 11/10/2018 14:16", "captureWithSquot:" : "LB 11/10/2018 12:14", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", + "rootDirectory" : "LB 11/10/2018 15:55", + "rootDirectory:" : "LB 11/10/2018 15:55", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json index c4f76173c..6a7d90a58 100644 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -6,7 +6,8 @@ ], "commentStamp" : "", "instvars" : [ - "path" ], + "path", + "rootDirectory" ], "name" : "LBGitFileInfo", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitFileShadow.class/class/of..st index b1a524e21..94b6318d4 100644 --- a/LBGitTests.package/LBGitFileShadow.class/class/of..st +++ b/LBGitTests.package/LBGitFileShadow.class/class/of..st @@ -2,4 +2,4 @@ as yet unclassified of: aFileInfo ^ self new - path: aFileInfo path \ No newline at end of file + fileInfo: aFileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st index fc620a3ef..4ac4caa50 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -2,4 +2,4 @@ as yet unclassified content: aByteArray "content := aByteArray." - (FileStream fileNamed: self path) readWrite binary nextPutAll: aByteArray \ No newline at end of file + (self rootDirectory resolve: self path) writeStream binary nextPutAll: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index 3a2563c5d..d26e78d35 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -1,4 +1,4 @@ as yet unclassified content - ^ (FileStream fileNamed: self path) binary contents \ No newline at end of file + ^ (self rootDirectory resolve: self path) readStream binary contents \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st new file mode 100644 index 000000000..0218dc36f --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st @@ -0,0 +1,4 @@ +accessing +fileInfo: anObject + + fileInfo := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st new file mode 100644 index 000000000..af7b2cc6a --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st @@ -0,0 +1,4 @@ +accessing +fileInfo + + ^ fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path..st b/LBGitTests.package/LBGitFileShadow.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path.st b/LBGitTests.package/LBGitFileShadow.class/instance/path.st index 81c63b398..e87044962 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/path.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/path.st @@ -1,4 +1,4 @@ accessing path - ^ path \ No newline at end of file + ^ self fileInfo path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st new file mode 100644 index 000000000..c93712c38 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ self fileInfo rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index eb4da861b..d78cc97a4 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -1,11 +1,13 @@ { "class" : { - "of:" : "LB 11/10/2018 14:22" }, + "of:" : "LB 11/10/2018 15:58" }, "instance" : { - "content" : "LB 11/10/2018 14:53", - "content:" : "LB 11/10/2018 14:33", - "path" : "LB 11/10/2018 14:16", - "path:" : "LB 11/10/2018 14:16", + "content" : "LB 11/10/2018 15:59", + "content:" : "LB 11/10/2018 15:59", + "fileInfo" : "LB 11/10/2018 15:57", + "fileInfo:" : "LB 11/10/2018 15:57", + "path" : "LB 11/10/2018 15:57", + "rootDirectory" : "LB 11/10/2018 15:57", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", "squotPreferredSerializer" : "LB 11/10/2018 13:41", diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index 1c4333873..f0414f243 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -7,7 +7,7 @@ ], "commentStamp" : "", "instvars" : [ - "path" ], + "fileInfo" ], "name" : "LBGitFileShadow", "pools" : [ ], diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st index edd356db4..b0873b3b3 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st @@ -3,4 +3,4 @@ addFile: aString | path | path := aString. self flag: #TODO. "resolve path" - self add: (LBGitFileInfo on: path) at: path. \ No newline at end of file + self add: (LBGitFileInfo on: path in: self rootDirectory) at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st new file mode 100644 index 000000000..f87e9b7c0 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st @@ -0,0 +1,5 @@ +*LBGitTests +rootDirectory + + self flag: #TODO."Find nicer way. Please." + ^ self repository gitRepository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json index 2a6055df0..42894b92d 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json +++ b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "addFile:" : "LB 11/10/2018 14:20" } } + "addFile:" : "LB 11/10/2018 15:55", + "rootDirectory" : "LB 11/10/2018 15:53" } } diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st new file mode 100644 index 000000000..87a97cde3 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st @@ -0,0 +1,4 @@ +accessing +rootDirectory: anObject + + rootDirectory := anObject. \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st new file mode 100644 index 000000000..5d66c63e9 --- /dev/null +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ rootDirectory \ No newline at end of file diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 92926dd6c..684e55e9e 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -7,6 +7,8 @@ "captureWithSquot:" : "LB 11/10/2018 12:14", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", + "rootDirectory" : "LB 11/10/2018 15:55", + "rootDirectory:" : "LB 11/10/2018 15:55", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json index c4f76173c..6a7d90a58 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -6,7 +6,8 @@ ], "commentStamp" : "", "instvars" : [ - "path" ], + "path", + "rootDirectory" ], "name" : "LBGitFileInfo", "pools" : [ ], diff --git a/cFile.txt b/cFile.txt deleted file mode 100644 index 53e51a678..000000000 --- a/cFile.txt +++ /dev/null @@ -1 +0,0 @@ -Will you write the online change? From 59f09b4c542a810b4733cf8844c494640f826db5 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:01:10 +0100 Subject: [PATCH 039/170] Again added cfile --- .cFile.txt.squot-contents | 4 ++++ .squot | 3 ++- cFile.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .cFile.txt.squot-contents create mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents new file mode 100644 index 000000000..5ce3a879f --- /dev/null +++ b/.cFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #LBGitSerializer +} \ No newline at end of file diff --git a/.squot b/.squot index 4701cf8bf..201d3c0ed 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,6 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, + 'cFile.txt' : #LBGitSerializer } \ No newline at end of file diff --git a/cFile.txt b/cFile.txt new file mode 100644 index 000000000..1428d1822 --- /dev/null +++ b/cFile.txt @@ -0,0 +1 @@ +Brand new in repo content \ No newline at end of file From c054caddc1fb4b1971b8b2b09c6e5e65b8eb3755 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:22:22 +0100 Subject: [PATCH 040/170] rem c --- .cFile.txt.squot-contents | 4 ---- .squot | 3 +-- .../LBGitFileInfo.class/class/onGitReference..st | 11 +++++++++++ .../LBGitFileInfo.class/methodProperties.json | 7 ++++--- LBGitTests.package/LBGitFileShadow.class/class/of..st | 3 ++- .../LBGitFileShadow.class/instance/content..st | 2 +- .../LBGitFileShadow.class/instance/content.st | 2 +- .../LBGitFileShadow.class/instance/reference.st | 4 ++++ .../LBGitFileShadow.class/methodProperties.json | 7 ++++--- .../instance/fillContentOf.from..st | 2 +- .../LBGitSerializer.class/methodProperties.json | 2 +- .../LBGitFileInfo.class/methodProperties.json | 4 ++-- cFile.txt | 1 - 13 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 .cFile.txt.squot-contents create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/reference.st delete mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents deleted file mode 100644 index 5ce3a879f..000000000 --- a/.cFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #LBGitSerializer -} \ No newline at end of file diff --git a/.squot b/.squot index 201d3c0ed..4701cf8bf 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, - 'cFile.txt' : #LBGitSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st new file mode 100644 index 000000000..c8377f790 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -0,0 +1,11 @@ +as yet unclassified +onGitReference: aFSReference + + | workingReference path | + self halt. + workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. + path := ''. + path := aFSReference path do: [:each | path := path,'/',each]. + ^ self + on: path + in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index cb1226866..edf5e4257 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,14 +1,15 @@ { "class" : { - "on:in:" : "LB 11/10/2018 15:56" }, + "on:in:" : "LB 11/10/2018 15:56", + "onGitReference:" : "LB 11/10/2018 16:21" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", "captureWithSquot" : "LB 11/10/2018 14:16", "captureWithSquot:" : "LB 11/10/2018 12:14", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", - "rootDirectory" : "LB 11/10/2018 15:55", - "rootDirectory:" : "LB 11/10/2018 15:55", + "rootDirectory" : "LB 11/10/2018 16:10", + "rootDirectory:" : "LB 11/10/2018 16:10", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitFileShadow.class/class/of..st index 94b6318d4..c66acd120 100644 --- a/LBGitTests.package/LBGitFileShadow.class/class/of..st +++ b/LBGitTests.package/LBGitFileShadow.class/class/of..st @@ -2,4 +2,5 @@ as yet unclassified of: aFileInfo ^ self new - fileInfo: aFileInfo \ No newline at end of file + fileInfo: aFileInfo; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st index 4ac4caa50..92cb0fda0 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -2,4 +2,4 @@ as yet unclassified content: aByteArray "content := aByteArray." - (self rootDirectory resolve: self path) writeStream binary nextPutAll: aByteArray \ No newline at end of file + self reference writeStream binary nextPutAll: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index d26e78d35..c132b2e71 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -1,4 +1,4 @@ as yet unclassified content - ^ (self rootDirectory resolve: self path) readStream binary contents \ No newline at end of file + ^ self reference readStream binary contents \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st new file mode 100644 index 000000000..36d9c87bc --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st @@ -0,0 +1,4 @@ +as yet unclassified +reference + + ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index d78cc97a4..b9cc73e4f 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -1,12 +1,13 @@ { "class" : { - "of:" : "LB 11/10/2018 15:58" }, + "of:" : "LB 11/10/2018 16:18" }, "instance" : { - "content" : "LB 11/10/2018 15:59", - "content:" : "LB 11/10/2018 15:59", + "content" : "LB 11/10/2018 16:11", + "content:" : "LB 11/10/2018 16:11", "fileInfo" : "LB 11/10/2018 15:57", "fileInfo:" : "LB 11/10/2018 15:57", "path" : "LB 11/10/2018 15:57", + "reference" : "LB 11/10/2018 16:10", "rootDirectory" : "LB 11/10/2018 15:57", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index 7569e65a2..c3d5995e8 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -6,5 +6,5 @@ fillContentOf: anArtifact from: aFileOrDirectoryReference aFileOrDirectoryReference path do: [:each | path := path,'/',each]. anArtifact content: (SquotShadowGraph withSingleShadow: - (LBGitFileShadow new path: path; + ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index ff6b6957e..eb58eb1de 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", - "fillContentOf:from:" : "LB 11/10/2018 14:41", + "fillContentOf:from:" : "LB 11/10/2018 16:20", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 684e55e9e..4817ec174 100644 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -7,8 +7,8 @@ "captureWithSquot:" : "LB 11/10/2018 12:14", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", - "rootDirectory" : "LB 11/10/2018 15:55", - "rootDirectory:" : "LB 11/10/2018 15:55", + "rootDirectory" : "LB 11/10/2018 16:10", + "rootDirectory:" : "LB 11/10/2018 16:10", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", diff --git a/cFile.txt b/cFile.txt deleted file mode 100644 index 1428d1822..000000000 --- a/cFile.txt +++ /dev/null @@ -1 +0,0 @@ -Brand new in repo content \ No newline at end of file From 54c613c689b1c45af3b75fc86c720b5dfc9d9730 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:22:47 +0100 Subject: [PATCH 041/170] add c --- .cFile.txt.squot-contents | 4 ++++ .squot | 3 ++- cFile.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .cFile.txt.squot-contents create mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents new file mode 100644 index 000000000..5ce3a879f --- /dev/null +++ b/.cFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #LBGitSerializer +} \ No newline at end of file diff --git a/.squot b/.squot index 4701cf8bf..201d3c0ed 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,6 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, + 'cFile.txt' : #LBGitSerializer } \ No newline at end of file diff --git a/cFile.txt b/cFile.txt new file mode 100644 index 000000000..1428d1822 --- /dev/null +++ b/cFile.txt @@ -0,0 +1 @@ +Brand new in repo content \ No newline at end of file From 0267396ab6a7f7a392fc85a09a84cac35e5a7e26 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 16:26:33 +0100 Subject: [PATCH 042/170] Update cFile.txt --- cFile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cFile.txt b/cFile.txt index 1428d1822..cee6f5f1e 100644 --- a/cFile.txt +++ b/cFile.txt @@ -1 +1 @@ -Brand new in repo content \ No newline at end of file +Do you pull the content? From 444a3ec8c6c8da84ad30164a57c1c19434326f6e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:30:40 +0100 Subject: [PATCH 043/170] Rem c to allow pull of rest code --- .cFile.txt.squot-contents | 4 ---- .squot | 3 +-- .../LBGitFileInfo.class/class/onGitReference..st | 2 +- LBGitTests.package/LBGitFileInfo.class/methodProperties.json | 2 +- cFile.txt | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 .cFile.txt.squot-contents delete mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents deleted file mode 100644 index 5ce3a879f..000000000 --- a/.cFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #LBGitSerializer -} \ No newline at end of file diff --git a/.squot b/.squot index 201d3c0ed..4701cf8bf 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, - 'cFile.txt' : #LBGitSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st index c8377f790..b1620b524 100644 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -5,7 +5,7 @@ onGitReference: aFSReference self halt. workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. path := ''. - path := aFSReference path do: [:each | path := path,'/',each]. + aFSReference path do: [:each | path := path,'/',each]. ^ self on: path in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index edf5e4257..2ee3eae75 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "on:in:" : "LB 11/10/2018 15:56", - "onGitReference:" : "LB 11/10/2018 16:21" }, + "onGitReference:" : "LB 11/10/2018 16:25" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", "captureWithSquot" : "LB 11/10/2018 14:16", diff --git a/cFile.txt b/cFile.txt deleted file mode 100644 index cee6f5f1e..000000000 --- a/cFile.txt +++ /dev/null @@ -1 +0,0 @@ -Do you pull the content? From f2203fbc7a53a370c4f572ae39713287ce470d8c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:31:28 +0100 Subject: [PATCH 044/170] Readd c --- .cFile.txt.squot-contents | 4 ++++ .squot | 3 ++- cFile.txt | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .cFile.txt.squot-contents create mode 100644 cFile.txt diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents new file mode 100644 index 000000000..5ce3a879f --- /dev/null +++ b/.cFile.txt.squot-contents @@ -0,0 +1,4 @@ +SquotTrackedObjectMetadata { + #objectClassName : #LBGitFileInfo, + #serializer : #LBGitSerializer +} \ No newline at end of file diff --git a/.squot b/.squot index 4701cf8bf..201d3c0ed 100644 --- a/.squot +++ b/.squot @@ -1,5 +1,6 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer + 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, + 'cFile.txt' : #LBGitSerializer } \ No newline at end of file diff --git a/cFile.txt b/cFile.txt new file mode 100644 index 000000000..cee6f5f1e --- /dev/null +++ b/cFile.txt @@ -0,0 +1 @@ +Do you pull the content? From 2024f82ce971e469e00aa8fa593184b3ad569f39 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:45:13 +0100 Subject: [PATCH 045/170] Several fixes --- .../LBGitFileInfo.class/class/onGitReference..st | 1 + LBGitTests.package/LBGitFileInfo.class/methodProperties.json | 2 +- .../LBGitSerializer.class/instance/fillContentOf.from..st | 3 --- LBGitTests.package/LBGitSerializer.class/methodProperties.json | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st index b1620b524..fea34725e 100644 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -6,6 +6,7 @@ onGitReference: aFSReference workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. path := ''. aFSReference path do: [:each | path := path,'/',each]. + path := path copyFrom: 2 to: path size. ^ self on: path in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 2ee3eae75..4b8e5cf01 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { "on:in:" : "LB 11/10/2018 15:56", - "onGitReference:" : "LB 11/10/2018 16:25" }, + "onGitReference:" : "LB 11/10/2018 16:44" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", "captureWithSquot" : "LB 11/10/2018 14:16", diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index c3d5995e8..4f2894047 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -1,9 +1,6 @@ as yet unclassified fillContentOf: anArtifact from: aFileOrDirectoryReference - | path | self halt. - path := ''. - aFileOrDirectoryReference path do: [:each | path := path,'/',each]. anArtifact content: (SquotShadowGraph withSingleShadow: ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index eb58eb1de..fa217723e 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", - "fillContentOf:from:" : "LB 11/10/2018 16:20", + "fillContentOf:from:" : "LB 11/10/2018 16:42", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } From 191f7541156e8ec4cc1430fee014c26a88cc8170 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 16:59:56 +0100 Subject: [PATCH 046/170] more --- LBGitTests.package/LBGitFileShadow.class/instance/content.st | 4 +++- .../LBGitFileShadow.class/instance/squotMaterializeWith..st | 4 ++++ .../LBGitFileShadow.class/methodProperties.json | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index c132b2e71..859cbeb6c 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -1,4 +1,6 @@ as yet unclassified content - ^ self reference readStream binary contents \ No newline at end of file + ^ self reference exists + ifTrue: [self reference readStream binary contents] + ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st new file mode 100644 index 000000000..1f9cfaef8 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st @@ -0,0 +1,4 @@ +Squot-shadow +squotMaterializeWith: aMaterializer + "Answer the object restored from me. Double dispatch path" + ^ self fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index b9cc73e4f..edfa216fc 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "of:" : "LB 11/10/2018 16:18" }, "instance" : { - "content" : "LB 11/10/2018 16:11", + "content" : "LB 11/10/2018 16:53", "content:" : "LB 11/10/2018 16:11", "fileInfo" : "LB 11/10/2018 15:57", "fileInfo:" : "LB 11/10/2018 15:57", @@ -11,6 +11,7 @@ "rootDirectory" : "LB 11/10/2018 15:57", "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", + "squotMaterializeWith:" : "LB 11/10/2018 16:35", "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", From e890a70e2429b1ac41ea046cd63101b33c0d94d3 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 10 Nov 2018 17:00:52 +0100 Subject: [PATCH 047/170] Update .squot --- .squot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.squot b/.squot index 201d3c0ed..d7f69ffcf 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,5 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'bFile.txt\/LBGitTests.package\/LBGitFileInfo.class' : #SquotCypressCodeSerializer, 'cFile.txt' : #LBGitSerializer -} \ No newline at end of file +} From 19e7d2efb2132b2e6f904d690257eab2c10a4fc5 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 10 Nov 2018 17:02:05 +0100 Subject: [PATCH 048/170] No change --- .squot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.squot b/.squot index d7f69ffcf..bd57dd2a1 100644 --- a/.squot +++ b/.squot @@ -2,4 +2,4 @@ OrderedDictionary { 'LBGitTests.package' : #SquotCypressCodeSerializer, 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, 'cFile.txt' : #LBGitSerializer -} +} \ No newline at end of file From 62f2d27b248067435b974a7dc92ca9684a214c04 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 17:18:18 +0100 Subject: [PATCH 049/170] Create superduper.md --- superduper.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 superduper.md diff --git a/superduper.md b/superduper.md new file mode 100644 index 000000000..dfbfb1ec0 --- /dev/null +++ b/superduper.md @@ -0,0 +1,2 @@ +Cool Stuff +nextline From e76ac920c4ca4997955279cf3b2cdb3dea8789e4 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:12:56 +0100 Subject: [PATCH 050/170] Delete cFile.txt --- cFile.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 cFile.txt diff --git a/cFile.txt b/cFile.txt deleted file mode 100644 index cee6f5f1e..000000000 --- a/cFile.txt +++ /dev/null @@ -1 +0,0 @@ -Do you pull the content? From 08c4928be7430392c56774ea092d09ca6736a652 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:12 +0100 Subject: [PATCH 051/170] Delete properties.json --- bFile.txt/LBGitTests.package/properties.json | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/properties.json diff --git a/bFile.txt/LBGitTests.package/properties.json b/bFile.txt/LBGitTests.package/properties.json deleted file mode 100644 index f037444a7..000000000 --- a/bFile.txt/LBGitTests.package/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - } From 3a20ec6ad830071d7fc2977e70742393b6a7114f Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:18 +0100 Subject: [PATCH 052/170] Delete .filetree --- bFile.txt/LBGitTests.package/.filetree | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/.filetree diff --git a/bFile.txt/LBGitTests.package/.filetree b/bFile.txt/LBGitTests.package/.filetree deleted file mode 100644 index 8998102c2..000000000 --- a/bFile.txt/LBGitTests.package/.filetree +++ /dev/null @@ -1,4 +0,0 @@ -{ - "noMethodMetaData" : true, - "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } From 386c7afb6645371d6f462ac9e3ccc859d96f701a Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:26 +0100 Subject: [PATCH 053/170] Delete initializers.st --- bFile.txt/LBGitTests.package/monticello.meta/initializers.st | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/monticello.meta/initializers.st diff --git a/bFile.txt/LBGitTests.package/monticello.meta/initializers.st b/bFile.txt/LBGitTests.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29bb..000000000 From d5fe5b89517d3683a0d53f0d0d199d421ef62d32 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:34 +0100 Subject: [PATCH 054/170] Delete properties.json --- .../LBGitFileInfo.class/properties.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json deleted file mode 100644 index 6a7d90a58..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "path", - "rootDirectory" ], - "name" : "LBGitFileInfo", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } From 4e7fe2eb1a595630800cdeac5c5cbf1ce348095e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:40 +0100 Subject: [PATCH 055/170] Delete methodProperties.json --- .../LBGitFileInfo.class/methodProperties.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json deleted file mode 100644 index 4817ec174..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/10/2018 14:16", - "captureWithSquot:" : "LB 11/10/2018 12:14", - "path" : "LB 11/10/2018 14:18", - "path:" : "LB 11/10/2018 14:18", - "rootDirectory" : "LB 11/10/2018 16:10", - "rootDirectory:" : "LB 11/10/2018 16:10", - "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", - "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", - "squotShadowFactory" : "LB 11/10/2018 12:18", - "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } From b1da2208f62086e345db69dd7208598301a3ae26 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:46 +0100 Subject: [PATCH 056/170] Delete README.md --- bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/README.md deleted file mode 100644 index e69de29bb..000000000 From 9cc363b9617d1031e85f073892d1d7b537fa93ef Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:13:52 +0100 Subject: [PATCH 057/170] Delete .squot-contents --- .../LBGitTests.package/LBGitFileInfo.class/.squot-contents | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents deleted file mode 100644 index df48d2dd2..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/.squot-contents +++ /dev/null @@ -1,5 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : 'LBGitFileInfo class', - #objectsReplacedByNames : true, - #serializer : #SquotCypressCodeSerializer -} \ No newline at end of file From 654cdf3ce2e5318b48867340ab55c8345dcad4a2 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:23 +0100 Subject: [PATCH 058/170] Delete squotShouldKeepIdentity.st --- .../LBGitFileInfo.class/instance/squotShouldKeepIdentity.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st deleted file mode 100644 index 026d9db0c..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShouldKeepIdentity - - ^ true \ No newline at end of file From 85f3f8c463ae8e496910cc1c20bb109913cc6dc4 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:30 +0100 Subject: [PATCH 059/170] Delete squotShadowFactory.st --- .../LBGitFileInfo.class/instance/squotShadowFactory.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st deleted file mode 100644 index 92de5ef7e..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShadowFactory - - ^ LBGitFileShadow \ No newline at end of file From 26a5bd8c508a1c7add5eccef85de8c187b366f18 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:35 +0100 Subject: [PATCH 060/170] Delete squotRemoveTransientStoreInfoFrom..st --- .../instance/squotRemoveTransientStoreInfoFrom..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st deleted file mode 100644 index de82a5bdc..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotRemoveTransientStoreInfoFrom: aDictionary - - self flag: #TODO. "What does it do?". \ No newline at end of file From 3b99352cb6e18ca8c556c1287d16d9026d166d21 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:42 +0100 Subject: [PATCH 061/170] Delete squotAddTransientStoreInfoTo..st --- .../instance/squotAddTransientStoreInfoTo..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st deleted file mode 100644 index 62db22e86..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotAddTransientStoreInfoTo: aTrackableObjectMetadata - - self flag: #TODO. "What does it do?" \ No newline at end of file From ebbe4d9d277f17666a8d1dc99b4bf9803826fa18 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:47 +0100 Subject: [PATCH 062/170] Delete rootDirectory.st --- .../LBGitFileInfo.class/instance/rootDirectory.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st deleted file mode 100644 index 5d66c63e9..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ rootDirectory \ No newline at end of file From 3fec653a920a7a251ea55da2f374e553ab220638 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:14:55 +0100 Subject: [PATCH 063/170] Delete rootDirectory..st --- .../LBGitFileInfo.class/instance/rootDirectory..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st deleted file mode 100644 index 87a97cde3..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory: anObject - - rootDirectory := anObject. \ No newline at end of file From c6d8cab2555a4348ea3a2c8fc2ce8afc98ba72b0 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:01 +0100 Subject: [PATCH 064/170] Delete path.st --- .../LBGitTests.package/LBGitFileInfo.class/instance/path.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file From ed1aaa01900ee06fb41b6dd8543147ceeb71c7ea Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:08 +0100 Subject: [PATCH 065/170] Delete path..st --- .../LBGitTests.package/LBGitFileInfo.class/instance/path..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file From d515b02c876e3c90a19c6f250b7df2c3975f0e84 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:14 +0100 Subject: [PATCH 066/170] Delete captureWithSquot.st --- .../LBGitFileInfo.class/instance/captureWithSquot.st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st deleted file mode 100644 index 5fc4f558b..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -captureWithSquot - - ^ self squotShadowFactory of: self \ No newline at end of file From 6d488c1e67851317e8b1ae78c329d16369013fb3 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:21 +0100 Subject: [PATCH 067/170] Delete captureWithSquot..st --- .../LBGitFileInfo.class/instance/captureWithSquot..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st deleted file mode 100644 index cd2676963..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -captureWithSquot: aCapturer - - ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file From 618cfba54ea8279573b7bcfcb14409f8088b49b2 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:27 +0100 Subject: [PATCH 068/170] Delete browseFromSquot..st --- .../LBGitFileInfo.class/instance/browseFromSquot..st | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st diff --git a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st deleted file mode 100644 index c580153ae..000000000 --- a/bFile.txt/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -browseFromSquot: aSquotLiveObject - - self shouldBeImplemented. \ No newline at end of file From f5b9fc4e938ca1527163350a7b930ef2be9e3c44 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Mon, 12 Nov 2018 20:15:58 +0100 Subject: [PATCH 069/170] Delete thisIsNoOverwrite.md --- thisIsNoOverwrite.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 thisIsNoOverwrite.md diff --git a/thisIsNoOverwrite.md b/thisIsNoOverwrite.md deleted file mode 100644 index 8b1378917..000000000 --- a/thisIsNoOverwrite.md +++ /dev/null @@ -1 +0,0 @@ - From da3c8f5d26bee65afff3123a1c49809b3d95630a Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 12 Nov 2018 20:44:08 +0100 Subject: [PATCH 070/170] clean --- .cFile.txt.squot-contents | 4 ---- .filetree | 2 -- .squot | 5 ----- LBGitTests.package/.filetree | 4 ---- LBGitTests.package/.squot-contents | 4 ---- .../LBGTCNumeroDos.class/README.md | 0 .../LBGTCNumeroDos.class/instance/boar..st | 4 ---- .../LBGTCNumeroDos.class/instance/boar.st | 4 ---- .../LBGTCNumeroDos.class/instance/fee..st | 4 ---- .../LBGTCNumeroDos.class/instance/fee.st | 4 ---- .../methodProperties.json | 8 -------- .../LBGTCNumeroDos.class/properties.json | 15 -------------- LBGitTests.package/LBGitDiff.class/README.md | 0 .../LBGitDiff.class/instance/chosenOption.st | 6 ------ .../initializeSquotDiffNodes.with..st | 12 ----------- .../LBGitDiff.class/instance/isLeftChosen.st | 5 ----- .../LBGitDiff.class/instance/left..st | 4 ---- .../LBGitDiff.class/instance/left.st | 4 ---- .../instance/newSquotDiffNodes.st | 8 -------- .../LBGitDiff.class/instance/options.st | 4 ---- .../LBGitDiff.class/instance/right..st | 4 ---- .../LBGitDiff.class/instance/right.st | 4 ---- .../instance/squotAdjustToResemble..st | 4 ---- .../instance/squotApplyTo.with..st | 4 ---- .../instance/squotApplyToLoaded.with..st | 5 ----- .../instance/squotChangeAsStringOrText.st | 9 --------- .../instance/squotHasChanges.st | 4 ---- .../instance/squotHasConflicts.st | 4 ---- .../LBGitDiff.class/instance/writeTo..st | 4 ---- .../LBGitDiff.class/methodProperties.json | 20 ------------------- .../LBGitDiff.class/properties.json | 17 ---------------- .../LBGitFileInfo.class/README.md | 0 .../LBGitFileInfo.class/class/on.in..st | 7 ------- .../class/onGitReference..st | 12 ----------- .../instance/browseFromSquot..st | 4 ---- .../instance/captureWithSquot..st | 4 ---- .../instance/captureWithSquot.st | 4 ---- .../LBGitFileInfo.class/instance/path..st | 4 ---- .../LBGitFileInfo.class/instance/path.st | 4 ---- .../instance/rootDirectory..st | 4 ---- .../instance/rootDirectory.st | 4 ---- .../instance/squotAddTransientStoreInfoTo..st | 4 ---- .../squotRemoveTransientStoreInfoFrom..st | 4 ---- .../instance/squotShadowFactory.st | 4 ---- .../instance/squotShouldKeepIdentity.st | 4 ---- .../LBGitFileInfo.class/methodProperties.json | 16 --------------- .../LBGitFileInfo.class/properties.json | 15 -------------- .../LBGitFileShadow.class/README.md | 0 .../LBGitFileShadow.class/class/of..st | 6 ------ .../instance/content..st | 5 ----- .../LBGitFileShadow.class/instance/content.st | 6 ------ .../instance/fileInfo..st | 4 ---- .../instance/fileInfo.st | 4 ---- .../LBGitFileShadow.class/instance/path.st | 4 ---- .../instance/reference.st | 4 ---- .../instance/rootDirectory.st | 4 ---- .../instance/squotDiffAgainst.with..st | 6 ------ .../squotDiffAgainst.withBase.with..st | 4 ---- .../instance/squotMaterializeWith..st | 4 ---- .../instance/squotPreferredSerializer.st | 4 ---- .../instance/squotWith.diffFromSequence..st | 4 ---- .../LBGitFileShadow.class/instance/value.st | 4 ---- .../instance/writeTo..st | 3 --- .../methodProperties.json | 18 ----------------- .../LBGitFileShadow.class/properties.json | 16 --------------- .../LBGitSerializer.class/README.md | 0 .../instance/atPathOf.writeStreamDo..st | 5 ----- .../instance/fillContentOf.from..st | 7 ------- .../LBGitSerializer.class/instance/version.st | 4 ---- .../LBGitSerializer.class/instance/write..st | 4 ---- .../methodProperties.json | 8 -------- .../LBGitSerializer.class/properties.json | 16 --------------- .../LBGitTestClass.class/README.md | 0 .../LBGitTestClass.class/class/newWithFoo..st | 5 ----- .../LBGitTestClass.class/instance/bar..st | 4 ---- .../LBGitTestClass.class/instance/bar.st | 4 ---- .../LBGitTestClass.class/instance/foo..st | 4 ---- .../LBGitTestClass.class/instance/foo.st | 4 ---- .../methodProperties.json | 8 -------- .../LBGitTestClass.class/properties.json | 15 -------------- .../instance/addFile..st | 6 ------ .../instance/rootDirectory.st | 5 ----- .../methodProperties.json | 6 ------ .../properties.json | 2 -- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 LBGitTests.package/properties.json | 2 -- LBOtherGitTests.package/.filetree | 4 ---- LBOtherGitTests.package/.squot-contents | 5 ----- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 LBOtherGitTests.package/properties.json | 2 -- README.md | 4 ---- aVeryRecognizableFile.txt | 3 --- newFile.txt | 3 --- superduper.md | 2 -- 96 files changed, 508 deletions(-) delete mode 100644 .cFile.txt.squot-contents delete mode 100644 .filetree delete mode 100644 .squot delete mode 100644 LBGitTests.package/.filetree delete mode 100644 LBGitTests.package/.squot-contents delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/README.md delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/properties.json delete mode 100644 LBGitTests.package/LBGitDiff.class/README.md delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/chosenOption.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/left..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/left.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/options.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/right..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/right.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/writeTo..st delete mode 100644 LBGitTests.package/LBGitDiff.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitDiff.class/properties.json delete mode 100644 LBGitTests.package/LBGitFileInfo.class/README.md delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on.in..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitFileInfo.class/properties.json delete mode 100644 LBGitTests.package/LBGitFileShadow.class/README.md delete mode 100644 LBGitTests.package/LBGitFileShadow.class/class/of..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/reference.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/value.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitFileShadow.class/properties.json delete mode 100644 LBGitTests.package/LBGitSerializer.class/README.md delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/version.st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/write..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitSerializer.class/properties.json delete mode 100644 LBGitTests.package/LBGitTestClass.class/README.md delete mode 100644 LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar.st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo.st delete mode 100644 LBGitTests.package/LBGitTestClass.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitTestClass.class/properties.json delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/properties.json delete mode 100644 LBGitTests.package/monticello.meta/categories.st delete mode 100644 LBGitTests.package/monticello.meta/initializers.st delete mode 100644 LBGitTests.package/properties.json delete mode 100644 LBOtherGitTests.package/.filetree delete mode 100644 LBOtherGitTests.package/.squot-contents delete mode 100644 LBOtherGitTests.package/monticello.meta/categories.st delete mode 100644 LBOtherGitTests.package/monticello.meta/initializers.st delete mode 100644 LBOtherGitTests.package/properties.json delete mode 100644 README.md delete mode 100644 aVeryRecognizableFile.txt delete mode 100644 newFile.txt delete mode 100644 superduper.md diff --git a/.cFile.txt.squot-contents b/.cFile.txt.squot-contents deleted file mode 100644 index 5ce3a879f..000000000 --- a/.cFile.txt.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #LBGitFileInfo, - #serializer : #LBGitSerializer -} \ No newline at end of file diff --git a/.filetree b/.filetree deleted file mode 100644 index 1616d042c..000000000 --- a/.filetree +++ /dev/null @@ -1,2 +0,0 @@ -{"propertyFileExtension" : ".json", -"packageExtension" : ".package" } \ No newline at end of file diff --git a/.squot b/.squot deleted file mode 100644 index bd57dd2a1..000000000 --- a/.squot +++ /dev/null @@ -1,5 +0,0 @@ -OrderedDictionary { - 'LBGitTests.package' : #SquotCypressCodeSerializer, - 'LBOtherGitTests.package' : #SquotCypressCodeSerializer, - 'cFile.txt' : #LBGitSerializer -} \ No newline at end of file diff --git a/LBGitTests.package/.filetree b/LBGitTests.package/.filetree deleted file mode 100644 index 8998102c2..000000000 --- a/LBGitTests.package/.filetree +++ /dev/null @@ -1,4 +0,0 @@ -{ - "noMethodMetaData" : true, - "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } diff --git a/LBGitTests.package/.squot-contents b/LBGitTests.package/.squot-contents deleted file mode 100644 index 3f40cf5f9..000000000 --- a/LBGitTests.package/.squot-contents +++ /dev/null @@ -1,4 +0,0 @@ -SquotTrackedObjectMetadata { - #serializer : #SquotCypressCodeSerializer, - #objectClassName : #PackageInfo -} \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/README.md b/LBGitTests.package/LBGTCNumeroDos.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st deleted file mode 100644 index 6f0b81ec1..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boar: anObject - - boar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st deleted file mode 100644 index 819733fa2..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boar - - ^ boar \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st deleted file mode 100644 index 2cef768d7..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fee: anObject - - fee := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st deleted file mode 100644 index 4525b6127..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fee - - ^ fee \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json deleted file mode 100644 index 497c8ec3a..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "boar" : "LB 11/10/2018 11:29", - "boar:" : "LB 11/10/2018 11:29", - "fee" : "LB 11/10/2018 11:29", - "fee:" : "LB 11/10/2018 11:29" } } diff --git a/LBGitTests.package/LBGTCNumeroDos.class/properties.json b/LBGitTests.package/LBGTCNumeroDos.class/properties.json deleted file mode 100644 index 18e617c80..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "fee", - "boar" ], - "name" : "LBGTCNumeroDos", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitDiff.class/README.md b/LBGitTests.package/LBGitDiff.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st deleted file mode 100644 index 5a210b635..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -chosenOption - - ^ self isLeftChosen - ifTrue: [self options first] - ifFalse: [self options second] \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st deleted file mode 100644 index 10f6ec245..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st +++ /dev/null @@ -1,12 +0,0 @@ -Squot-diff-converting -initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder - "Initialize the previously allocated diff nodes in aCollection, using the builder to convert - the diffs of related objects." - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure and you chose to initialize all nodes upon their allocation already, - you may implement this method to do nothing." - aCollection first - title: 'changes' - content: self - children: Array empty. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st deleted file mode 100644 index ec6574c1b..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -isLeftChosen - - self flag: #TODO."Later allow to choose which version to take" - ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left..st b/LBGitTests.package/LBGitDiff.class/instance/left..st deleted file mode 100644 index b701cc139..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/left..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left: anObject - - left := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left.st b/LBGitTests.package/LBGitDiff.class/instance/left.st deleted file mode 100644 index 7a159c36d..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/left.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left - - ^ left \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st deleted file mode 100644 index 03901d2fa..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st +++ /dev/null @@ -1,8 +0,0 @@ -Squot-diff-converting -newSquotDiffNodes - "Answer new, uninitialized SquotDiffNodes that will later be initialized - in #initializeSquotDiffNodes:with:" - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure, you may also fully initialize the nodes here already." - ^ Array with: SquotDiffNode new \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/options.st b/LBGitTests.package/LBGitDiff.class/instance/options.st deleted file mode 100644 index 2834ddca1..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/options.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -options - - ^ {self left. self right} \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right..st b/LBGitTests.package/LBGitDiff.class/instance/right..st deleted file mode 100644 index 9e650c91e..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/right..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right: anObject - - right := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right.st b/LBGitTests.package/LBGitDiff.class/instance/right.st deleted file mode 100644 index 85787af13..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/right.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right - - ^ right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st deleted file mode 100644 index 6dfbbc0ec..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-manipulation -squotAdjustToResemble: aSquotDiffNode - "Answer an object of the same type as me that describes the changes in aSquotDiffNode." - ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st deleted file mode 100644 index 2031ed160..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-patching -squotApplyTo: aShadow with: aPatcher - "Apply my changes to aShadow (the representation of an object in a snapshot) and answer the result." - aShadow content: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st deleted file mode 100644 index 8fb1815a5..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st +++ /dev/null @@ -1,5 +0,0 @@ -Squot-diff-patching -squotApplyToLoaded: anObject with: aPatcher - "Modify anObject such that it matches what I model and answer the modified object, even if it was modified in-place." - "Here the fileInfo object is modified" - ^ anObject \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st deleted file mode 100644 index 33c918cfe..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st +++ /dev/null @@ -1,9 +0,0 @@ -as yet unclassified -squotChangeAsStringOrText - - ^ -'Left: -', self left, ' - -Right: -', self right. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st deleted file mode 100644 index a261cc255..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasChanges - "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self left = self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st deleted file mode 100644 index 77972d642..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasConflicts - "Answer whether a choice must be made before this can be applied to something." - ^ self squotHasChanges \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st deleted file mode 100644 index f939af043..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -writeTo: aStream - - aStream nextPutAll: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json deleted file mode 100644 index 87a79bbe3..000000000 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "chosenOption" : "LB 11/10/2018 14:49", - "initializeSquotDiffNodes:with:" : "LB 11/10/2018 15:05", - "isLeftChosen" : "LB 11/10/2018 14:48", - "left" : "LB 11/10/2018 13:00", - "left:" : "LB 11/10/2018 13:00", - "newSquotDiffNodes" : "LB 11/10/2018 15:05", - "options" : "LB 11/10/2018 14:46", - "right" : "LB 11/10/2018 13:00", - "right:" : "LB 11/10/2018 13:00", - "squotAdjustToResemble:" : "LB 11/10/2018 15:08", - "squotApplyTo:with:" : "LB 11/10/2018 14:49", - "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", - "squotChangeAsStringOrText" : "LB 11/10/2018 15:07", - "squotHasChanges" : "LB 11/10/2018 13:26", - "squotHasConflicts" : "LB 11/10/2018 13:01", - "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/LBGitTests.package/LBGitDiff.class/properties.json b/LBGitTests.package/LBGitDiff.class/properties.json deleted file mode 100644 index b2b3d7baf..000000000 --- a/LBGitTests.package/LBGitDiff.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotDiff classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "left", - "right" ], - "name" : "LBGitDiff", - "pools" : [ - ], - "super" : "Object", - "traitcomposition" : "TSquotDiff", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileInfo.class/README.md b/LBGitTests.package/LBGitFileInfo.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on.in..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st deleted file mode 100644 index 62f9bca86..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/on.in..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -on: aString in: aFSReference - - ^ self new - path: aString; - rootDirectory: aFSReference - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st deleted file mode 100644 index fea34725e..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ /dev/null @@ -1,12 +0,0 @@ -as yet unclassified -onGitReference: aFSReference - - | workingReference path | - self halt. - workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. - path := ''. - aFSReference path do: [:each | path := path,'/',each]. - path := path copyFrom: 2 to: path size. - ^ self - on: path - in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st deleted file mode 100644 index c580153ae..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -browseFromSquot: aSquotLiveObject - - self shouldBeImplemented. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st deleted file mode 100644 index cd2676963..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -captureWithSquot: aCapturer - - ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st deleted file mode 100644 index 5fc4f558b..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -captureWithSquot - - ^ self squotShadowFactory of: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/LBGitTests.package/LBGitFileInfo.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/LBGitTests.package/LBGitFileInfo.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st deleted file mode 100644 index 87a97cde3..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory: anObject - - rootDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st deleted file mode 100644 index 5d66c63e9..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st deleted file mode 100644 index 62db22e86..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotAddTransientStoreInfoTo: aTrackableObjectMetadata - - self flag: #TODO. "What does it do?" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st deleted file mode 100644 index de82a5bdc..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotRemoveTransientStoreInfoFrom: aDictionary - - self flag: #TODO. "What does it do?". \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st deleted file mode 100644 index 92de5ef7e..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShadowFactory - - ^ LBGitFileShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st deleted file mode 100644 index 026d9db0c..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShouldKeepIdentity - - ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json deleted file mode 100644 index 4b8e5cf01..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "class" : { - "on:in:" : "LB 11/10/2018 15:56", - "onGitReference:" : "LB 11/10/2018 16:44" }, - "instance" : { - "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/10/2018 14:16", - "captureWithSquot:" : "LB 11/10/2018 12:14", - "path" : "LB 11/10/2018 14:18", - "path:" : "LB 11/10/2018 14:18", - "rootDirectory" : "LB 11/10/2018 16:10", - "rootDirectory:" : "LB 11/10/2018 16:10", - "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", - "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", - "squotShadowFactory" : "LB 11/10/2018 12:18", - "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json deleted file mode 100644 index 6a7d90a58..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "path", - "rootDirectory" ], - "name" : "LBGitFileInfo", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileShadow.class/README.md b/LBGitTests.package/LBGitFileShadow.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitFileShadow.class/class/of..st deleted file mode 100644 index c66acd120..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/class/of..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -of: aFileInfo - - ^ self new - fileInfo: aFileInfo; - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st deleted file mode 100644 index 92cb0fda0..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -content: aByteArray - - "content := aByteArray." - self reference writeStream binary nextPutAll: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st deleted file mode 100644 index 859cbeb6c..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -content - - ^ self reference exists - ifTrue: [self reference readStream binary contents] - ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st deleted file mode 100644 index 0218dc36f..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileInfo: anObject - - fileInfo := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st deleted file mode 100644 index af7b2cc6a..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileInfo - - ^ fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path.st b/LBGitTests.package/LBGitFileShadow.class/instance/path.st deleted file mode 100644 index e87044962..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ self fileInfo path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st deleted file mode 100644 index 36d9c87bc..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -reference - - ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st deleted file mode 100644 index c93712c38..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ self fileInfo rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st deleted file mode 100644 index 5124065c9..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ /dev/null @@ -1,6 +0,0 @@ -Squot-shadow-diffing -squotDiffAgainst: otherShadow with: aDiffBuilder - "Answer an object that describes the differences between me and otherContent." - ^ aDiffBuilder diffFrom: self to: otherShadow - ifNew: [LBGitDiff new left: self content; right: otherShadow content.] - andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st deleted file mode 100644 index ab99dee99..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-shadow-diffing -squotDiffAgainst: otherShadow withBase: baseShadow with: aDiffBuilder - "Answer an object that describes the merge between me and otherContent based on baseContent." - ^ self squotDiffAgainst: otherShadow with: aDiffBuilder \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st deleted file mode 100644 index 1f9cfaef8..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-shadow -squotMaterializeWith: aMaterializer - "Answer the object restored from me. Double dispatch path" - ^ self fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st deleted file mode 100644 index dfaee424a..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-shadow -squotPreferredSerializer - - ^ LBGitSerializer \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st deleted file mode 100644 index cb274bde7..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotWith: aDiffBuilder diffFromSequence: leftSequence - - ^ LBGitDiff new left: leftSequence; right: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/value.st b/LBGitTests.package/LBGitFileShadow.class/instance/value.st deleted file mode 100644 index 323347cb2..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/value.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -value - - ^ self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st deleted file mode 100644 index 10e0a12a6..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st +++ /dev/null @@ -1,3 +0,0 @@ -as yet unclassified -writeTo: aStream - aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json deleted file mode 100644 index edfa216fc..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "class" : { - "of:" : "LB 11/10/2018 16:18" }, - "instance" : { - "content" : "LB 11/10/2018 16:53", - "content:" : "LB 11/10/2018 16:11", - "fileInfo" : "LB 11/10/2018 15:57", - "fileInfo:" : "LB 11/10/2018 15:57", - "path" : "LB 11/10/2018 15:57", - "reference" : "LB 11/10/2018 16:10", - "rootDirectory" : "LB 11/10/2018 15:57", - "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", - "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotMaterializeWith:" : "LB 11/10/2018 16:35", - "squotPreferredSerializer" : "LB 11/10/2018 13:41", - "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", - "value" : "LB 11/10/2018 13:09", - "writeTo:" : "LB 11/10/2018 13:29" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json deleted file mode 100644 index f0414f243..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotDiffableShadow classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "fileInfo" ], - "name" : "LBGitFileShadow", - "pools" : [ - ], - "super" : "Object", - "traitcomposition" : "TSquotDiffableShadow", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitSerializer.class/README.md b/LBGitTests.package/LBGitSerializer.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st deleted file mode 100644 index bdcaec448..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st +++ /dev/null @@ -1,5 +0,0 @@ -private -atPathOf: anArtifact writeStreamDo: aBlock - - self halt. - ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st deleted file mode 100644 index 4f2894047..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -fillContentOf: anArtifact from: aFileOrDirectoryReference - self halt. - anArtifact content: - (SquotShadowGraph withSingleShadow: - ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) - content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/version.st b/LBGitTests.package/LBGitSerializer.class/instance/version.st deleted file mode 100644 index 860f89248..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/version.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -version - - ^ '1.0.0' \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/write..st b/LBGitTests.package/LBGitSerializer.class/instance/write..st deleted file mode 100644 index 8d39ba2ac..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/write..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -write: anArtifact - - self atPathOf: anArtifact writeStreamDo: [:stream | anArtifact shadowOfTrackedObject writeTo: stream]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json deleted file mode 100644 index fa217723e..000000000 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", - "fillContentOf:from:" : "LB 11/10/2018 16:42", - "version" : "LB 11/10/2018 13:33", - "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/LBGitSerializer.class/properties.json b/LBGitTests.package/LBGitSerializer.class/properties.json deleted file mode 100644 index b8779549c..000000000 --- a/LBGitTests.package/LBGitSerializer.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotCodec classTrait + TSquotSingleFileSerializer classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitSerializer", - "pools" : [ - ], - "super" : "SquotSerializer", - "traitcomposition" : "TSquotCodec + TSquotSingleFileSerializer", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitTestClass.class/README.md b/LBGitTests.package/LBGitTestClass.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st deleted file mode 100644 index bbdb65107..000000000 --- a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -newWithFoo: aBar - - ^ self new - foo: aBar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar..st b/LBGitTests.package/LBGitTestClass.class/instance/bar..st deleted file mode 100644 index 0e6e9cb79..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/bar..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -bar: anObject - - bar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar.st b/LBGitTests.package/LBGitTestClass.class/instance/bar.st deleted file mode 100644 index 2565d11d7..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/bar.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -bar - - ^ bar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st deleted file mode 100644 index f179a17cf..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -foo: aFo - - foo := aFo. diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo.st b/LBGitTests.package/LBGitTestClass.class/instance/foo.st deleted file mode 100644 index a3edf1751..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -foo - - ^ foo \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/methodProperties.json b/LBGitTests.package/LBGitTestClass.class/methodProperties.json deleted file mode 100644 index 1933e0bd2..000000000 --- a/LBGitTests.package/LBGitTestClass.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - "newWithFoo:" : "LB 10/29/2018 17:52" }, - "instance" : { - "bar" : "LB 10/29/2018 17:52", - "bar:" : "LB 10/29/2018 17:52", - "foo" : "LB 10/29/2018 17:52", - "foo:" : "LB 10/30/2018 10:53" } } diff --git a/LBGitTests.package/LBGitTestClass.class/properties.json b/LBGitTests.package/LBGitTestClass.class/properties.json deleted file mode 100644 index 04963c3b2..000000000 --- a/LBGitTests.package/LBGitTestClass.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - "static" ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "foo", - "bar" ], - "name" : "LBGitTestClass", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st deleted file mode 100644 index b0873b3b3..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st +++ /dev/null @@ -1,6 +0,0 @@ -*LBGitTests -addFile: aString - - | path | - path := aString. self flag: #TODO. "resolve path" - self add: (LBGitFileInfo on: path in: self rootDirectory) at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st deleted file mode 100644 index f87e9b7c0..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st +++ /dev/null @@ -1,5 +0,0 @@ -*LBGitTests -rootDirectory - - self flag: #TODO."Find nicer way. Please." - ^ self repository gitRepository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json deleted file mode 100644 index 42894b92d..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "addFile:" : "LB 11/10/2018 15:55", - "rootDirectory" : "LB 11/10/2018 15:53" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/properties.json b/LBGitTests.package/SquotWorkingCopy.extension/properties.json deleted file mode 100644 index b5406e048..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotWorkingCopy" } diff --git a/LBGitTests.package/monticello.meta/categories.st b/LBGitTests.package/monticello.meta/categories.st deleted file mode 100644 index 9b204d6b5..000000000 --- a/LBGitTests.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #LBGitTests! diff --git a/LBGitTests.package/monticello.meta/initializers.st b/LBGitTests.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/properties.json b/LBGitTests.package/properties.json deleted file mode 100644 index f037444a7..000000000 --- a/LBGitTests.package/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - } diff --git a/LBOtherGitTests.package/.filetree b/LBOtherGitTests.package/.filetree deleted file mode 100644 index 8998102c2..000000000 --- a/LBOtherGitTests.package/.filetree +++ /dev/null @@ -1,4 +0,0 @@ -{ - "noMethodMetaData" : true, - "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } diff --git a/LBOtherGitTests.package/.squot-contents b/LBOtherGitTests.package/.squot-contents deleted file mode 100644 index 239ddebb0..000000000 --- a/LBOtherGitTests.package/.squot-contents +++ /dev/null @@ -1,5 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #PackageInfo, - #objectsReplacedByNames : true, - #serializer : #SquotCypressCodeSerializer -} \ No newline at end of file diff --git a/LBOtherGitTests.package/monticello.meta/categories.st b/LBOtherGitTests.package/monticello.meta/categories.st deleted file mode 100644 index 87aca10a0..000000000 --- a/LBOtherGitTests.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #LBOtherGitTests! diff --git a/LBOtherGitTests.package/monticello.meta/initializers.st b/LBOtherGitTests.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBOtherGitTests.package/properties.json b/LBOtherGitTests.package/properties.json deleted file mode 100644 index f037444a7..000000000 --- a/LBOtherGitTests.package/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - } diff --git a/README.md b/README.md deleted file mode 100644 index ead5f44c8..000000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# SmalltalkGitTesting -Add line again -Another line -* Line three diff --git a/aVeryRecognizableFile.txt b/aVeryRecognizableFile.txt deleted file mode 100644 index 98764b65e..000000000 --- a/aVeryRecognizableFile.txt +++ /dev/null @@ -1,3 +0,0 @@ -I contain pFhfDaSsd483 -I was edited -thisIsNoOverwrite.dasadsd diff --git a/newFile.txt b/newFile.txt deleted file mode 100644 index 6c2f85dd3..000000000 --- a/newFile.txt +++ /dev/null @@ -1,3 +0,0 @@ -This content -shall be -recognizable diff --git a/superduper.md b/superduper.md deleted file mode 100644 index dfbfb1ec0..000000000 --- a/superduper.md +++ /dev/null @@ -1,2 +0,0 @@ -Cool Stuff -nextline From 601cf0ed054d3a7c4088e4f6f2441137474012c3 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 12 Nov 2018 20:48:09 +0100 Subject: [PATCH 071/170] Readded code --- .squot | 3 +++ LBGitTests.package/.filetree | 4 ++++ LBGitTests.package/.squot-contents | 5 +++++ .../LBGTCNumeroDos.class/README.md | 0 .../LBGTCNumeroDos.class/instance/boar..st | 4 ++++ .../LBGTCNumeroDos.class/instance/boar.st | 4 ++++ .../LBGTCNumeroDos.class/instance/fee..st | 4 ++++ .../LBGTCNumeroDos.class/instance/fee.st | 4 ++++ .../methodProperties.json | 8 ++++++++ .../LBGTCNumeroDos.class/properties.json | 15 ++++++++++++++ LBGitTests.package/LBGitDiff.class/README.md | 0 .../LBGitDiff.class/instance/chosenOption.st | 6 ++++++ .../initializeSquotDiffNodes.with..st | 12 +++++++++++ .../LBGitDiff.class/instance/isLeftChosen.st | 5 +++++ .../LBGitDiff.class/instance/left..st | 4 ++++ .../LBGitDiff.class/instance/left.st | 4 ++++ .../instance/newSquotDiffNodes.st | 8 ++++++++ .../LBGitDiff.class/instance/options.st | 4 ++++ .../LBGitDiff.class/instance/right..st | 4 ++++ .../LBGitDiff.class/instance/right.st | 4 ++++ .../instance/squotAdjustToResemble..st | 4 ++++ .../instance/squotApplyTo.with..st | 4 ++++ .../instance/squotApplyToLoaded.with..st | 5 +++++ .../instance/squotChangeAsStringOrText.st | 9 +++++++++ .../instance/squotHasChanges.st | 4 ++++ .../instance/squotHasConflicts.st | 4 ++++ .../LBGitDiff.class/instance/writeTo..st | 4 ++++ .../LBGitDiff.class/methodProperties.json | 20 +++++++++++++++++++ .../LBGitDiff.class/properties.json | 17 ++++++++++++++++ .../LBGitFileInfo.class/README.md | 0 .../LBGitFileInfo.class/class/on.in..st | 7 +++++++ .../class/onGitReference..st | 12 +++++++++++ .../instance/browseFromSquot..st | 4 ++++ .../instance/captureWithSquot..st | 4 ++++ .../instance/captureWithSquot.st | 4 ++++ .../LBGitFileInfo.class/instance/path..st | 4 ++++ .../LBGitFileInfo.class/instance/path.st | 4 ++++ .../instance/rootDirectory..st | 4 ++++ .../instance/rootDirectory.st | 4 ++++ .../instance/squotAddTransientStoreInfoTo..st | 4 ++++ .../squotRemoveTransientStoreInfoFrom..st | 4 ++++ .../instance/squotShadowFactory.st | 4 ++++ .../instance/squotShouldKeepIdentity.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 16 +++++++++++++++ .../LBGitFileInfo.class/properties.json | 15 ++++++++++++++ .../LBGitFileShadow.class/README.md | 0 .../LBGitFileShadow.class/class/of..st | 6 ++++++ .../instance/content..st | 5 +++++ .../LBGitFileShadow.class/instance/content.st | 6 ++++++ .../instance/fileInfo..st | 4 ++++ .../instance/fileInfo.st | 4 ++++ .../LBGitFileShadow.class/instance/path.st | 4 ++++ .../instance/reference.st | 4 ++++ .../instance/rootDirectory.st | 4 ++++ .../instance/squotDiffAgainst.with..st | 6 ++++++ .../squotDiffAgainst.withBase.with..st | 4 ++++ .../instance/squotMaterializeWith..st | 4 ++++ .../instance/squotPreferredSerializer.st | 4 ++++ .../instance/squotWith.diffFromSequence..st | 4 ++++ .../LBGitFileShadow.class/instance/value.st | 4 ++++ .../instance/writeTo..st | 3 +++ .../methodProperties.json | 18 +++++++++++++++++ .../LBGitFileShadow.class/properties.json | 16 +++++++++++++++ .../LBGitSerializer.class/README.md | 0 .../instance/atPathOf.writeStreamDo..st | 5 +++++ .../instance/fillContentOf.from..st | 7 +++++++ .../LBGitSerializer.class/instance/version.st | 4 ++++ .../LBGitSerializer.class/instance/write..st | 4 ++++ .../methodProperties.json | 8 ++++++++ .../LBGitSerializer.class/properties.json | 16 +++++++++++++++ .../LBGitTestClass.class/README.md | 0 .../LBGitTestClass.class/class/newWithFoo..st | 5 +++++ .../LBGitTestClass.class/instance/bar..st | 4 ++++ .../LBGitTestClass.class/instance/bar.st | 4 ++++ .../LBGitTestClass.class/instance/foo..st | 4 ++++ .../LBGitTestClass.class/instance/foo.st | 4 ++++ .../methodProperties.json | 8 ++++++++ .../LBGitTestClass.class/properties.json | 15 ++++++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 LBGitTests.package/properties.json | 2 ++ 81 files changed, 458 insertions(+) create mode 100644 .squot create mode 100644 LBGitTests.package/.filetree create mode 100644 LBGitTests.package/.squot-contents create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/README.md create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json create mode 100644 LBGitTests.package/LBGTCNumeroDos.class/properties.json create mode 100644 LBGitTests.package/LBGitDiff.class/README.md create mode 100644 LBGitTests.package/LBGitDiff.class/instance/chosenOption.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/left..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/left.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/options.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/right..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/right.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st create mode 100644 LBGitTests.package/LBGitDiff.class/instance/writeTo..st create mode 100644 LBGitTests.package/LBGitDiff.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitDiff.class/properties.json create mode 100644 LBGitTests.package/LBGitFileInfo.class/README.md create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on.in..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileInfo.class/properties.json create mode 100644 LBGitTests.package/LBGitFileShadow.class/README.md create mode 100644 LBGitTests.package/LBGitFileShadow.class/class/of..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/reference.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/value.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileShadow.class/properties.json create mode 100644 LBGitTests.package/LBGitSerializer.class/README.md create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/version.st create mode 100644 LBGitTests.package/LBGitSerializer.class/instance/write..st create mode 100644 LBGitTests.package/LBGitSerializer.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitSerializer.class/properties.json create mode 100644 LBGitTests.package/LBGitTestClass.class/README.md create mode 100644 LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar.st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo..st create mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo.st create mode 100644 LBGitTests.package/LBGitTestClass.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitTestClass.class/properties.json create mode 100644 LBGitTests.package/monticello.meta/categories.st create mode 100644 LBGitTests.package/monticello.meta/initializers.st create mode 100644 LBGitTests.package/properties.json diff --git a/.squot b/.squot new file mode 100644 index 000000000..c664d34d7 --- /dev/null +++ b/.squot @@ -0,0 +1,3 @@ +OrderedDictionary { + 'LBGitTests.package' : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/LBGitTests.package/.filetree b/LBGitTests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/LBGitTests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/LBGitTests.package/.squot-contents b/LBGitTests.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/LBGitTests.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/README.md b/LBGitTests.package/LBGTCNumeroDos.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st new file mode 100644 index 000000000..6f0b81ec1 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st @@ -0,0 +1,4 @@ +accessing +boar: anObject + + boar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st new file mode 100644 index 000000000..819733fa2 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st @@ -0,0 +1,4 @@ +accessing +boar + + ^ boar \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st new file mode 100644 index 000000000..2cef768d7 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st @@ -0,0 +1,4 @@ +accessing +fee: anObject + + fee := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st new file mode 100644 index 000000000..4525b6127 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st @@ -0,0 +1,4 @@ +accessing +fee + + ^ fee \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json new file mode 100644 index 000000000..497c8ec3a --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + }, + "instance" : { + "boar" : "LB 11/10/2018 11:29", + "boar:" : "LB 11/10/2018 11:29", + "fee" : "LB 11/10/2018 11:29", + "fee:" : "LB 11/10/2018 11:29" } } diff --git a/LBGitTests.package/LBGTCNumeroDos.class/properties.json b/LBGitTests.package/LBGTCNumeroDos.class/properties.json new file mode 100644 index 000000000..18e617c80 --- /dev/null +++ b/LBGitTests.package/LBGTCNumeroDos.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "fee", + "boar" ], + "name" : "LBGTCNumeroDos", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitDiff.class/README.md b/LBGitTests.package/LBGitDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st new file mode 100644 index 000000000..5a210b635 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st @@ -0,0 +1,6 @@ +as yet unclassified +chosenOption + + ^ self isLeftChosen + ifTrue: [self options first] + ifFalse: [self options second] \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st new file mode 100644 index 000000000..10f6ec245 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st @@ -0,0 +1,12 @@ +Squot-diff-converting +initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder + "Initialize the previously allocated diff nodes in aCollection, using the builder to convert + the diffs of related objects." + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure and you chose to initialize all nodes upon their allocation already, + you may implement this method to do nothing." + aCollection first + title: 'changes' + content: self + children: Array empty. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st new file mode 100644 index 000000000..ec6574c1b --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st @@ -0,0 +1,5 @@ +as yet unclassified +isLeftChosen + + self flag: #TODO."Later allow to choose which version to take" + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left..st b/LBGitTests.package/LBGitDiff.class/instance/left..st new file mode 100644 index 000000000..b701cc139 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/left..st @@ -0,0 +1,4 @@ +accessing +left: anObject + + left := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left.st b/LBGitTests.package/LBGitDiff.class/instance/left.st new file mode 100644 index 000000000..7a159c36d --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/left.st @@ -0,0 +1,4 @@ +accessing +left + + ^ left \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st new file mode 100644 index 000000000..03901d2fa --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st @@ -0,0 +1,8 @@ +Squot-diff-converting +newSquotDiffNodes + "Answer new, uninitialized SquotDiffNodes that will later be initialized + in #initializeSquotDiffNodes:with:" + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure, you may also fully initialize the nodes here already." + ^ Array with: SquotDiffNode new \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/options.st b/LBGitTests.package/LBGitDiff.class/instance/options.st new file mode 100644 index 000000000..2834ddca1 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/options.st @@ -0,0 +1,4 @@ +as yet unclassified +options + + ^ {self left. self right} \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right..st b/LBGitTests.package/LBGitDiff.class/instance/right..st new file mode 100644 index 000000000..9e650c91e --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/right..st @@ -0,0 +1,4 @@ +accessing +right: anObject + + right := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right.st b/LBGitTests.package/LBGitDiff.class/instance/right.st new file mode 100644 index 000000000..85787af13 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/right.st @@ -0,0 +1,4 @@ +accessing +right + + ^ right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st new file mode 100644 index 000000000..6dfbbc0ec --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st @@ -0,0 +1,4 @@ +Squot-diff-manipulation +squotAdjustToResemble: aSquotDiffNode + "Answer an object of the same type as me that describes the changes in aSquotDiffNode." + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st new file mode 100644 index 000000000..2031ed160 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st @@ -0,0 +1,4 @@ +Squot-diff-patching +squotApplyTo: aShadow with: aPatcher + "Apply my changes to aShadow (the representation of an object in a snapshot) and answer the result." + aShadow content: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st new file mode 100644 index 000000000..8fb1815a5 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st @@ -0,0 +1,5 @@ +Squot-diff-patching +squotApplyToLoaded: anObject with: aPatcher + "Modify anObject such that it matches what I model and answer the modified object, even if it was modified in-place." + "Here the fileInfo object is modified" + ^ anObject \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..33c918cfe --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,9 @@ +as yet unclassified +squotChangeAsStringOrText + + ^ +'Left: +', self left, ' + +Right: +', self right. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st new file mode 100644 index 000000000..a261cc255 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasChanges + "Answer false if the two compared objects were equal, answer true if there were diffs." + ^ self left = self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st new file mode 100644 index 000000000..77972d642 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasConflicts + "Answer whether a choice must be made before this can be applied to something." + ^ self squotHasChanges \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st new file mode 100644 index 000000000..f939af043 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st @@ -0,0 +1,4 @@ +as yet unclassified +writeTo: aStream + + aStream nextPutAll: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json new file mode 100644 index 000000000..87a79bbe3 --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -0,0 +1,20 @@ +{ + "class" : { + }, + "instance" : { + "chosenOption" : "LB 11/10/2018 14:49", + "initializeSquotDiffNodes:with:" : "LB 11/10/2018 15:05", + "isLeftChosen" : "LB 11/10/2018 14:48", + "left" : "LB 11/10/2018 13:00", + "left:" : "LB 11/10/2018 13:00", + "newSquotDiffNodes" : "LB 11/10/2018 15:05", + "options" : "LB 11/10/2018 14:46", + "right" : "LB 11/10/2018 13:00", + "right:" : "LB 11/10/2018 13:00", + "squotAdjustToResemble:" : "LB 11/10/2018 15:08", + "squotApplyTo:with:" : "LB 11/10/2018 14:49", + "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", + "squotChangeAsStringOrText" : "LB 11/10/2018 15:07", + "squotHasChanges" : "LB 11/10/2018 13:26", + "squotHasConflicts" : "LB 11/10/2018 13:01", + "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/LBGitTests.package/LBGitDiff.class/properties.json b/LBGitTests.package/LBGitDiff.class/properties.json new file mode 100644 index 000000000..b2b3d7baf --- /dev/null +++ b/LBGitTests.package/LBGitDiff.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotDiff classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "left", + "right" ], + "name" : "LBGitDiff", + "pools" : [ + ], + "super" : "Object", + "traitcomposition" : "TSquotDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileInfo.class/README.md b/LBGitTests.package/LBGitFileInfo.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on.in..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st new file mode 100644 index 000000000..62f9bca86 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st @@ -0,0 +1,7 @@ +as yet unclassified +on: aString in: aFSReference + + ^ self new + path: aString; + rootDirectory: aFSReference + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st new file mode 100644 index 000000000..fea34725e --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -0,0 +1,12 @@ +as yet unclassified +onGitReference: aFSReference + + | workingReference path | + self halt. + workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. + path := ''. + aFSReference path do: [:each | path := path,'/',each]. + path := path copyFrom: 2 to: path size. + ^ self + on: path + in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st new file mode 100644 index 000000000..c580153ae --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +browseFromSquot: aSquotLiveObject + + self shouldBeImplemented. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st new file mode 100644 index 000000000..cd2676963 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot: aCapturer + + ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st new file mode 100644 index 000000000..5fc4f558b --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -0,0 +1,4 @@ +as yet unclassified +captureWithSquot + + ^ self squotShadowFactory of: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/LBGitTests.package/LBGitFileInfo.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/LBGitTests.package/LBGitFileInfo.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st new file mode 100644 index 000000000..87a97cde3 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st @@ -0,0 +1,4 @@ +accessing +rootDirectory: anObject + + rootDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st new file mode 100644 index 000000000..5d66c63e9 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st new file mode 100644 index 000000000..62db22e86 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st @@ -0,0 +1,4 @@ +as yet unclassified +squotAddTransientStoreInfoTo: aTrackableObjectMetadata + + self flag: #TODO. "What does it do?" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st new file mode 100644 index 000000000..de82a5bdc --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st @@ -0,0 +1,4 @@ +as yet unclassified +squotRemoveTransientStoreInfoFrom: aDictionary + + self flag: #TODO. "What does it do?". \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st new file mode 100644 index 000000000..92de5ef7e --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShadowFactory + + ^ LBGitFileShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st new file mode 100644 index 000000000..026d9db0c --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st @@ -0,0 +1,4 @@ +as yet unclassified +squotShouldKeepIdentity + + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json new file mode 100644 index 000000000..4b8e5cf01 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -0,0 +1,16 @@ +{ + "class" : { + "on:in:" : "LB 11/10/2018 15:56", + "onGitReference:" : "LB 11/10/2018 16:44" }, + "instance" : { + "browseFromSquot:" : "LB 11/10/2018 12:00", + "captureWithSquot" : "LB 11/10/2018 14:16", + "captureWithSquot:" : "LB 11/10/2018 12:14", + "path" : "LB 11/10/2018 14:18", + "path:" : "LB 11/10/2018 14:18", + "rootDirectory" : "LB 11/10/2018 16:10", + "rootDirectory:" : "LB 11/10/2018 16:10", + "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", + "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", + "squotShadowFactory" : "LB 11/10/2018 12:18", + "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json new file mode 100644 index 000000000..6a7d90a58 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "path", + "rootDirectory" ], + "name" : "LBGitFileInfo", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileShadow.class/README.md b/LBGitTests.package/LBGitFileShadow.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitFileShadow.class/class/of..st new file mode 100644 index 000000000..c66acd120 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/class/of..st @@ -0,0 +1,6 @@ +as yet unclassified +of: aFileInfo + + ^ self new + fileInfo: aFileInfo; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st new file mode 100644 index 000000000..92cb0fda0 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -0,0 +1,5 @@ +as yet unclassified +content: aByteArray + + "content := aByteArray." + self reference writeStream binary nextPutAll: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st new file mode 100644 index 000000000..859cbeb6c --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -0,0 +1,6 @@ +as yet unclassified +content + + ^ self reference exists + ifTrue: [self reference readStream binary contents] + ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st new file mode 100644 index 000000000..0218dc36f --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st @@ -0,0 +1,4 @@ +accessing +fileInfo: anObject + + fileInfo := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st new file mode 100644 index 000000000..af7b2cc6a --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st @@ -0,0 +1,4 @@ +accessing +fileInfo + + ^ fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path.st b/LBGitTests.package/LBGitFileShadow.class/instance/path.st new file mode 100644 index 000000000..e87044962 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ self fileInfo path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st new file mode 100644 index 000000000..36d9c87bc --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st @@ -0,0 +1,4 @@ +as yet unclassified +reference + + ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st new file mode 100644 index 000000000..c93712c38 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ self fileInfo rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st new file mode 100644 index 000000000..5124065c9 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -0,0 +1,6 @@ +Squot-shadow-diffing +squotDiffAgainst: otherShadow with: aDiffBuilder + "Answer an object that describes the differences between me and otherContent." + ^ aDiffBuilder diffFrom: self to: otherShadow + ifNew: [LBGitDiff new left: self content; right: otherShadow content.] + andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st new file mode 100644 index 000000000..ab99dee99 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st @@ -0,0 +1,4 @@ +Squot-shadow-diffing +squotDiffAgainst: otherShadow withBase: baseShadow with: aDiffBuilder + "Answer an object that describes the merge between me and otherContent based on baseContent." + ^ self squotDiffAgainst: otherShadow with: aDiffBuilder \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st new file mode 100644 index 000000000..1f9cfaef8 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st @@ -0,0 +1,4 @@ +Squot-shadow +squotMaterializeWith: aMaterializer + "Answer the object restored from me. Double dispatch path" + ^ self fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st new file mode 100644 index 000000000..dfaee424a --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st @@ -0,0 +1,4 @@ +Squot-shadow +squotPreferredSerializer + + ^ LBGitSerializer \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st new file mode 100644 index 000000000..cb274bde7 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st @@ -0,0 +1,4 @@ +as yet unclassified +squotWith: aDiffBuilder diffFromSequence: leftSequence + + ^ LBGitDiff new left: leftSequence; right: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/value.st b/LBGitTests.package/LBGitFileShadow.class/instance/value.st new file mode 100644 index 000000000..323347cb2 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/value.st @@ -0,0 +1,4 @@ +as yet unclassified +value + + ^ self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st new file mode 100644 index 000000000..10e0a12a6 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st @@ -0,0 +1,3 @@ +as yet unclassified +writeTo: aStream + aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json new file mode 100644 index 000000000..edfa216fc --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -0,0 +1,18 @@ +{ + "class" : { + "of:" : "LB 11/10/2018 16:18" }, + "instance" : { + "content" : "LB 11/10/2018 16:53", + "content:" : "LB 11/10/2018 16:11", + "fileInfo" : "LB 11/10/2018 15:57", + "fileInfo:" : "LB 11/10/2018 15:57", + "path" : "LB 11/10/2018 15:57", + "reference" : "LB 11/10/2018 16:10", + "rootDirectory" : "LB 11/10/2018 15:57", + "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", + "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", + "squotMaterializeWith:" : "LB 11/10/2018 16:35", + "squotPreferredSerializer" : "LB 11/10/2018 13:41", + "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", + "value" : "LB 11/10/2018 13:09", + "writeTo:" : "LB 11/10/2018 13:29" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json new file mode 100644 index 000000000..f0414f243 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotDiffableShadow classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "fileInfo" ], + "name" : "LBGitFileShadow", + "pools" : [ + ], + "super" : "Object", + "traitcomposition" : "TSquotDiffableShadow", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitSerializer.class/README.md b/LBGitTests.package/LBGitSerializer.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st new file mode 100644 index 000000000..bdcaec448 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st @@ -0,0 +1,5 @@ +private +atPathOf: anArtifact writeStreamDo: aBlock + + self halt. + ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st new file mode 100644 index 000000000..4f2894047 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -0,0 +1,7 @@ +as yet unclassified +fillContentOf: anArtifact from: aFileOrDirectoryReference + self halt. + anArtifact content: + (SquotShadowGraph withSingleShadow: + ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) + content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/version.st b/LBGitTests.package/LBGitSerializer.class/instance/version.st new file mode 100644 index 000000000..860f89248 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/version.st @@ -0,0 +1,4 @@ +as yet unclassified +version + + ^ '1.0.0' \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/write..st b/LBGitTests.package/LBGitSerializer.class/instance/write..st new file mode 100644 index 000000000..8d39ba2ac --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/instance/write..st @@ -0,0 +1,4 @@ +as yet unclassified +write: anArtifact + + self atPathOf: anArtifact writeStreamDo: [:stream | anArtifact shadowOfTrackedObject writeTo: stream]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json new file mode 100644 index 000000000..fa217723e --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + }, + "instance" : { + "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", + "fillContentOf:from:" : "LB 11/10/2018 16:42", + "version" : "LB 11/10/2018 13:33", + "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/LBGitSerializer.class/properties.json b/LBGitTests.package/LBGitSerializer.class/properties.json new file mode 100644 index 000000000..b8779549c --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotCodec classTrait + TSquotSingleFileSerializer classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitSerializer", + "pools" : [ + ], + "super" : "SquotSerializer", + "traitcomposition" : "TSquotCodec + TSquotSingleFileSerializer", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitTestClass.class/README.md b/LBGitTests.package/LBGitTestClass.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st new file mode 100644 index 000000000..bbdb65107 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st @@ -0,0 +1,5 @@ +as yet unclassified +newWithFoo: aBar + + ^ self new + foo: aBar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar..st b/LBGitTests.package/LBGitTestClass.class/instance/bar..st new file mode 100644 index 000000000..0e6e9cb79 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/bar..st @@ -0,0 +1,4 @@ +accessing +bar: anObject + + bar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar.st b/LBGitTests.package/LBGitTestClass.class/instance/bar.st new file mode 100644 index 000000000..2565d11d7 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/bar.st @@ -0,0 +1,4 @@ +accessing +bar + + ^ bar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st new file mode 100644 index 000000000..f179a17cf --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo..st @@ -0,0 +1,4 @@ +accessing +foo: aFo + + foo := aFo. diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo.st b/LBGitTests.package/LBGitTestClass.class/instance/foo.st new file mode 100644 index 000000000..a3edf1751 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/instance/foo.st @@ -0,0 +1,4 @@ +accessing +foo + + ^ foo \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/methodProperties.json b/LBGitTests.package/LBGitTestClass.class/methodProperties.json new file mode 100644 index 000000000..1933e0bd2 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "newWithFoo:" : "LB 10/29/2018 17:52" }, + "instance" : { + "bar" : "LB 10/29/2018 17:52", + "bar:" : "LB 10/29/2018 17:52", + "foo" : "LB 10/29/2018 17:52", + "foo:" : "LB 10/30/2018 10:53" } } diff --git a/LBGitTests.package/LBGitTestClass.class/properties.json b/LBGitTests.package/LBGitTestClass.class/properties.json new file mode 100644 index 000000000..04963c3b2 --- /dev/null +++ b/LBGitTests.package/LBGitTestClass.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + "static" ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "foo", + "bar" ], + "name" : "LBGitTestClass", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/monticello.meta/categories.st b/LBGitTests.package/monticello.meta/categories.st new file mode 100644 index 000000000..9b204d6b5 --- /dev/null +++ b/LBGitTests.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #LBGitTests! diff --git a/LBGitTests.package/monticello.meta/initializers.st b/LBGitTests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/properties.json b/LBGitTests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/LBGitTests.package/properties.json @@ -0,0 +1,2 @@ +{ + } From 3e16456aeee1541884f0ef506c521f48a737671c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 12 Nov 2018 20:56:54 +0100 Subject: [PATCH 072/170] Readded working copy extension and added serializer initialization --- .../LBGitSerializer.class/class/initialize.st | 5 +++++ .../LBGitSerializer.class/methodProperties.json | 2 +- .../SquotWorkingCopy.extension/instance/addFile..st | 6 ++++++ .../SquotWorkingCopy.extension/instance/rootDirectory.st | 5 +++++ .../SquotWorkingCopy.extension/methodProperties.json | 6 ++++++ .../SquotWorkingCopy.extension/properties.json | 2 ++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 LBGitTests.package/LBGitSerializer.class/class/initialize.st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/properties.json diff --git a/LBGitTests.package/LBGitSerializer.class/class/initialize.st b/LBGitTests.package/LBGitSerializer.class/class/initialize.st new file mode 100644 index 000000000..b2b1676d0 --- /dev/null +++ b/LBGitTests.package/LBGitSerializer.class/class/initialize.st @@ -0,0 +1,5 @@ +as yet unclassified +initialize + + super initialize. + SquotFileSystemStore addDeserializerFactory: LBGitSerializer. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index fa217723e..e160c6e5c 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - }, + "initialize" : "LB 11/12/2018 20:53" }, "instance" : { "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", "fillContentOf:from:" : "LB 11/10/2018 16:42", diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st new file mode 100644 index 000000000..b0873b3b3 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st @@ -0,0 +1,6 @@ +*LBGitTests +addFile: aString + + | path | + path := aString. self flag: #TODO. "resolve path" + self add: (LBGitFileInfo on: path in: self rootDirectory) at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st new file mode 100644 index 000000000..f87e9b7c0 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st @@ -0,0 +1,5 @@ +*LBGitTests +rootDirectory + + self flag: #TODO."Find nicer way. Please." + ^ self repository gitRepository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json new file mode 100644 index 000000000..42a6350e8 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "addFile:" : "LB 11/12/2018 20:56", + "rootDirectory" : "LB 11/12/2018 20:56" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/properties.json b/LBGitTests.package/SquotWorkingCopy.extension/properties.json new file mode 100644 index 000000000..b5406e048 --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotWorkingCopy" } From 812b33856caf8f1c4642cf2590881dd0c20c1ab9 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sat, 17 Nov 2018 12:16:23 +0100 Subject: [PATCH 073/170] Pre-Materialization commit --- .../LBGitDiff.class/instance/squotApplyTo.with..st | 3 ++- .../instance/squotChangeAsStringOrText.st | 4 ++-- .../LBGitDiff.class/instance/squotHasChanges.st | 3 ++- .../LBGitDiff.class/methodProperties.json | 8 ++++---- .../LBGitFileInfo.class/class/on.in.git..st | 8 ++++++++ .../LBGitFileInfo.class/class/onGitReference..st | 6 ++++-- .../instance/captureWithSquot.st | 4 +++- .../LBGitFileInfo.class/instance/gitDirectory..st | 4 ++++ .../LBGitFileInfo.class/instance/gitDirectory.st | 4 ++++ .../instance/squotShouldKeepIdentity.st | 2 +- .../LBGitFileInfo.class/methodProperties.json | 9 ++++++--- .../LBGitFileInfo.class/properties.json | 3 ++- .../LBGitFileShadow.class/class/new.st | 4 ++++ .../LBGitFileShadow.class/instance/content..st | 4 +++- .../LBGitFileShadow.class/instance/content.st | 6 +++++- .../LBGitFileShadow.class/instance/gitContent.st | 6 ++++++ .../LBGitFileShadow.class/instance/gitDirectory.st | 4 ++++ .../LBGitFileShadow.class/instance/gitReference.st | 4 ++++ .../LBGitFileShadow.class/instance/isOnGit..st | 4 ++++ .../LBGitFileShadow.class/instance/isOnGit.st | 4 ++++ .../instance/squotDiffAgainst.with..st | 2 +- .../instance/squotMaterializeWith..st | 4 +++- .../LBGitFileShadow.class/methodProperties.json | 14 ++++++++++---- .../LBGitFileShadow.class/properties.json | 3 ++- .../instance/atPathOf.writeStreamDo..st | 1 + .../instance/fillContentOf.from..st | 4 +++- .../LBGitSerializer.class/methodProperties.json | 4 ++-- LBGitTests.package/NoneExistent.class/README.md | 0 .../NoneExistent.class/instance/exists.st | 4 ++++ .../NoneExistent.class/instance/resolve..st | 4 ++++ .../NoneExistent.class/methodProperties.json | 6 ++++++ .../NoneExistent.class/properties.json | 14 ++++++++++++++ .../instance/addFile..st | 6 +++++- .../instance/gitDirectory.st | 4 ++++ .../methodProperties.json | 3 ++- 35 files changed, 137 insertions(+), 30 deletions(-) create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/class/new.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st create mode 100644 LBGitTests.package/NoneExistent.class/README.md create mode 100644 LBGitTests.package/NoneExistent.class/instance/exists.st create mode 100644 LBGitTests.package/NoneExistent.class/instance/resolve..st create mode 100644 LBGitTests.package/NoneExistent.class/methodProperties.json create mode 100644 LBGitTests.package/NoneExistent.class/properties.json create mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st index 2031ed160..0796452e3 100644 --- a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st +++ b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st @@ -1,4 +1,5 @@ Squot-diff-patching squotApplyTo: aShadow with: aPatcher "Apply my changes to aShadow (the representation of an object in a snapshot) and answer the result." - aShadow content: self chosenOption. \ No newline at end of file + aShadow content: self chosenOption. + ^ aShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st index 33c918cfe..bb5c5557b 100644 --- a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st +++ b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st @@ -2,8 +2,8 @@ as yet unclassified squotChangeAsStringOrText ^ -'Left: +'New Value: ', self left, ' -Right: +Old Value: ', self right. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st index a261cc255..cd4a907fc 100644 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st @@ -1,4 +1,5 @@ Squot-diff-testing squotHasChanges "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self left = self right \ No newline at end of file + self halt. + ^ self left ~= self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json index 87a79bbe3..b009d146f 100644 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -6,15 +6,15 @@ "initializeSquotDiffNodes:with:" : "LB 11/10/2018 15:05", "isLeftChosen" : "LB 11/10/2018 14:48", "left" : "LB 11/10/2018 13:00", - "left:" : "LB 11/10/2018 13:00", + "left:" : "LB 11/14/2018 20:41", "newSquotDiffNodes" : "LB 11/10/2018 15:05", "options" : "LB 11/10/2018 14:46", "right" : "LB 11/10/2018 13:00", "right:" : "LB 11/10/2018 13:00", "squotAdjustToResemble:" : "LB 11/10/2018 15:08", - "squotApplyTo:with:" : "LB 11/10/2018 14:49", + "squotApplyTo:with:" : "LB 11/13/2018 16:52", "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", - "squotChangeAsStringOrText" : "LB 11/10/2018 15:07", - "squotHasChanges" : "LB 11/10/2018 13:26", + "squotChangeAsStringOrText" : "LB 11/13/2018 14:47", + "squotHasChanges" : "LB 11/13/2018 17:24", "squotHasConflicts" : "LB 11/10/2018 13:01", "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st new file mode 100644 index 000000000..4eea431d4 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st @@ -0,0 +1,8 @@ +as yet unclassified +on: aString in: rootFSReference git: gitFSReference + + ^ self new + path: aString; + rootDirectory: rootFSReference; + gitDirectory: gitFSReference; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st index fea34725e..5aa505d18 100644 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -1,12 +1,14 @@ as yet unclassified onGitReference: aFSReference - | workingReference path | + | workingReference gitReference path | self halt. workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. + gitReference := aFSReference parent. path := ''. aFSReference path do: [:each | path := path,'/',each]. path := path copyFrom: 2 to: path size. ^ self on: path - in: workingReference \ No newline at end of file + in: workingReference + git: gitReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st index 5fc4f558b..9f0a02556 100644 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -1,4 +1,6 @@ as yet unclassified captureWithSquot - ^ self squotShadowFactory of: self \ No newline at end of file + ^ (self squotShadowFactory of: self) + isOnGit: false; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st new file mode 100644 index 000000000..27307472c --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st @@ -0,0 +1,4 @@ +accessing +gitDirectory: anObject + + gitDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st new file mode 100644 index 000000000..95d260572 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st @@ -0,0 +1,4 @@ +accessing +gitDirectory + + ^ gitDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st index 026d9db0c..921620b77 100644 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st @@ -1,4 +1,4 @@ as yet unclassified squotShouldKeepIdentity - ^ true \ No newline at end of file + ^ false \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 4b8e5cf01..d20d1746f 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,11 +1,14 @@ { "class" : { "on:in:" : "LB 11/10/2018 15:56", - "onGitReference:" : "LB 11/10/2018 16:44" }, + "on:in:git:" : "LB 11/13/2018 17:02", + "onGitReference:" : "LB 11/13/2018 17:02" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/10/2018 14:16", + "captureWithSquot" : "LB 11/14/2018 20:02", "captureWithSquot:" : "LB 11/10/2018 12:14", + "gitDirectory" : "LB 11/13/2018 17:01", + "gitDirectory:" : "LB 11/13/2018 17:01", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", "rootDirectory" : "LB 11/10/2018 16:10", @@ -13,4 +16,4 @@ "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", - "squotShouldKeepIdentity" : "LB 11/10/2018 12:12" } } + "squotShouldKeepIdentity" : "LB 11/14/2018 22:38" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json index 6a7d90a58..9c96d0f75 100644 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -7,7 +7,8 @@ "commentStamp" : "", "instvars" : [ "path", - "rootDirectory" ], + "rootDirectory", + "gitDirectory" ], "name" : "LBGitFileInfo", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileShadow.class/class/new.st b/LBGitTests.package/LBGitFileShadow.class/class/new.st new file mode 100644 index 000000000..25e7f5457 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/class/new.st @@ -0,0 +1,4 @@ +as yet unclassified +new + + ^ super new \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st index 92cb0fda0..088f00744 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -2,4 +2,6 @@ as yet unclassified content: aByteArray "content := aByteArray." - self reference writeStream binary nextPutAll: aByteArray \ No newline at end of file + self reference writeStream binary + nextPutAll: aByteArray; + close. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index 859cbeb6c..39c86f446 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -2,5 +2,9 @@ as yet unclassified content ^ self reference exists - ifTrue: [self reference readStream binary contents] + ifTrue: [| stream content | + stream := self reference readStream binary. + content := stream contents. + stream close. + content] ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st new file mode 100644 index 000000000..6d9fd401e --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st @@ -0,0 +1,6 @@ +as yet unclassified +gitContent + + ^ self gitReference exists + ifTrue: [self gitReference readStream binary contents] + ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st new file mode 100644 index 000000000..139bb0f1f --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st @@ -0,0 +1,4 @@ +accessing +gitDirectory + + ^ self fileInfo gitDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st new file mode 100644 index 000000000..063ce1d9b --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st @@ -0,0 +1,4 @@ +as yet unclassified +gitReference + + ^ self gitDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st new file mode 100644 index 000000000..b53daabca --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st @@ -0,0 +1,4 @@ +accessing +isOnGit: anObject + + isOnGit := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st new file mode 100644 index 000000000..465d55c65 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st @@ -0,0 +1,4 @@ +accessing +isOnGit + + ^ isOnGit \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st index 5124065c9..65a006f14 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -2,5 +2,5 @@ Squot-shadow-diffing squotDiffAgainst: otherShadow with: aDiffBuilder "Answer an object that describes the differences between me and otherContent." ^ aDiffBuilder diffFrom: self to: otherShadow - ifNew: [LBGitDiff new left: self content; right: otherShadow content.] + ifNew: [LBGitDiff new left: self content; right: otherShadow gitContent.] andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st index 1f9cfaef8..2f3cf2481 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st @@ -1,4 +1,6 @@ Squot-shadow squotMaterializeWith: aMaterializer "Answer the object restored from me. Double dispatch path" - ^ self fileInfo \ No newline at end of file + self flag: #TODO. "Is this where I should write my file?" + ^ self fileInfo + "^ aMaterializer materialize: self in: self fileInfo" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index edfa216fc..5824493a8 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -1,17 +1,23 @@ { "class" : { + "new" : "LB 11/14/2018 20:41", "of:" : "LB 11/10/2018 16:18" }, "instance" : { - "content" : "LB 11/10/2018 16:53", - "content:" : "LB 11/10/2018 16:11", + "content" : "LB 11/13/2018 17:51", + "content:" : "LB 11/13/2018 17:31", "fileInfo" : "LB 11/10/2018 15:57", "fileInfo:" : "LB 11/10/2018 15:57", + "gitContent" : "LB 11/13/2018 17:08", + "gitDirectory" : "LB 11/13/2018 17:00", + "gitReference" : "LB 11/13/2018 17:00", + "isOnGit" : "LB 11/14/2018 19:54", + "isOnGit:" : "LB 11/14/2018 19:54", "path" : "LB 11/10/2018 15:57", "reference" : "LB 11/10/2018 16:10", "rootDirectory" : "LB 11/10/2018 15:57", - "squotDiffAgainst:with:" : "LB 11/10/2018 13:25", + "squotDiffAgainst:with:" : "LB 11/13/2018 17:12", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotMaterializeWith:" : "LB 11/10/2018 16:35", + "squotMaterializeWith:" : "LB 11/14/2018 22:39", "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index f0414f243..2ac68512d 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -7,7 +7,8 @@ ], "commentStamp" : "", "instvars" : [ - "fileInfo" ], + "fileInfo", + "isOnGit" ], "name" : "LBGitFileShadow", "pools" : [ ], diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st index bdcaec448..1242a1eb7 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st @@ -2,4 +2,5 @@ private atPathOf: anArtifact writeStreamDo: aBlock self halt. + "This writes a file shadow to the git system." ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index 4f2894047..a87f25a49 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -4,4 +4,6 @@ fillContentOf: anArtifact from: aFileOrDirectoryReference anArtifact content: (SquotShadowGraph withSingleShadow: ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) - content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]))) \ No newline at end of file + content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]); + isOnGit: true; + yourself)) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index e160c6e5c..aee3c258d 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "initialize" : "LB 11/12/2018 20:53" }, "instance" : { - "atPathOf:writeStreamDo:" : "LB 11/10/2018 14:12", - "fillContentOf:from:" : "LB 11/10/2018 16:42", + "atPathOf:writeStreamDo:" : "LB 11/14/2018 20:26", + "fillContentOf:from:" : "LB 11/14/2018 20:16", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/NoneExistent.class/README.md b/LBGitTests.package/NoneExistent.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/NoneExistent.class/instance/exists.st b/LBGitTests.package/NoneExistent.class/instance/exists.st new file mode 100644 index 000000000..0fd45843b --- /dev/null +++ b/LBGitTests.package/NoneExistent.class/instance/exists.st @@ -0,0 +1,4 @@ +as yet unclassified +exists + + ^ false \ No newline at end of file diff --git a/LBGitTests.package/NoneExistent.class/instance/resolve..st b/LBGitTests.package/NoneExistent.class/instance/resolve..st new file mode 100644 index 000000000..25c591cda --- /dev/null +++ b/LBGitTests.package/NoneExistent.class/instance/resolve..st @@ -0,0 +1,4 @@ +as yet unclassified +resolve: anything + + ^ self \ No newline at end of file diff --git a/LBGitTests.package/NoneExistent.class/methodProperties.json b/LBGitTests.package/NoneExistent.class/methodProperties.json new file mode 100644 index 000000000..5030f0369 --- /dev/null +++ b/LBGitTests.package/NoneExistent.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "exists" : "LB 11/13/2018 17:14", + "resolve:" : "LB 11/13/2018 17:15" } } diff --git a/LBGitTests.package/NoneExistent.class/properties.json b/LBGitTests.package/NoneExistent.class/properties.json new file mode 100644 index 000000000..e8a794f48 --- /dev/null +++ b/LBGitTests.package/NoneExistent.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "NoneExistent", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st index b0873b3b3..aea37df8b 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st @@ -3,4 +3,8 @@ addFile: aString | path | path := aString. self flag: #TODO. "resolve path" - self add: (LBGitFileInfo on: path in: self rootDirectory) at: path. \ No newline at end of file + self add: (LBGitFileInfo + on: path + in: self rootDirectory + git: NoneExistent new) + at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st new file mode 100644 index 000000000..0759acffd --- /dev/null +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st @@ -0,0 +1,4 @@ +*LBGitTests +gitDirectory + + ^ self repository gitRepository repository baseDir \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json index 42a6350e8..f664c122b 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json +++ b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json @@ -2,5 +2,6 @@ "class" : { }, "instance" : { - "addFile:" : "LB 11/12/2018 20:56", + "addFile:" : "LB 11/13/2018 17:27", + "gitDirectory" : "LB 11/13/2018 17:06", "rootDirectory" : "LB 11/12/2018 20:56" } } From 2df213807c0f9c1513bcfa09a673d62d48a17f72 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 18 Nov 2018 13:43:16 +0100 Subject: [PATCH 074/170] Unstable materialization 1 --- .../LBGTCNumeroDos.class/instance/boar..st | 4 ---- .../LBGTCNumeroDos.class/instance/boar.st | 4 ---- .../LBGTCNumeroDos.class/instance/fee..st | 4 ---- .../LBGTCNumeroDos.class/instance/fee.st | 4 ---- .../methodProperties.json | 8 ------- .../README.md | 0 .../class/onReference..st | 6 +++++ .../instance/content.st | 4 ++++ .../methodProperties.json | 5 +++++ .../properties.json | 7 +++--- .../instance/squotHasChanges.st | 1 - .../LBGitDiff.class/methodProperties.json | 2 +- .../LBGitFileInfo.class/class/on.in.git..st | 8 ------- .../class/onGitReference..st | 1 - .../instance/captureWithSquot.st | 5 ++--- .../LBGitFileInfo.class/instance/content..st | 6 +++++ .../LBGitFileInfo.class/instance/content.st | 8 +++++++ .../instance/gitDirectory..st | 4 ---- .../instance/gitDirectory.st | 4 ---- .../LBGitFileInfo.class/instance/reference.st | 4 ++++ .../LBGitFileInfo.class/methodProperties.json | 10 ++++----- .../LBGitFileInfo.class/properties.json | 3 +-- .../LBGitFileShadow.class/class/new.st | 4 ---- .../instance/content..st | 1 + .../LBGitFileShadow.class/instance/content.st | 1 + .../instance/gitContent.st | 8 ++++--- .../instance/gitDirectory.st | 4 ---- .../instance/gitReference..st | 4 ++++ .../instance/gitReference.st | 4 ++-- .../instance/isOnGit..st | 4 ---- .../LBGitFileShadow.class/instance/isOnGit.st | 4 ---- .../instance/rootDirectory.st | 4 ---- .../instance/squotDiffAgainst.with..st | 2 +- .../instance/squotMaterializeWith..st | 2 +- .../instance/writeTo..st | 2 ++ .../methodProperties.json | 22 ++++++++----------- .../LBGitFileShadow.class/properties.json | 2 +- .../README.md | 0 .../class/of..st | 0 .../instance/content..st | 4 ++++ .../instance/content.st | 4 ++++ .../methodProperties.json | 6 +++++ .../properties.json | 4 ++-- .../instance/atPathOf.writeStreamDo..st | 1 - .../instance/fillContentOf.from..st | 7 ++---- .../LBGitSerializer.class/instance/version.st | 2 +- .../LBGitSerializer.class/instance/write..st | 2 +- .../methodProperties.json | 4 ++-- .../LBGitTestClass.class/class/newWithFoo..st | 5 ----- .../LBGitTestClass.class/instance/bar..st | 4 ---- .../LBGitTestClass.class/instance/bar.st | 4 ---- .../LBGitTestClass.class/instance/foo..st | 4 ---- .../LBGitTestClass.class/instance/foo.st | 4 ---- .../methodProperties.json | 8 ------- .../LBGitTestClass.class/properties.json | 15 ------------- .../NoneExistent.class/README.md | 0 .../NoneExistent.class/instance/exists.st | 4 ---- .../NoneExistent.class/instance/resolve..st | 4 ---- .../NoneExistent.class/methodProperties.json | 6 ----- .../instance/addFile..st | 3 +-- .../methodProperties.json | 2 +- 61 files changed, 96 insertions(+), 171 deletions(-) delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st delete mode 100644 LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json rename LBGitTests.package/{LBGTCNumeroDos.class => LBGitDeserializedShadow.class}/README.md (100%) create mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st create mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st create mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json rename LBGitTests.package/{LBGTCNumeroDos.class => LBGitDeserializedShadow.class}/properties.json (68%) delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/content..st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/reference.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/class/new.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st create mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st rename LBGitTests.package/{LBGitTestClass.class => LBGitSerializedShadow.class}/README.md (100%) rename LBGitTests.package/{LBGitFileShadow.class => LBGitSerializedShadow.class}/class/of..st (100%) create mode 100644 LBGitTests.package/LBGitSerializedShadow.class/instance/content..st create mode 100644 LBGitTests.package/LBGitSerializedShadow.class/instance/content.st create mode 100644 LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json rename LBGitTests.package/{NoneExistent.class => LBGitSerializedShadow.class}/properties.json (71%) delete mode 100644 LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/bar.st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo..st delete mode 100644 LBGitTests.package/LBGitTestClass.class/instance/foo.st delete mode 100644 LBGitTests.package/LBGitTestClass.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitTestClass.class/properties.json delete mode 100644 LBGitTests.package/NoneExistent.class/README.md delete mode 100644 LBGitTests.package/NoneExistent.class/instance/exists.st delete mode 100644 LBGitTests.package/NoneExistent.class/instance/resolve..st delete mode 100644 LBGitTests.package/NoneExistent.class/methodProperties.json diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st deleted file mode 100644 index 6f0b81ec1..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boar: anObject - - boar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st deleted file mode 100644 index 819733fa2..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/boar.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boar - - ^ boar \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st deleted file mode 100644 index 2cef768d7..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fee: anObject - - fee := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st b/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st deleted file mode 100644 index 4525b6127..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/instance/fee.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fee - - ^ fee \ No newline at end of file diff --git a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json b/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json deleted file mode 100644 index 497c8ec3a..000000000 --- a/LBGitTests.package/LBGTCNumeroDos.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "boar" : "LB 11/10/2018 11:29", - "boar:" : "LB 11/10/2018 11:29", - "fee" : "LB 11/10/2018 11:29", - "fee:" : "LB 11/10/2018 11:29" } } diff --git a/LBGitTests.package/LBGTCNumeroDos.class/README.md b/LBGitTests.package/LBGitDeserializedShadow.class/README.md similarity index 100% rename from LBGitTests.package/LBGTCNumeroDos.class/README.md rename to LBGitTests.package/LBGitDeserializedShadow.class/README.md diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st b/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st new file mode 100644 index 000000000..5d0de69aa --- /dev/null +++ b/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st @@ -0,0 +1,6 @@ +as yet unclassified +onReference: aFileReference + + ^ self new + gitReference: aFileReference; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st b/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st new file mode 100644 index 000000000..05dbfbb34 --- /dev/null +++ b/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st @@ -0,0 +1,4 @@ +as yet unclassified +content + + ^ self gitContent \ No newline at end of file diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json b/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json new file mode 100644 index 000000000..af3c6be75 --- /dev/null +++ b/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + "onReference:" : "LB 11/18/2018 13:16" }, + "instance" : { + "content" : "LB 11/18/2018 13:21" } } diff --git a/LBGitTests.package/LBGTCNumeroDos.class/properties.json b/LBGitTests.package/LBGitDeserializedShadow.class/properties.json similarity index 68% rename from LBGitTests.package/LBGTCNumeroDos.class/properties.json rename to LBGitTests.package/LBGitDeserializedShadow.class/properties.json index 18e617c80..803097ba3 100644 --- a/LBGitTests.package/LBGTCNumeroDos.class/properties.json +++ b/LBGitTests.package/LBGitDeserializedShadow.class/properties.json @@ -6,10 +6,9 @@ ], "commentStamp" : "", "instvars" : [ - "fee", - "boar" ], - "name" : "LBGTCNumeroDos", + ], + "name" : "LBGitDeserializedShadow", "pools" : [ ], - "super" : "Object", + "super" : "LBGitFileShadow", "type" : "normal" } diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st index cd4a907fc..f836d2424 100644 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st +++ b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st @@ -1,5 +1,4 @@ Squot-diff-testing squotHasChanges "Answer false if the two compared objects were equal, answer true if there were diffs." - self halt. ^ self left ~= self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json index b009d146f..f017a3ed4 100644 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitDiff.class/methodProperties.json @@ -15,6 +15,6 @@ "squotApplyTo:with:" : "LB 11/13/2018 16:52", "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", "squotChangeAsStringOrText" : "LB 11/13/2018 14:47", - "squotHasChanges" : "LB 11/13/2018 17:24", + "squotHasChanges" : "LB 11/17/2018 12:19", "squotHasConflicts" : "LB 11/10/2018 13:01", "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st deleted file mode 100644 index 4eea431d4..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/on.in.git..st +++ /dev/null @@ -1,8 +0,0 @@ -as yet unclassified -on: aString in: rootFSReference git: gitFSReference - - ^ self new - path: aString; - rootDirectory: rootFSReference; - gitDirectory: gitFSReference; - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st index 5aa505d18..2435fcf09 100644 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st @@ -2,7 +2,6 @@ as yet unclassified onGitReference: aFSReference | workingReference gitReference path | - self halt. workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. gitReference := aFSReference parent. path := ''. diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st index 9f0a02556..55fa52ae2 100644 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st @@ -1,6 +1,5 @@ as yet unclassified captureWithSquot - ^ (self squotShadowFactory of: self) - isOnGit: false; - yourself \ No newline at end of file + "self squotShadowFactory" + ^ LBGitSerializedShadow of: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/content..st b/LBGitTests.package/LBGitFileInfo.class/instance/content..st new file mode 100644 index 000000000..4fcc4f963 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/content..st @@ -0,0 +1,6 @@ +as yet unclassified +content: aByteArray + + self reference writeStream binary + nextPutAll: aByteArray; + close. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/content.st b/LBGitTests.package/LBGitFileInfo.class/instance/content.st new file mode 100644 index 000000000..e8a6679f8 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/content.st @@ -0,0 +1,8 @@ +as yet unclassified +content + + | stream content | + stream := self reference readStream binary. + content := stream contents. + stream close. + ^ content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st deleted file mode 100644 index 27307472c..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitDirectory: anObject - - gitDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st deleted file mode 100644 index 95d260572..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/gitDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitDirectory - - ^ gitDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/reference.st b/LBGitTests.package/LBGitFileInfo.class/instance/reference.st new file mode 100644 index 000000000..125968d46 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/reference.st @@ -0,0 +1,4 @@ +accessing +reference + + ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index d20d1746f..8b051c8a2 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,16 +1,16 @@ { "class" : { "on:in:" : "LB 11/10/2018 15:56", - "on:in:git:" : "LB 11/13/2018 17:02", - "onGitReference:" : "LB 11/13/2018 17:02" }, + "onGitReference:" : "LB 11/17/2018 12:19" }, "instance" : { "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/14/2018 20:02", + "captureWithSquot" : "LB 11/18/2018 13:28", "captureWithSquot:" : "LB 11/10/2018 12:14", - "gitDirectory" : "LB 11/13/2018 17:01", - "gitDirectory:" : "LB 11/13/2018 17:01", + "content" : "LB 11/18/2018 12:56", + "content:" : "LB 11/18/2018 13:32", "path" : "LB 11/10/2018 14:18", "path:" : "LB 11/10/2018 14:18", + "reference" : "LB 11/18/2018 12:35", "rootDirectory" : "LB 11/10/2018 16:10", "rootDirectory:" : "LB 11/10/2018 16:10", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json index 9c96d0f75..6a7d90a58 100644 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ b/LBGitTests.package/LBGitFileInfo.class/properties.json @@ -7,8 +7,7 @@ "commentStamp" : "", "instvars" : [ "path", - "rootDirectory", - "gitDirectory" ], + "rootDirectory" ], "name" : "LBGitFileInfo", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileShadow.class/class/new.st b/LBGitTests.package/LBGitFileShadow.class/class/new.st deleted file mode 100644 index 25e7f5457..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/class/new.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -new - - ^ super new \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st index 088f00744..bce5a5897 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content..st @@ -1,6 +1,7 @@ as yet unclassified content: aByteArray + self shouldNotImplement. "content := aByteArray." self reference writeStream binary nextPutAll: aByteArray; diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st index 39c86f446..136658f07 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/content.st @@ -1,6 +1,7 @@ as yet unclassified content + self shouldNotImplement. ^ self reference exists ifTrue: [| stream content | stream := self reference readStream binary. diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st index 6d9fd401e..b8f38369b 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st @@ -1,6 +1,8 @@ as yet unclassified gitContent - ^ self gitReference exists - ifTrue: [self gitReference readStream binary contents] - ifFalse: [nil] \ No newline at end of file + | stream content | + stream := self gitReference readStream binary. + content := stream contents. + stream close. + ^ content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st deleted file mode 100644 index 139bb0f1f..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitDirectory - - ^ self fileInfo gitDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st new file mode 100644 index 000000000..86d6a2622 --- /dev/null +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st @@ -0,0 +1,4 @@ +accessing +gitReference: anObject + + gitReference := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st index 063ce1d9b..703f56538 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing gitReference - ^ self gitDirectory resolve: self path \ No newline at end of file + ^ gitReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st deleted file mode 100644 index b53daabca..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -isOnGit: anObject - - isOnGit := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st b/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st deleted file mode 100644 index 465d55c65..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/isOnGit.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -isOnGit - - ^ isOnGit \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st deleted file mode 100644 index c93712c38..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ self fileInfo rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st index 65a006f14..3ab6a3224 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st @@ -2,5 +2,5 @@ Squot-shadow-diffing squotDiffAgainst: otherShadow with: aDiffBuilder "Answer an object that describes the differences between me and otherContent." ^ aDiffBuilder diffFrom: self to: otherShadow - ifNew: [LBGitDiff new left: self content; right: otherShadow gitContent.] + ifNew: [LBGitDiff new left: otherShadow content; right: self content.] andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st index 2f3cf2481..c4d24d6bf 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st @@ -1,6 +1,6 @@ Squot-shadow squotMaterializeWith: aMaterializer "Answer the object restored from me. Double dispatch path" - self flag: #TODO. "Is this where I should write my file?" + self halt: 'Please write me to a file'. ^ self fileInfo "^ aMaterializer materialize: self in: self fileInfo" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st index 10e0a12a6..cdfabacc9 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st @@ -1,3 +1,5 @@ as yet unclassified writeTo: aStream + + self halt. aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 5824493a8..90fdfdff1 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -1,24 +1,20 @@ { "class" : { - "new" : "LB 11/14/2018 20:41", - "of:" : "LB 11/10/2018 16:18" }, + }, "instance" : { - "content" : "LB 11/13/2018 17:51", - "content:" : "LB 11/13/2018 17:31", + "content" : "LB 11/18/2018 13:20", + "content:" : "LB 11/18/2018 13:20", "fileInfo" : "LB 11/10/2018 15:57", "fileInfo:" : "LB 11/10/2018 15:57", - "gitContent" : "LB 11/13/2018 17:08", - "gitDirectory" : "LB 11/13/2018 17:00", - "gitReference" : "LB 11/13/2018 17:00", - "isOnGit" : "LB 11/14/2018 19:54", - "isOnGit:" : "LB 11/14/2018 19:54", + "gitContent" : "LB 11/18/2018 13:13", + "gitReference" : "LB 11/18/2018 12:22", + "gitReference:" : "LB 11/18/2018 12:22", "path" : "LB 11/10/2018 15:57", "reference" : "LB 11/10/2018 16:10", - "rootDirectory" : "LB 11/10/2018 15:57", - "squotDiffAgainst:with:" : "LB 11/13/2018 17:12", + "squotDiffAgainst:with:" : "LB 11/18/2018 13:31", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotMaterializeWith:" : "LB 11/14/2018 22:39", + "squotMaterializeWith:" : "LB 11/18/2018 12:40", "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", - "writeTo:" : "LB 11/10/2018 13:29" } } + "writeTo:" : "LB 11/18/2018 13:28" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json index 2ac68512d..5a572a717 100644 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ b/LBGitTests.package/LBGitFileShadow.class/properties.json @@ -8,7 +8,7 @@ "commentStamp" : "", "instvars" : [ "fileInfo", - "isOnGit" ], + "gitReference" ], "name" : "LBGitFileShadow", "pools" : [ ], diff --git a/LBGitTests.package/LBGitTestClass.class/README.md b/LBGitTests.package/LBGitSerializedShadow.class/README.md similarity index 100% rename from LBGitTests.package/LBGitTestClass.class/README.md rename to LBGitTests.package/LBGitSerializedShadow.class/README.md diff --git a/LBGitTests.package/LBGitFileShadow.class/class/of..st b/LBGitTests.package/LBGitSerializedShadow.class/class/of..st similarity index 100% rename from LBGitTests.package/LBGitFileShadow.class/class/of..st rename to LBGitTests.package/LBGitSerializedShadow.class/class/of..st diff --git a/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st b/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st new file mode 100644 index 000000000..8e0c5f695 --- /dev/null +++ b/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st @@ -0,0 +1,4 @@ +as yet unclassified +content: aByteArray + + ^ self fileInfo content: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st b/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st new file mode 100644 index 000000000..94e439df1 --- /dev/null +++ b/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st @@ -0,0 +1,4 @@ +as yet unclassified +content + + ^ self fileInfo content \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json b/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json new file mode 100644 index 000000000..ab32c7f9f --- /dev/null +++ b/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + "of:" : "LB 11/18/2018 13:16" }, + "instance" : { + "content" : "LB 11/18/2018 13:21", + "content:" : "LB 11/18/2018 13:33" } } diff --git a/LBGitTests.package/NoneExistent.class/properties.json b/LBGitTests.package/LBGitSerializedShadow.class/properties.json similarity index 71% rename from LBGitTests.package/NoneExistent.class/properties.json rename to LBGitTests.package/LBGitSerializedShadow.class/properties.json index e8a794f48..899e97538 100644 --- a/LBGitTests.package/NoneExistent.class/properties.json +++ b/LBGitTests.package/LBGitSerializedShadow.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "NoneExistent", + "name" : "LBGitSerializedShadow", "pools" : [ ], - "super" : "Object", + "super" : "LBGitFileShadow", "type" : "normal" } diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st index 1242a1eb7..6249b87d0 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st @@ -1,6 +1,5 @@ private atPathOf: anArtifact writeStreamDo: aBlock - self halt. "This writes a file shadow to the git system." ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index a87f25a49..b36bcb924 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -1,9 +1,6 @@ as yet unclassified fillContentOf: anArtifact from: aFileOrDirectoryReference - self halt. + anArtifact content: (SquotShadowGraph withSingleShadow: - ((LBGitFileShadow of: (LBGitFileInfo onGitReference: aFileOrDirectoryReference)) - content: (aFileOrDirectoryReference readStreamDo: [:stream | stream binary contents]); - isOnGit: true; - yourself)) \ No newline at end of file + (LBGitDeserializedShadow onReference: aFileOrDirectoryReference)) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/version.st b/LBGitTests.package/LBGitSerializer.class/instance/version.st index 860f89248..df9a05a1d 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/version.st +++ b/LBGitTests.package/LBGitSerializer.class/instance/version.st @@ -1,4 +1,4 @@ -as yet unclassified +Squot serialization version ^ '1.0.0' \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/write..st b/LBGitTests.package/LBGitSerializer.class/instance/write..st index 8d39ba2ac..12c2ba55b 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/write..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/write..st @@ -1,4 +1,4 @@ -as yet unclassified +Squot serialization write: anArtifact self atPathOf: anArtifact writeStreamDo: [:stream | anArtifact shadowOfTrackedObject writeTo: stream]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json index aee3c258d..1a90a311a 100644 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ b/LBGitTests.package/LBGitSerializer.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "initialize" : "LB 11/12/2018 20:53" }, "instance" : { - "atPathOf:writeStreamDo:" : "LB 11/14/2018 20:26", - "fillContentOf:from:" : "LB 11/14/2018 20:16", + "atPathOf:writeStreamDo:" : "LB 11/17/2018 12:19", + "fillContentOf:from:" : "LB 11/18/2018 13:16", "version" : "LB 11/10/2018 13:33", "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st b/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st deleted file mode 100644 index bbdb65107..000000000 --- a/LBGitTests.package/LBGitTestClass.class/class/newWithFoo..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -newWithFoo: aBar - - ^ self new - foo: aBar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar..st b/LBGitTests.package/LBGitTestClass.class/instance/bar..st deleted file mode 100644 index 0e6e9cb79..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/bar..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -bar: anObject - - bar := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/bar.st b/LBGitTests.package/LBGitTestClass.class/instance/bar.st deleted file mode 100644 index 2565d11d7..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/bar.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -bar - - ^ bar \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo..st b/LBGitTests.package/LBGitTestClass.class/instance/foo..st deleted file mode 100644 index f179a17cf..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -foo: aFo - - foo := aFo. diff --git a/LBGitTests.package/LBGitTestClass.class/instance/foo.st b/LBGitTests.package/LBGitTestClass.class/instance/foo.st deleted file mode 100644 index a3edf1751..000000000 --- a/LBGitTests.package/LBGitTestClass.class/instance/foo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -foo - - ^ foo \ No newline at end of file diff --git a/LBGitTests.package/LBGitTestClass.class/methodProperties.json b/LBGitTests.package/LBGitTestClass.class/methodProperties.json deleted file mode 100644 index 1933e0bd2..000000000 --- a/LBGitTests.package/LBGitTestClass.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - "newWithFoo:" : "LB 10/29/2018 17:52" }, - "instance" : { - "bar" : "LB 10/29/2018 17:52", - "bar:" : "LB 10/29/2018 17:52", - "foo" : "LB 10/29/2018 17:52", - "foo:" : "LB 10/30/2018 10:53" } } diff --git a/LBGitTests.package/LBGitTestClass.class/properties.json b/LBGitTests.package/LBGitTestClass.class/properties.json deleted file mode 100644 index 04963c3b2..000000000 --- a/LBGitTests.package/LBGitTestClass.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - "static" ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "foo", - "bar" ], - "name" : "LBGitTestClass", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/NoneExistent.class/README.md b/LBGitTests.package/NoneExistent.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/NoneExistent.class/instance/exists.st b/LBGitTests.package/NoneExistent.class/instance/exists.st deleted file mode 100644 index 0fd45843b..000000000 --- a/LBGitTests.package/NoneExistent.class/instance/exists.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -exists - - ^ false \ No newline at end of file diff --git a/LBGitTests.package/NoneExistent.class/instance/resolve..st b/LBGitTests.package/NoneExistent.class/instance/resolve..st deleted file mode 100644 index 25c591cda..000000000 --- a/LBGitTests.package/NoneExistent.class/instance/resolve..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -resolve: anything - - ^ self \ No newline at end of file diff --git a/LBGitTests.package/NoneExistent.class/methodProperties.json b/LBGitTests.package/NoneExistent.class/methodProperties.json deleted file mode 100644 index 5030f0369..000000000 --- a/LBGitTests.package/NoneExistent.class/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "exists" : "LB 11/13/2018 17:14", - "resolve:" : "LB 11/13/2018 17:15" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st index aea37df8b..528d8a78d 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st +++ b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st @@ -5,6 +5,5 @@ addFile: aString path := aString. self flag: #TODO. "resolve path" self add: (LBGitFileInfo on: path - in: self rootDirectory - git: NoneExistent new) + in: self rootDirectory) at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json index f664c122b..a1d0b7eba 100644 --- a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json +++ b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json @@ -2,6 +2,6 @@ "class" : { }, "instance" : { - "addFile:" : "LB 11/13/2018 17:27", + "addFile:" : "LB 11/18/2018 12:23", "gitDirectory" : "LB 11/13/2018 17:06", "rootDirectory" : "LB 11/12/2018 20:56" } } From 7c2b5d91247c2af903aab6b93a67edddc5570c1b Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 18 Nov 2018 14:05:06 +0100 Subject: [PATCH 075/170] Materialization seems to work --- .../LBGitFileInfo.class/class/fromGitReference..st | 11 +++++++++++ .../LBGitFileInfo.class/methodProperties.json | 1 + .../instance/squotMaterializeWith..st | 5 ++++- .../LBGitFileShadow.class/methodProperties.json | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st diff --git a/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st new file mode 100644 index 000000000..772bb2dab --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st @@ -0,0 +1,11 @@ +as yet unclassified +fromGitReference: aFSReference + + | workingReference path | + workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. + path := ''. + aFSReference path do: [:each | path := path,'/',each]. + path := path copyFrom: 2 to: path size. + ^ self + on: path + in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 8b051c8a2..9e7841734 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -1,5 +1,6 @@ { "class" : { + "fromGitReference:" : "LB 11/18/2018 14:02", "on:in:" : "LB 11/10/2018 15:56", "onGitReference:" : "LB 11/17/2018 12:19" }, "instance" : { diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st index c4d24d6bf..60353849c 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st @@ -1,6 +1,9 @@ Squot-shadow squotMaterializeWith: aMaterializer "Answer the object restored from me. Double dispatch path" + | fileInfo | self halt: 'Please write me to a file'. - ^ self fileInfo + fileInfo := LBGitFileInfo fromGitReference: self gitReference. + fileInfo content: self content. + ^ fileInfo "^ aMaterializer materialize: self in: self fileInfo" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 90fdfdff1..0d2151999 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -13,7 +13,7 @@ "reference" : "LB 11/10/2018 16:10", "squotDiffAgainst:with:" : "LB 11/18/2018 13:31", "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotMaterializeWith:" : "LB 11/18/2018 12:40", + "squotMaterializeWith:" : "LB 11/18/2018 14:04", "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", From 55a8a6d0218b3613d362676bb05bb8e19dbd8376 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 22 Nov 2018 09:46:07 +0100 Subject: [PATCH 076/170] Added recorded file artifact --- .../README.md | 0 .../instance/applyToContainer..st | 5 ++++ .../instance/squotChangeAsStringOrText.st | 5 ++++ .../methodProperties.json | 6 +++++ .../properties.json | 14 +++++++++++ .../README.md | 0 .../instance/collectFilesOf..st | 10 ++++++++ .../instance/collectTrackedFiles.st | 6 +++++ .../instance/commit.st | 4 +++ .../instance/content.st | 5 ++++ .../instance/diffAgainst..st | 4 +++ .../instance/displayText.st | 6 +++++ .../instance/isLoadable.st | 4 +++ .../instance/ownerSnapshot..st | 4 +++ .../instance/ownerSnapshot.st | 4 +++ .../instance/path.st | 4 +++ .../reverseDiffAgainstUnrecordedFiles..st | 4 +++ .../instance/reverseDiffContentAgainst..st | 10 ++++++++ .../instance/rootDirectory..st | 4 +++ .../instance/rootDirectory.st | 4 +++ .../instance/trackedFiles..st | 4 +++ .../instance/trackedFiles.st | 4 +++ .../instance/wantsToBeInTableOfContents.st | 4 +++ .../methodProperties.json | 21 ++++++++++++++++ .../properties.json | 16 ++++++++++++ .../instance/fillContentOf.from..st | 2 +- LBGitTests.package/LBGitVoid.class/README.md | 0 .../LBGitVoid.class/instance/^equals.st | 4 +++ .../LBGitVoid.class/instance/content.st | 4 +++ .../LBGitVoid.class/instance/startShadow.st | 4 +++ .../LBGitVoid.class/methodProperties.json | 7 ++++++ .../LBGitVoid.class/properties.json | 14 +++++++++++ .../instance/captureLazySnapshot.st | 25 +++++++++++++++++++ .../instance/captureSnapshot.st | 22 ++++++++++++++++ .../methodProperties.json | 6 +++++ .../properties.json | 2 ++ 36 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 LBGitTests.package/LBGitArtifactReplacementDiff.class/README.md create mode 100644 LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st create mode 100644 LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st create mode 100644 LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/README.md create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json create mode 100644 LBGitTests.package/LBGitVoid.class/README.md create mode 100644 LBGitTests.package/LBGitVoid.class/instance/^equals.st create mode 100644 LBGitTests.package/LBGitVoid.class/instance/content.st create mode 100644 LBGitTests.package/LBGitVoid.class/instance/startShadow.st create mode 100644 LBGitTests.package/LBGitVoid.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitVoid.class/properties.json create mode 100644 LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st create mode 100644 LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st create mode 100644 LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json create mode 100644 LBGitTests.package/SquotFileSystemStore.extension/properties.json diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/README.md b/LBGitTests.package/LBGitArtifactReplacementDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st new file mode 100644 index 000000000..a29f3ba94 --- /dev/null +++ b/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st @@ -0,0 +1,5 @@ +as yet unclassified +applyToContainer: anObjectContainer + "right := right capture." + anObjectContainer removeAt: left path. + ^ anObjectContainer add: right \ No newline at end of file diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..6cf1745f8 --- /dev/null +++ b/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,5 @@ +as yet unclassified +squotChangeAsStringOrText + + ^ 'Removed: ', right,' + added: ', left. \ No newline at end of file diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json new file mode 100644 index 000000000..ba51bc71f --- /dev/null +++ b/LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "applyToContainer:" : "LB 11/20/2018 15:06", + "squotChangeAsStringOrText" : "LB 11/20/2018 15:04" } } diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json b/LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json new file mode 100644 index 000000000..a0ec57932 --- /dev/null +++ b/LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitArtifactReplacementDiff", + "pools" : [ + ], + "super" : "SquotArtifactDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/README.md b/LBGitTests.package/LBGitRecordedFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st new file mode 100644 index 000000000..e5d12a619 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st @@ -0,0 +1,10 @@ +as yet unclassified +collectFilesOf: aGitTreeEntrySet + + | result | + result := Set new. + aGitTreeEntrySet do: [:each | + each isInDirectoryMode + ifTrue: [(self collectFilesOf: (each object entries)) do: [:eachSub | result add: each entryName,'/', eachSub]] + ifFalse: [result add: each entryName] ]. + ^ result \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..3f58c746e --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,6 @@ +as yet unclassified +collectTrackedFiles + + self halt. + self trackedFiles: + (self collectFilesOf: self commit tree entries) \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st new file mode 100644 index 000000000..fcb3fd965 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st @@ -0,0 +1,4 @@ +as yet unclassified +commit + + ^ self rootDirectory fileSystem store revision \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st new file mode 100644 index 000000000..86acaa9e1 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st @@ -0,0 +1,5 @@ +as yet unclassified +content + + ^ self trackedFiles + ifNil: [self collectTrackedFiles. self trackedFiles] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..8ea73295c --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +1,4 @@ +as yet unclassified +diffAgainst: otherRecordedFilesArtifact + + ^ otherRecordedFilesArtifact reverseDiffContentAgainst: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st new file mode 100644 index 000000000..c65e9bc70 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st @@ -0,0 +1,6 @@ +as yet unclassified +displayText + + ^ 'Recorded files: + example.pdf + beispiel.png' \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st new file mode 100644 index 000000000..e71e31dbe --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st @@ -0,0 +1,4 @@ +as yet unclassified +isLoadable + + ^ false \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st new file mode 100644 index 000000000..3a5748fb4 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st @@ -0,0 +1,4 @@ +accessing +ownerSnapshot: anObject + + ownerSnapshot := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st new file mode 100644 index 000000000..80780b511 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st @@ -0,0 +1,4 @@ +accessing +ownerSnapshot + + ^ ownerSnapshot \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st new file mode 100644 index 000000000..28a7d9952 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ '' \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st new file mode 100644 index 000000000..73b8828fa --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st @@ -0,0 +1,4 @@ +as yet unclassified +reverseDiffAgainstUnrecordedFiles: anUnrecordedFilesArtifact + + ^ LBGitArtifactReplacementDiff left: anUnrecordedFilesArtifact right: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st new file mode 100644 index 000000000..e23473fc6 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st @@ -0,0 +1,10 @@ +as yet unclassified +reverseDiffContentAgainst: aCollection + + | otherContent added changedOrStayed deleted | + otherContent := aCollection ifNil: [Array empty]. + added := self content difference: otherContent. + changedOrStayed := self content intersection: otherContent. + deleted := otherContent difference: self content. + self halt. + ^ SquotDiffOfEqualObjects instance \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st new file mode 100644 index 000000000..87a97cde3 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st @@ -0,0 +1,4 @@ +accessing +rootDirectory: anObject + + rootDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st new file mode 100644 index 000000000..5d66c63e9 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st new file mode 100644 index 000000000..ee8f804c4 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st @@ -0,0 +1,4 @@ +accessing +trackedFiles: anObject + + trackedFiles := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st new file mode 100644 index 000000000..340c8f5b1 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st @@ -0,0 +1,4 @@ +accessing +trackedFiles + + ^ trackedFiles \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st new file mode 100644 index 000000000..e4a3bb15a --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st @@ -0,0 +1,4 @@ +as yet unclassified +wantsToBeInTableOfContents + "I want to be always created" + ^ false \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..a67b4477e --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -0,0 +1,21 @@ +{ + "class" : { + }, + "instance" : { + "collectFilesOf:" : "LB 11/20/2018 16:39", + "collectTrackedFiles" : "LB 11/20/2018 16:38", + "commit" : "LB 11/20/2018 16:28", + "content" : "LB 11/20/2018 15:13", + "diffAgainst:" : "LB 11/20/2018 15:16", + "displayText" : "LB 11/20/2018 15:09", + "isLoadable" : "LB 11/20/2018 15:07", + "ownerSnapshot" : "LB 11/20/2018 15:14", + "ownerSnapshot:" : "LB 11/20/2018 15:14", + "path" : "LB 11/20/2018 10:19", + "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", + "reverseDiffContentAgainst:" : "LB 11/20/2018 16:51", + "rootDirectory" : "LB 11/20/2018 10:17", + "rootDirectory:" : "LB 11/20/2018 10:17", + "trackedFiles" : "LB 11/20/2018 15:12", + "trackedFiles:" : "LB 11/20/2018 15:12", + "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json new file mode 100644 index 000000000..c3a4ec4f1 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "ownerSnapshot", + "rootDirectory", + "trackedFiles" ], + "name" : "LBGitRecordedFilesArtifact", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st index b36bcb924..a24ff2688 100644 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st @@ -1,4 +1,4 @@ -as yet unclassified +Squot deserialization fillContentOf: anArtifact from: aFileOrDirectoryReference anArtifact content: diff --git a/LBGitTests.package/LBGitVoid.class/README.md b/LBGitTests.package/LBGitVoid.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitVoid.class/instance/^equals.st b/LBGitTests.package/LBGitVoid.class/instance/^equals.st new file mode 100644 index 000000000..79287ebe4 --- /dev/null +++ b/LBGitTests.package/LBGitVoid.class/instance/^equals.st @@ -0,0 +1,4 @@ +as yet unclassified += anObject + + ^ anObject class = self class \ No newline at end of file diff --git a/LBGitTests.package/LBGitVoid.class/instance/content.st b/LBGitTests.package/LBGitVoid.class/instance/content.st new file mode 100644 index 000000000..7ad598a35 --- /dev/null +++ b/LBGitTests.package/LBGitVoid.class/instance/content.st @@ -0,0 +1,4 @@ +as yet unclassified +content + + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitVoid.class/instance/startShadow.st b/LBGitTests.package/LBGitVoid.class/instance/startShadow.st new file mode 100644 index 000000000..9711320d5 --- /dev/null +++ b/LBGitTests.package/LBGitVoid.class/instance/startShadow.st @@ -0,0 +1,4 @@ +as yet unclassified +startShadow + + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitVoid.class/methodProperties.json b/LBGitTests.package/LBGitVoid.class/methodProperties.json new file mode 100644 index 000000000..656a27e76 --- /dev/null +++ b/LBGitTests.package/LBGitVoid.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "=" : "LB 11/20/2018 14:47", + "content" : "LB 11/20/2018 14:45", + "startShadow" : "LB 11/20/2018 14:45" } } diff --git a/LBGitTests.package/LBGitVoid.class/properties.json b/LBGitTests.package/LBGitVoid.class/properties.json new file mode 100644 index 000000000..1c16f9e60 --- /dev/null +++ b/LBGitTests.package/LBGitVoid.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitVoid", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st new file mode 100644 index 000000000..2bf70a25d --- /dev/null +++ b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st @@ -0,0 +1,25 @@ +*LBGitTests +captureLazySnapshot + "read the table of contents and create lazy loading artifacts from the entries" + | builder addedPaths unrecordedFiles | + builder := SquotSnapshot builder. + addedPaths := Set new. + [self artifactReferencesDo: [:each | | lazyArtifact | + self isThisEverCalled: 'A non package file and stuff'. + lazyArtifact := self createLazyArtifactForObjectAt: each. + builder add: lazyArtifact. + addedPaths add: each path]] + on: SquotNoTableOfContentsFound doAndPass: [:e | + self isThisEverCalled: 'The package file and stuff'. + (self packageDirectoriesIn: directory) + collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] + thenDo: [:eachArtifact | builder add: eachArtifact. + addedPaths add: eachArtifact path. + e add: eachArtifact]]. + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + rootDirectory: directory; + yourself). + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st new file mode 100644 index 000000000..e7a967d97 --- /dev/null +++ b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st @@ -0,0 +1,22 @@ +*LBGitTests +captureSnapshot + "read files from the filesystem and convert them into SquotArtifacts" + | builder addedPaths unrecordedFiles | + builder := SquotSnapshot builder. + addedPaths := Set new. + 'Reading objects from files' displaySequentialProgress: + [[self artifactsDo: [:each | builder add: each. + addedPaths add: each path]] + on: SquotNoTableOfContentsFound doAndPass: [:e | + (self packageDirectoriesIn: directory) + collect: [:eachDirectory | self restorePackageFrom: eachDirectory] + thenDo: [:eachArtifact | builder add: eachArtifact. + addedPaths add: eachArtifact path. + e add: eachArtifact]]]. + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + rootDirectory: directory; + yourself). + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json b/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json new file mode 100644 index 000000000..cf993a715 --- /dev/null +++ b/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "captureLazySnapshot" : "LB 11/20/2018 10:16", + "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGitTests.package/SquotFileSystemStore.extension/properties.json b/LBGitTests.package/SquotFileSystemStore.extension/properties.json new file mode 100644 index 000000000..053072453 --- /dev/null +++ b/LBGitTests.package/SquotFileSystemStore.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotFileSystemStore" } From a5d8ad3d7a93c3f86b1e06f24e76d515a88bee3f Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 22 Nov 2018 16:58:10 +0100 Subject: [PATCH 077/170] Working: online addition and removel of files --- .../LBGitFileListDiff.class/README.md | 0 .../class/left.right..st | 6 ++++ .../instance/added..st | 4 +++ .../LBGitFileListDiff.class/instance/added.st | 4 +++ .../instance/adjustedBy..st | 5 +++ .../instance/applyToContainer..st | 7 +++++ .../instance/changedFiles.st | 4 +++ .../instance/createFile..st | 8 +++++ .../instance/deleteFile..st | 7 +++++ .../instance/diff.against..st | 11 +++++++ .../instance/gitReferenceOn..st | 4 +++ .../instance/hasChanges.st | 4 +++ .../initializeSquotDiffNodes.with..st | 20 ++++++++++++ .../LBGitFileListDiff.class/instance/left..st | 4 +++ .../LBGitFileListDiff.class/instance/left.st | 4 +++ .../instance/mergeWithRemoval..st | 4 +++ .../instance/newSquotDiffNodes.st | 8 +++++ .../instance/originalOrAddedArtifact.st | 4 +++ .../LBGitFileListDiff.class/instance/path.st | 4 +++ .../instance/removed..st | 4 +++ .../instance/removed.st | 4 +++ .../instance/right..st | 4 +++ .../LBGitFileListDiff.class/instance/right.st | 4 +++ .../instance/squotChangeAsStringOrText.st | 7 +++++ .../instance/squotHasChanges.st | 4 +++ .../instance/stayed..st | 4 +++ .../instance/stayed.st | 4 +++ .../instance/topNodes.st | 12 +++++++ .../instance/workingReferenceOn..st | 6 ++++ .../methodProperties.json | 31 +++++++++++++++++++ .../LBGitFileListDiff.class/properties.json | 20 ++++++++++++ .../LBGitFileListShadow.class/README.md | 0 .../LBGitFileListShadow.class/class/on..st | 4 +++ .../instance/content.st | 4 +++ .../LBGitFileListShadow.class/instance/on..st | 5 +++ .../instance/paths..st | 4 +++ .../instance/paths.st | 4 +++ .../instance/squotDiffAgainst.with..st | 6 ++++ .../methodProperties.json | 9 ++++++ .../LBGitFileListShadow.class/properties.json | 14 +++++++++ .../instance/gitContent.st | 7 +++-- .../methodProperties.json | 2 +- .../instance/collectFilesOf..st | 1 + .../instance/collectTrackedFiles.st | 1 - .../instance/content..st | 4 +++ .../instance/content.st | 7 +++-- .../instance/diffAgainst..st | 2 +- .../instance/diffContentAgainstThatOf..st | 4 +++ .../instance/isSquotFile..st | 6 ++++ .../instance/printOn..st | 5 +++ .../instance/reverseDiffContentAgainst..st | 7 +++-- .../instance/shadows.st | 4 +++ .../instance/trackedFiles.st | 2 +- .../methodProperties.json | 17 ++++++---- .../properties.json | 3 +- 55 files changed, 320 insertions(+), 18 deletions(-) create mode 100644 LBGitTests.package/LBGitFileListDiff.class/README.md create mode 100644 LBGitTests.package/LBGitFileListDiff.class/class/left.right..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/added..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/added.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/left..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/left.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/removed..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/removed.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/right..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/right.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileListDiff.class/properties.json create mode 100644 LBGitTests.package/LBGitFileListShadow.class/README.md create mode 100644 LBGitTests.package/LBGitFileListShadow.class/class/on..st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/content.st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/on..st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/paths..st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/paths.st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st create mode 100644 LBGitTests.package/LBGitFileListShadow.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileListShadow.class/properties.json create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/README.md b/LBGitTests.package/LBGitFileListDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st b/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st new file mode 100644 index 000000000..36eead912 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st @@ -0,0 +1,6 @@ +as yet unclassified +left: leftArtifact right: rightArtifact + self halt. + ^ self new + diff: leftArtifact against: rightArtifact; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/added..st b/LBGitTests.package/LBGitFileListDiff.class/instance/added..st new file mode 100644 index 000000000..4fe99c293 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/added..st @@ -0,0 +1,4 @@ +accessing +added: anObject + + added := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/added.st b/LBGitTests.package/LBGitFileListDiff.class/instance/added.st new file mode 100644 index 000000000..d5e63b92d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/added.st @@ -0,0 +1,4 @@ +accessing +added + + ^ added \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st new file mode 100644 index 000000000..4cfbad180 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st @@ -0,0 +1,5 @@ +as yet unclassified +adjustedBy: aDiffNode + + self flag: #TODO "This allows to either select or deselect file changes in the future". + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st new file mode 100644 index 000000000..01c40e004 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st @@ -0,0 +1,7 @@ +as yet unclassified +applyToContainer: anObjectContainer + + self flag: #TODO. + self halt. + self added do: [:each | self createFile: each]. + self removed do: [:each | self deleteFile: each]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st b/LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st new file mode 100644 index 000000000..937d10df5 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st @@ -0,0 +1,4 @@ +as yet unclassified +changedFiles + + ^ 0 \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st new file mode 100644 index 000000000..3240b4434 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st @@ -0,0 +1,8 @@ +as yet unclassified +createFile: aPath + + | gitReference workingReference | + gitReference := self gitReferenceOn: aPath. + workingReference := self workingReferenceOn: aPath. + self flag: #TODO. "Do ensure the file does NOT exist workingReference ensureFile." + gitReference copyTo: workingReference. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st new file mode 100644 index 000000000..2a6e8da01 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st @@ -0,0 +1,7 @@ +as yet unclassified +deleteFile: aPath + + | workingReference | + workingReference := self workingReferenceOn: aPath. + workingReference exists + ifTrue: [workingReference delete] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st new file mode 100644 index 000000000..e9e0a422d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st @@ -0,0 +1,11 @@ +as yet unclassified +diff: leftArtifact against: rightArtifact + + self + left: leftArtifact; + right: rightArtifact. + self + added: (self right shadows keys difference: self left shadows keys); + stayed: (self right shadows keys intersection: self left shadows keys); + removed: (self left shadows keys difference: self right shadows keys). + self halt. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st new file mode 100644 index 000000000..d442d189b --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st @@ -0,0 +1,4 @@ +as yet unclassified +gitReferenceOn: aPath + + ^ self right rootDirectory resolve: aPath. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st b/LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st new file mode 100644 index 000000000..bbcb9014d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st @@ -0,0 +1,4 @@ +as yet unclassified +hasChanges + + ^ self squotHasChanges \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st new file mode 100644 index 000000000..a5170bace --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st @@ -0,0 +1,20 @@ +Squot-diff-converting +initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder + "Initialize the previously allocated diff nodes in aCollection, using the builder to convert + the diffs of related objects." + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure and you chose to initialize all nodes upon their allocation already, + you may implement this method to do nothing." + | index | + index := 1. + self added do: [:each | (aCollection at: index) + title: 'added: ', each + content: self + children: Array empty. + index := index + 1.]. + self removed do: [:each | (aCollection at: index) + title: 'deleted: ', each + content: self + children: Array empty. + index := index + 1.]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/left..st b/LBGitTests.package/LBGitFileListDiff.class/instance/left..st new file mode 100644 index 000000000..b701cc139 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/left..st @@ -0,0 +1,4 @@ +accessing +left: anObject + + left := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/left.st b/LBGitTests.package/LBGitFileListDiff.class/instance/left.st new file mode 100644 index 000000000..7a159c36d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/left.st @@ -0,0 +1,4 @@ +accessing +left + + ^ left \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st new file mode 100644 index 000000000..a83ff3ad0 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st @@ -0,0 +1,4 @@ +as yet unclassified +mergeWithRemoval: anArtifactDiff + "I shall never be removed!" + ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st new file mode 100644 index 000000000..9cceca3b8 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st @@ -0,0 +1,8 @@ +Squot-diff-converting +newSquotDiffNodes + "Answer new, uninitialized SquotDiffNodes that will later be initialized + in #initializeSquotDiffNodes:with:" + "Allocating the nodes and initializing them is separated to facilitate cycle breaking + when graphs of changed objects are converted to diff nodes. If all related diffs form + a tree structure, you may also fully initialize the nodes here already." + ^ (1 to: (self added size + self removed size + self changedFiles)) collect: [:each | SquotDiffNode new] as: Array \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st new file mode 100644 index 000000000..98b8bb1c6 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st @@ -0,0 +1,4 @@ +as yet unclassified +originalOrAddedArtifact + + ^ self left ifNil: [self right] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/path.st b/LBGitTests.package/LBGitFileListDiff.class/instance/path.st new file mode 100644 index 000000000..a6af6b0fa --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ '' \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/removed..st b/LBGitTests.package/LBGitFileListDiff.class/instance/removed..st new file mode 100644 index 000000000..4dc20ce4f --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/removed..st @@ -0,0 +1,4 @@ +accessing +removed: anObject + + removed := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/removed.st b/LBGitTests.package/LBGitFileListDiff.class/instance/removed.st new file mode 100644 index 000000000..85a979d62 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/removed.st @@ -0,0 +1,4 @@ +accessing +removed + + ^ removed \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/right..st b/LBGitTests.package/LBGitFileListDiff.class/instance/right..st new file mode 100644 index 000000000..9e650c91e --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/right..st @@ -0,0 +1,4 @@ +accessing +right: anObject + + right := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/right.st b/LBGitTests.package/LBGitFileListDiff.class/instance/right.st new file mode 100644 index 000000000..85787af13 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/right.st @@ -0,0 +1,4 @@ +accessing +right + + ^ right \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..556945b14 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,7 @@ +as yet unclassified +squotChangeAsStringOrText + + | result | + result := self added inject: '' into: [:total :each | total, 'added: ', each, Character cr]. + result := result, (self removed inject: '' into: [:total :each | total, 'deleted: ', each, Character cr]). + ^ result \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st new file mode 100644 index 000000000..0a16e3b24 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasChanges + "Answer false if the two compared objects were equal, answer true if there were diffs." + ^ self added notEmpty or: [self removed notEmpty] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st b/LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st new file mode 100644 index 000000000..ea20aae30 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st @@ -0,0 +1,4 @@ +accessing +stayed: anObject + + stayed := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st b/LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st new file mode 100644 index 000000000..508bc5ca4 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st @@ -0,0 +1,4 @@ +accessing +stayed + + ^ stayed \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st b/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st new file mode 100644 index 000000000..fcf405d8e --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st @@ -0,0 +1,12 @@ +as yet unclassified +topNodes + + ^ (self added collect: [:each | SquotDiffNode + title: 'xAdded: ', each + content: self + children: #()]) + union: + (self removed collect: [:each | SquotDiffNode + title: 'xRemoved: ', each + content: self + children: #()]) \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st new file mode 100644 index 000000000..cf78fce29 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st @@ -0,0 +1,6 @@ +as yet unclassified +workingReferenceOn: aPath + + | workingReference | + workingReference := self left rootDirectory fileSystem repository repository instVarNamed: #reference. + ^ workingReference resolve: aPath. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json new file mode 100644 index 000000000..8bd30b4d1 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json @@ -0,0 +1,31 @@ +{ + "class" : { + "left:right:" : "LB 11/22/2018 15:36" }, + "instance" : { + "added" : "LB 11/22/2018 11:17", + "added:" : "LB 11/22/2018 11:17", + "adjustedBy:" : "LB 11/22/2018 15:13", + "applyToContainer:" : "LB 11/22/2018 15:51", + "changedFiles" : "LB 11/22/2018 11:30", + "createFile:" : "LB 11/22/2018 16:03", + "deleteFile:" : "LB 11/22/2018 15:34", + "diff:against:" : "LB 11/22/2018 15:49", + "gitReferenceOn:" : "LB 11/22/2018 16:00", + "hasChanges" : "LB 11/22/2018 12:07", + "initializeSquotDiffNodes:with:" : "LB 11/22/2018 11:40", + "left" : "LB 11/22/2018 11:14", + "left:" : "LB 11/22/2018 11:14", + "mergeWithRemoval:" : "LB 11/22/2018 12:19", + "newSquotDiffNodes" : "LB 11/22/2018 11:32", + "originalOrAddedArtifact" : "LB 11/22/2018 15:53", + "path" : "LB 11/22/2018 16:36", + "removed" : "LB 11/22/2018 11:17", + "removed:" : "LB 11/22/2018 11:17", + "right" : "LB 11/22/2018 11:14", + "right:" : "LB 11/22/2018 11:14", + "squotChangeAsStringOrText" : "LB 11/22/2018 15:50", + "squotHasChanges" : "LB 11/22/2018 11:21", + "stayed" : "LB 11/22/2018 11:17", + "stayed:" : "LB 11/22/2018 11:17", + "topNodes" : "LB 11/22/2018 16:53", + "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGitTests.package/LBGitFileListDiff.class/properties.json b/LBGitTests.package/LBGitFileListDiff.class/properties.json new file mode 100644 index 000000000..e9052e318 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/properties.json @@ -0,0 +1,20 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TSquotDiff classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "left", + "right", + "added", + "removed", + "stayed" ], + "name" : "LBGitFileListDiff", + "pools" : [ + ], + "super" : "Object", + "traitcomposition" : "TSquotDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileListShadow.class/README.md b/LBGitTests.package/LBGitFileListShadow.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileListShadow.class/class/on..st b/LBGitTests.package/LBGitFileListShadow.class/class/on..st new file mode 100644 index 000000000..64b0b682d --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/class/on..st @@ -0,0 +1,4 @@ +as yet unclassified +on: aRecordedFilesArtifact + + ^ self new on: aRecordedFilesArtifact \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/content.st b/LBGitTests.package/LBGitFileListShadow.class/instance/content.st new file mode 100644 index 000000000..84c387103 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/instance/content.st @@ -0,0 +1,4 @@ +as yet unclassified +content + + ^ self paths \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/on..st b/LBGitTests.package/LBGitFileListShadow.class/instance/on..st new file mode 100644 index 000000000..87e3d6636 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/instance/on..st @@ -0,0 +1,5 @@ +as yet unclassified +on: aRecordedFilesArtifact + + self paths: + (aRecordedFilesArtifact trackedFiles collect: [:each | each -> (LBGitDeserializedShadow onReference: (aRecordedFilesArtifact rootDirectory resolve: each))]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st b/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st new file mode 100644 index 000000000..1b211b626 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st @@ -0,0 +1,4 @@ +accessing +paths: anObject + + paths := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st b/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st new file mode 100644 index 000000000..2043ce481 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st @@ -0,0 +1,4 @@ +accessing +paths + + ^ paths \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st new file mode 100644 index 000000000..2b6cf238c --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st @@ -0,0 +1,6 @@ +as yet unclassified +squotDiffAgainst: otherFileListShadow with: aDiffBuilder + + ^ aDiffBuilder diffFrom: self to: otherFileListShadow + ifNew: [LBGitFileListDiff left: otherFileListShadow content right: self content.] + andInitialize: [:diff | ] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json new file mode 100644 index 000000000..669cc58b9 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json @@ -0,0 +1,9 @@ +{ + "class" : { + "on:" : "LB 11/22/2018 10:52" }, + "instance" : { + "content" : "LB 11/22/2018 11:12", + "on:" : "LB 11/22/2018 11:11", + "paths" : "LB 11/22/2018 10:53", + "paths:" : "LB 11/22/2018 10:53", + "squotDiffAgainst:with:" : "LB 11/22/2018 11:13" } } diff --git a/LBGitTests.package/LBGitFileListShadow.class/properties.json b/LBGitTests.package/LBGitFileListShadow.class/properties.json new file mode 100644 index 000000000..a9bd0a299 --- /dev/null +++ b/LBGitTests.package/LBGitFileListShadow.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "paths" ], + "name" : "LBGitFileListShadow", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st index b8f38369b..c42b2562c 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st @@ -2,7 +2,10 @@ as yet unclassified gitContent | stream content | - stream := self gitReference readStream binary. + ^ self gitReference exists + ifFalse: [nil] + ifTrue: + [stream := self gitReference readStream binary. content := stream contents. stream close. - ^ content \ No newline at end of file + ^ content] diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 0d2151999..edfaf7fa9 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -6,7 +6,7 @@ "content:" : "LB 11/18/2018 13:20", "fileInfo" : "LB 11/10/2018 15:57", "fileInfo:" : "LB 11/10/2018 15:57", - "gitContent" : "LB 11/18/2018 13:13", + "gitContent" : "LB 11/22/2018 11:24", "gitReference" : "LB 11/18/2018 12:22", "gitReference:" : "LB 11/18/2018 12:22", "path" : "LB 11/10/2018 15:57", diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st index e5d12a619..ff006254e 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st @@ -7,4 +7,5 @@ collectFilesOf: aGitTreeEntrySet each isInDirectoryMode ifTrue: [(self collectFilesOf: (each object entries)) do: [:eachSub | result add: each entryName,'/', eachSub]] ifFalse: [result add: each entryName] ]. + result := result reject: [:each | self isSquotFile: each]. ^ result \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st index 3f58c746e..aca9a93ba 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -1,6 +1,5 @@ as yet unclassified collectTrackedFiles - self halt. self trackedFiles: (self collectFilesOf: self commit tree entries) \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st new file mode 100644 index 000000000..ee3ef071a --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st @@ -0,0 +1,4 @@ +accessing +content: anObject + + content := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st index 86acaa9e1..b83b71b41 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st @@ -1,5 +1,8 @@ as yet unclassified content - ^ self trackedFiles - ifNil: [self collectTrackedFiles. self trackedFiles] \ No newline at end of file + self flag: #DEPRECATED. + ^ content ifNil: + [self collectTrackedFiles. + self content: (SquotShadowGraph withSingleShadow: (LBGitFileListShadow on: self)). + content] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st index 8ea73295c..022d3d67d 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st @@ -1,4 +1,4 @@ as yet unclassified diffAgainst: otherRecordedFilesArtifact - ^ otherRecordedFilesArtifact reverseDiffContentAgainst: self content \ No newline at end of file + ^ LBGitFileListDiff left: self right: otherRecordedFilesArtifact \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st new file mode 100644 index 000000000..4ae63b63e --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st @@ -0,0 +1,4 @@ +as yet unclassified +diffContentAgainstThatOf: anArtifact + "Double dispatch with reverseDiffContentAgainst:" + ^ anArtifact reverseDiffContentAgainst: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st new file mode 100644 index 000000000..b12357af4 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st @@ -0,0 +1,6 @@ +as yet unclassified +isSquotFile: aPath + + ^ (aPath includesSubString: '.squot') + or: [aPath includesSubString: '.package'] + or: [self ownerSnapshot includesObjectAt: aPath] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st new file mode 100644 index 000000000..428689848 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st @@ -0,0 +1,5 @@ +as yet unclassified +printOn: aStream + + super printOn: aStream. + aStream nextPutAll: '(On commit: ''', self commit message,''')'. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st index e23473fc6..b49c7611d 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st @@ -1,10 +1,11 @@ as yet unclassified -reverseDiffContentAgainst: aCollection +reverseDiffContentAgainst: otherContent - | otherContent added changedOrStayed deleted | + "| otherContent added changedOrStayed deleted | otherContent := aCollection ifNil: [Array empty]. added := self content difference: otherContent. changedOrStayed := self content intersection: otherContent. deleted := otherContent difference: self content. self halt. - ^ SquotDiffOfEqualObjects instance \ No newline at end of file + ^ SquotDiffOfEqualObjects instance" + ^ otherContent squotDiffAgainst: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st new file mode 100644 index 000000000..ffe695ce4 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st @@ -0,0 +1,4 @@ +accessing +shadows + + ^ (self trackedFiles collect: [:each | each -> (LBGitDeserializedShadow onReference: (self rootDirectory resolve: each))]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st index 340c8f5b1..69b050a32 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st @@ -1,4 +1,4 @@ accessing trackedFiles - ^ trackedFiles \ No newline at end of file + ^ trackedFiles ifNil: [self collectTrackedFiles. trackedFiles] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json index a67b4477e..f58ad45b3 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -2,20 +2,25 @@ "class" : { }, "instance" : { - "collectFilesOf:" : "LB 11/20/2018 16:39", - "collectTrackedFiles" : "LB 11/20/2018 16:38", + "collectFilesOf:" : "LB 11/22/2018 16:39", + "collectTrackedFiles" : "LB 11/22/2018 15:45", "commit" : "LB 11/20/2018 16:28", - "content" : "LB 11/20/2018 15:13", - "diffAgainst:" : "LB 11/20/2018 15:16", + "content" : "LB 11/22/2018 15:46", + "content:" : "LB 11/22/2018 10:38", + "diffAgainst:" : "LB 11/22/2018 12:03", + "diffContentAgainstThatOf:" : "LB 11/22/2018 10:07", "displayText" : "LB 11/20/2018 15:09", "isLoadable" : "LB 11/20/2018 15:07", + "isSquotFile:" : "LB 11/22/2018 16:43", "ownerSnapshot" : "LB 11/20/2018 15:14", "ownerSnapshot:" : "LB 11/20/2018 15:14", "path" : "LB 11/20/2018 10:19", + "printOn:" : "LB 11/22/2018 15:44", "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", - "reverseDiffContentAgainst:" : "LB 11/20/2018 16:51", + "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 11/20/2018 10:17", - "trackedFiles" : "LB 11/20/2018 15:12", + "shadows" : "LB 11/22/2018 12:06", + "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json index c3a4ec4f1..10068737d 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json @@ -8,7 +8,8 @@ "instvars" : [ "ownerSnapshot", "rootDirectory", - "trackedFiles" ], + "trackedFiles", + "content" ], "name" : "LBGitRecordedFilesArtifact", "pools" : [ ], From d3a1c949401f1f5e94f8db767490deeec304ad64 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 22 Nov 2018 17:06:18 +0100 Subject: [PATCH 078/170] Rest changes --- .../instance/squotInitializeStoreInfo..st | 5 +++++ LBGitTests.package/LBGitFileInfo.class/methodProperties.json | 1 + .../LBGitFileShadow.class/instance/writeTo..st | 1 - .../LBGitFileShadow.class/methodProperties.json | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st new file mode 100644 index 000000000..a0bd9fe44 --- /dev/null +++ b/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st @@ -0,0 +1,5 @@ +as yet unclassified +squotInitializeStoreInfo: aTrackedObjectMetadata + "Initialize metadata about me when stored in an artifact. + Subclasses may override to add additional properties. Do not forget to call super!" + super squotInitializeStoreInfo: aTrackedObjectMetadata. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json index 9e7841734..6a7531677 100644 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json @@ -15,6 +15,7 @@ "rootDirectory" : "LB 11/10/2018 16:10", "rootDirectory:" : "LB 11/10/2018 16:10", "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", + "squotInitializeStoreInfo:" : "LB 11/18/2018 14:13", "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", "squotShadowFactory" : "LB 11/10/2018 12:18", "squotShouldKeepIdentity" : "LB 11/14/2018 22:38" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st index cdfabacc9..8a52179f0 100644 --- a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st +++ b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st @@ -1,5 +1,4 @@ as yet unclassified writeTo: aStream - self halt. aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json index 0d2151999..4f049c66d 100644 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json @@ -17,4 +17,4 @@ "squotPreferredSerializer" : "LB 11/10/2018 13:41", "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", "value" : "LB 11/10/2018 13:09", - "writeTo:" : "LB 11/18/2018 13:28" } } + "writeTo:" : "LB 11/18/2018 14:27" } } From 9eee26236adc8e86ec7602894124fab0ef5b07ad Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 25 Nov 2018 13:05:52 +0100 Subject: [PATCH 079/170] Cool diffing --- .../LBGitFileAddition.class/README.md | 0 .../instance/before.st | 4 +++ .../LBGitFileAddition.class/instance/title.st | 4 +++ .../methodProperties.json | 6 ++++ .../LBGitFileAddition.class/properties.json | 14 ++++++++ .../LBGitFileDiff.class/README.md | 0 .../LBGitFileDiff.class/instance/after.st | 8 +++++ .../instance/asDiffNode.st | 7 ++++ .../LBGitFileDiff.class/instance/before.st | 8 +++++ .../LBGitFileDiff.class/instance/body.st | 4 +++ .../LBGitFileDiff.class/instance/parent..st | 4 +++ .../LBGitFileDiff.class/instance/parent.st | 4 +++ .../LBGitFileDiff.class/instance/path..st | 4 +++ .../LBGitFileDiff.class/instance/path.st | 4 +++ .../instance/squotChangeAsStringOrText.st | 7 ++++ .../LBGitFileDiff.class/instance/title.st | 4 +++ .../LBGitFileDiff.class/methodProperties.json | 14 ++++++++ .../LBGitFileDiff.class/properties.json | 15 +++++++++ .../instance/applyToContainer..st | 3 +- .../instance/createDiffs.st | 8 +++++ .../instance/diff.against..st | 6 +++- .../instance/diffAdded.st | 9 ++++++ .../instance/diffModified.st | 9 ++++++ .../instance/diffRemoved.st | 9 ++++++ .../instance/diffs..st | 4 +++ .../LBGitFileListDiff.class/instance/diffs.st | 4 +++ .../instance/gitReferenceOn..st | 2 +- .../initializeSquotDiffNodes.with..st | 6 ++++ .../instance/isFileModified..st | 5 +++ .../instance/leftReferenceOn..st | 4 +++ .../instance/modified..st | 4 +++ .../instance/modified.st | 4 +++ .../instance/newSquotDiffNodes.st | 3 +- .../instance/rightReferenceOn..st | 4 +++ .../instance/squotChangeAsStringOrText.st | 6 ++-- .../instance/squotHasChanges.st | 2 +- .../instance/squotHasConflicts.st | 4 +++ .../instance/topNodes.st | 10 +----- .../instance/updateFile..st | 7 ++++ .../methodProperties.json | 32 +++++++++++++------ .../LBGitFileListDiff.class/properties.json | 4 ++- .../LBGitFileModification.class/README.md | 0 .../instance/title.st | 4 +++ .../methodProperties.json | 5 +++ .../properties.json | 14 ++++++++ .../LBGitFileRemoval.class/README.md | 0 .../instance/after.st} | 4 +-- .../LBGitFileRemoval.class/instance/title.st | 4 +++ .../methodProperties.json | 6 ++++ .../LBGitFileRemoval.class/properties.json | 14 ++++++++ .../instance/collectFilesOf..st | 8 ++--- .../instance/shadows.st | 2 +- .../methodProperties.json | 4 +-- 53 files changed, 286 insertions(+), 39 deletions(-) create mode 100644 LBGitTests.package/LBGitFileAddition.class/README.md create mode 100644 LBGitTests.package/LBGitFileAddition.class/instance/before.st create mode 100644 LBGitTests.package/LBGitFileAddition.class/instance/title.st create mode 100644 LBGitTests.package/LBGitFileAddition.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileAddition.class/properties.json create mode 100644 LBGitTests.package/LBGitFileDiff.class/README.md create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/after.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/before.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/body.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/parent..st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/parent.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/title.st create mode 100644 LBGitTests.package/LBGitFileDiff.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileDiff.class/properties.json create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/modified..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/modified.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st create mode 100644 LBGitTests.package/LBGitFileModification.class/README.md create mode 100644 LBGitTests.package/LBGitFileModification.class/instance/title.st create mode 100644 LBGitTests.package/LBGitFileModification.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileModification.class/properties.json create mode 100644 LBGitTests.package/LBGitFileRemoval.class/README.md rename LBGitTests.package/{LBGitFileListDiff.class/instance/changedFiles.st => LBGitFileRemoval.class/instance/after.st} (50%) create mode 100644 LBGitTests.package/LBGitFileRemoval.class/instance/title.st create mode 100644 LBGitTests.package/LBGitFileRemoval.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileRemoval.class/properties.json diff --git a/LBGitTests.package/LBGitFileAddition.class/README.md b/LBGitTests.package/LBGitFileAddition.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/before.st b/LBGitTests.package/LBGitFileAddition.class/instance/before.st new file mode 100644 index 000000000..798927c0e --- /dev/null +++ b/LBGitTests.package/LBGitFileAddition.class/instance/before.st @@ -0,0 +1,4 @@ +as yet unclassified +before + + ^ String empty \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/title.st b/LBGitTests.package/LBGitFileAddition.class/instance/title.st new file mode 100644 index 000000000..8c14de241 --- /dev/null +++ b/LBGitTests.package/LBGitFileAddition.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Added: ', self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileAddition.class/methodProperties.json b/LBGitTests.package/LBGitFileAddition.class/methodProperties.json new file mode 100644 index 000000000..e9ab44f72 --- /dev/null +++ b/LBGitTests.package/LBGitFileAddition.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "before" : "LB 11/23/2018 18:43", + "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFileAddition.class/properties.json b/LBGitTests.package/LBGitFileAddition.class/properties.json new file mode 100644 index 000000000..9d85ec1f5 --- /dev/null +++ b/LBGitTests.package/LBGitFileAddition.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileAddition", + "pools" : [ + ], + "super" : "LBGitFileDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileDiff.class/README.md b/LBGitTests.package/LBGitFileDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/after.st b/LBGitTests.package/LBGitFileDiff.class/instance/after.st new file mode 100644 index 000000000..789187889 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/after.st @@ -0,0 +1,8 @@ +accessing +after + + | stream content | + stream := (self parent rightReferenceOn: self path) readStream binary. + content := stream contents. + stream close. + ^ content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st b/LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st new file mode 100644 index 000000000..73bc3e36c --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st @@ -0,0 +1,7 @@ +as yet unclassified +asDiffNode + + ^ SquotDiffNode + title: self title + content: self + children: #() \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/before.st b/LBGitTests.package/LBGitFileDiff.class/instance/before.st new file mode 100644 index 000000000..f5b46c930 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/before.st @@ -0,0 +1,8 @@ +accessing +before + + | stream content | + stream := (self parent leftReferenceOn: self path) readStream binary. + content := stream contents. + stream close. + ^ content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/body.st b/LBGitTests.package/LBGitFileDiff.class/instance/body.st new file mode 100644 index 000000000..c11e5a467 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/body.st @@ -0,0 +1,4 @@ +accessing +body + + ^ TextDiffBuilder buildDisplayPatchFrom: self before to: self after \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/parent..st b/LBGitTests.package/LBGitFileDiff.class/instance/parent..st new file mode 100644 index 000000000..82076cedf --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/parent..st @@ -0,0 +1,4 @@ +accessing +parent: aLBGitFileListDiff + + parent := aLBGitFileListDiff. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/parent.st b/LBGitTests.package/LBGitFileDiff.class/instance/parent.st new file mode 100644 index 000000000..5f7789b51 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/parent.st @@ -0,0 +1,4 @@ +accessing +parent + + ^ parent \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/path..st b/LBGitTests.package/LBGitFileDiff.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/path.st b/LBGitTests.package/LBGitFileDiff.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..ceb032137 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,7 @@ +as yet unclassified +squotChangeAsStringOrText + + ^ +self title asText allBold, ' + +', self body \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/title.st b/LBGitTests.package/LBGitFileDiff.class/instance/title.st new file mode 100644 index 000000000..a05ce996c --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/title.st @@ -0,0 +1,4 @@ +accessing +title + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileDiff.class/methodProperties.json new file mode 100644 index 000000000..491103eb7 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/methodProperties.json @@ -0,0 +1,14 @@ +{ + "class" : { + }, + "instance" : { + "after" : "LB 11/23/2018 18:50", + "asDiffNode" : "LB 11/23/2018 15:14", + "before" : "LB 11/23/2018 18:50", + "body" : "LB 11/23/2018 18:37", + "parent" : "LB 11/23/2018 18:42", + "parent:" : "LB 11/23/2018 18:42", + "path" : "LB 11/23/2018 18:51", + "path:" : "LB 11/23/2018 18:51", + "squotChangeAsStringOrText" : "LB 11/23/2018 19:03", + "title" : "LB 11/23/2018 18:34" } } diff --git a/LBGitTests.package/LBGitFileDiff.class/properties.json b/LBGitTests.package/LBGitFileDiff.class/properties.json new file mode 100644 index 000000000..c3cac9066 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "path", + "parent" ], + "name" : "LBGitFileDiff", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st index 01c40e004..f682aa865 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st @@ -1,7 +1,6 @@ as yet unclassified applyToContainer: anObjectContainer - self flag: #TODO. - self halt. self added do: [:each | self createFile: each]. + self modified do: [:each | self updateFile: each]. self removed do: [:each | self deleteFile: each]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st b/LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st new file mode 100644 index 000000000..622455218 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st @@ -0,0 +1,8 @@ +diff creation +createDiffs + + self + diffs: OrderedCollection new; + diffAdded; + diffModified; + diffRemoved \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st index e9e0a422d..9e6d026d1 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st @@ -1,4 +1,4 @@ -as yet unclassified +diff creation diff: leftArtifact against: rightArtifact self @@ -8,4 +8,8 @@ diff: leftArtifact against: rightArtifact added: (self right shadows keys difference: self left shadows keys); stayed: (self right shadows keys intersection: self left shadows keys); removed: (self left shadows keys difference: self right shadows keys). + self modified: (self stayed select: [:each | self isFileModified: each]). + self stayed: (self stayed difference: self modified). + self + createDiffs. self halt. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st new file mode 100644 index 000000000..33d3412cb --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st @@ -0,0 +1,9 @@ +diff creation +diffAdded + + self diffs addAll: + (self added collect: + [:each | LBGitFileAddition new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st new file mode 100644 index 000000000..7b528c812 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st @@ -0,0 +1,9 @@ +diff creation +diffModified + + self diffs addAll: + (self modified collect: + [:each | LBGitFileModification new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st new file mode 100644 index 000000000..51851e012 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st @@ -0,0 +1,9 @@ +diff creation +diffRemoved + + self diffs addAll: + (self removed collect: + [:each | LBGitFileRemoval new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st new file mode 100644 index 000000000..db1e5c9ec --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st @@ -0,0 +1,4 @@ +accessing +diffs: anObject + + diffs := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st new file mode 100644 index 000000000..accc270dc --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st @@ -0,0 +1,4 @@ +accessing +diffs + + ^ diffs \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st index d442d189b..f11352d44 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st @@ -1,4 +1,4 @@ as yet unclassified gitReferenceOn: aPath - ^ self right rootDirectory resolve: aPath. \ No newline at end of file + ^ self rightReferenceOn: aPath. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st index a5170bace..0d9b43b6b 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st @@ -8,6 +8,7 @@ initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder you may implement this method to do nothing." | index | index := 1. + self deprecated. self added do: [:each | (aCollection at: index) title: 'added: ', each content: self @@ -17,4 +18,9 @@ initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder title: 'deleted: ', each content: self children: Array empty. + index := index + 1.]. + self modified do: [:each | (aCollection at: index) + title: 'modified: ', each + content: self + children: Array empty. index := index + 1.]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st b/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st new file mode 100644 index 000000000..b5d5567f8 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st @@ -0,0 +1,5 @@ +diff creation +isFileModified: aPath + + ^ (self left trackedFiles at: aPath) entryHash + ~= (self right trackedFiles at: aPath) entryHash \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st new file mode 100644 index 000000000..4010f4f10 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st @@ -0,0 +1,4 @@ +as yet unclassified +leftReferenceOn: aPath + + ^ self left rootDirectory resolve: aPath. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/modified..st b/LBGitTests.package/LBGitFileListDiff.class/instance/modified..st new file mode 100644 index 000000000..f732fdb2a --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/modified..st @@ -0,0 +1,4 @@ +accessing +modified: anObject + + modified := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/modified.st b/LBGitTests.package/LBGitFileListDiff.class/instance/modified.st new file mode 100644 index 000000000..ea2e839cb --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/modified.st @@ -0,0 +1,4 @@ +accessing +modified + + ^ modified \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st index 9cceca3b8..ad81a9a2b 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st @@ -5,4 +5,5 @@ newSquotDiffNodes "Allocating the nodes and initializing them is separated to facilitate cycle breaking when graphs of changed objects are converted to diff nodes. If all related diffs form a tree structure, you may also fully initialize the nodes here already." - ^ (1 to: (self added size + self removed size + self changedFiles)) collect: [:each | SquotDiffNode new] as: Array \ No newline at end of file + self deprecated. + ^ (1 to: (self added size + self removed size + self modified size)) collect: [:each | SquotDiffNode new] as: Array \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st new file mode 100644 index 000000000..0137204aa --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st @@ -0,0 +1,4 @@ +as yet unclassified +rightReferenceOn: aPath + + ^ self right rootDirectory resolve: aPath. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st index 556945b14..10f80705b 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st @@ -1,7 +1,5 @@ as yet unclassified squotChangeAsStringOrText - | result | - result := self added inject: '' into: [:total :each | total, 'added: ', each, Character cr]. - result := result, (self removed inject: '' into: [:total :each | total, 'deleted: ', each, Character cr]). - ^ result \ No newline at end of file + ^ self diffs inject: 'Tracked file changes + ' into: [:total :each | total, Character tab, each title, Character cr] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st index 0a16e3b24..c00b51531 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st @@ -1,4 +1,4 @@ Squot-diff-testing squotHasChanges "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self added notEmpty or: [self removed notEmpty] \ No newline at end of file + ^ self diffs notEmpty \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st new file mode 100644 index 000000000..a1da0bce1 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st @@ -0,0 +1,4 @@ +Squot-diff-testing +squotHasConflicts + "Answer whether a choice must be made before this can be applied to something." + ^ self diffs anySatisfy: [:each | each hasConflicts] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st b/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st index fcf405d8e..57a90c0ec 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st @@ -1,12 +1,4 @@ as yet unclassified topNodes - ^ (self added collect: [:each | SquotDiffNode - title: 'xAdded: ', each - content: self - children: #()]) - union: - (self removed collect: [:each | SquotDiffNode - title: 'xRemoved: ', each - content: self - children: #()]) \ No newline at end of file + ^ self diffs collect: [:each | each asDiffNode] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st new file mode 100644 index 000000000..5d4dc0cd8 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st @@ -0,0 +1,7 @@ +accessing +updateFile: aPath + + self + deleteFile: aPath; + createFile: aPath. + \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json index 8bd30b4d1..dfd27c7d4 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json @@ -5,27 +5,39 @@ "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", "adjustedBy:" : "LB 11/22/2018 15:13", - "applyToContainer:" : "LB 11/22/2018 15:51", - "changedFiles" : "LB 11/22/2018 11:30", - "createFile:" : "LB 11/22/2018 16:03", + "applyToContainer:" : "LB 11/23/2018 19:08", + "createDiffs" : "LB 11/23/2018 15:20", + "createFile:" : "LB 11/23/2018 16:31", "deleteFile:" : "LB 11/22/2018 15:34", - "diff:against:" : "LB 11/22/2018 15:49", - "gitReferenceOn:" : "LB 11/22/2018 16:00", + "diff:against:" : "LB 11/23/2018 16:20", + "diffAdded" : "LB 11/23/2018 18:52", + "diffModified" : "LB 11/23/2018 18:52", + "diffRemoved" : "LB 11/23/2018 18:52", + "diffs" : "LB 11/23/2018 15:18", + "diffs:" : "LB 11/23/2018 15:18", + "gitReferenceOn:" : "LB 11/23/2018 16:31", "hasChanges" : "LB 11/22/2018 12:07", - "initializeSquotDiffNodes:with:" : "LB 11/22/2018 11:40", + "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", + "isFileModified:" : "LB 11/23/2018 16:13", "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", + "leftReferenceOn:" : "LB 11/23/2018 16:31", "mergeWithRemoval:" : "LB 11/22/2018 12:19", - "newSquotDiffNodes" : "LB 11/22/2018 11:32", + "modified" : "LB 11/23/2018 13:28", + "modified:" : "LB 11/23/2018 13:28", + "newSquotDiffNodes" : "LB 11/23/2018 15:24", "originalOrAddedArtifact" : "LB 11/22/2018 15:53", "path" : "LB 11/22/2018 16:36", "removed" : "LB 11/22/2018 11:17", "removed:" : "LB 11/22/2018 11:17", "right" : "LB 11/22/2018 11:14", "right:" : "LB 11/22/2018 11:14", - "squotChangeAsStringOrText" : "LB 11/22/2018 15:50", - "squotHasChanges" : "LB 11/22/2018 11:21", + "rightReferenceOn:" : "LB 11/23/2018 16:31", + "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", + "squotHasChanges" : "LB 11/23/2018 15:24", + "squotHasConflicts" : "LB 11/23/2018 15:25", "stayed" : "LB 11/22/2018 11:17", "stayed:" : "LB 11/22/2018 11:17", - "topNodes" : "LB 11/22/2018 16:53", + "topNodes" : "LB 11/23/2018 15:22", + "updateFile:" : "LB 11/23/2018 18:56", "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGitTests.package/LBGitFileListDiff.class/properties.json b/LBGitTests.package/LBGitFileListDiff.class/properties.json index e9052e318..73b0eb52e 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/properties.json +++ b/LBGitTests.package/LBGitFileListDiff.class/properties.json @@ -11,7 +11,9 @@ "right", "added", "removed", - "stayed" ], + "stayed", + "modified", + "diffs" ], "name" : "LBGitFileListDiff", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileModification.class/README.md b/LBGitTests.package/LBGitFileModification.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileModification.class/instance/title.st b/LBGitTests.package/LBGitFileModification.class/instance/title.st new file mode 100644 index 000000000..21e6e0b14 --- /dev/null +++ b/LBGitTests.package/LBGitFileModification.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Modified: ', self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileModification.class/methodProperties.json b/LBGitTests.package/LBGitFileModification.class/methodProperties.json new file mode 100644 index 000000000..bd7448c6a --- /dev/null +++ b/LBGitTests.package/LBGitFileModification.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFileModification.class/properties.json b/LBGitTests.package/LBGitFileModification.class/properties.json new file mode 100644 index 000000000..8da073bc0 --- /dev/null +++ b/LBGitTests.package/LBGitFileModification.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileModification", + "pools" : [ + ], + "super" : "LBGitFileDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileRemoval.class/README.md b/LBGitTests.package/LBGitFileRemoval.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st b/LBGitTests.package/LBGitFileRemoval.class/instance/after.st similarity index 50% rename from LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st rename to LBGitTests.package/LBGitFileRemoval.class/instance/after.st index 937d10df5..bbb1722ec 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/changedFiles.st +++ b/LBGitTests.package/LBGitFileRemoval.class/instance/after.st @@ -1,4 +1,4 @@ as yet unclassified -changedFiles +after - ^ 0 \ No newline at end of file + ^ String empty \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileRemoval.class/instance/title.st b/LBGitTests.package/LBGitFileRemoval.class/instance/title.st new file mode 100644 index 000000000..d0fb38629 --- /dev/null +++ b/LBGitTests.package/LBGitFileRemoval.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Removed: ', self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json b/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json new file mode 100644 index 000000000..ff9a42aa4 --- /dev/null +++ b/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "after" : "LB 11/23/2018 19:04", + "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFileRemoval.class/properties.json b/LBGitTests.package/LBGitFileRemoval.class/properties.json new file mode 100644 index 000000000..e44384cfa --- /dev/null +++ b/LBGitTests.package/LBGitFileRemoval.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitFileRemoval", + "pools" : [ + ], + "super" : "LBGitFileDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st index ff006254e..a6441cf5c 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st @@ -2,10 +2,10 @@ as yet unclassified collectFilesOf: aGitTreeEntrySet | result | - result := Set new. + result := Dictionary new. aGitTreeEntrySet do: [:each | each isInDirectoryMode - ifTrue: [(self collectFilesOf: (each object entries)) do: [:eachSub | result add: each entryName,'/', eachSub]] - ifFalse: [result add: each entryName] ]. - result := result reject: [:each | self isSquotFile: each]. + ifTrue: [(self collectFilesOf: each object entries) associationsDo: [:eachSub | result add: (each entryName,'/', eachSub key) -> eachSub value]] + ifFalse: [result at: each entryName put: each]]. + result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. ^ result \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st index ffe695ce4..acf662b3e 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st @@ -1,4 +1,4 @@ accessing shadows - ^ (self trackedFiles collect: [:each | each -> (LBGitDeserializedShadow onReference: (self rootDirectory resolve: each))]) asDictionary \ No newline at end of file + ^ (self trackedFiles keys collect: [:each | each -> (LBGitDeserializedShadow onReference: (self rootDirectory resolve: each))]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json index f58ad45b3..e778639fa 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "collectFilesOf:" : "LB 11/22/2018 16:39", + "collectFilesOf:" : "LB 11/23/2018 16:17", "collectTrackedFiles" : "LB 11/22/2018 15:45", "commit" : "LB 11/20/2018 16:28", "content" : "LB 11/22/2018 15:46", @@ -20,7 +20,7 @@ "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 11/20/2018 10:17", - "shadows" : "LB 11/22/2018 12:06", + "shadows" : "LB 11/23/2018 16:07", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } From c4c57dff2dbcf2504b33d5bd94c454f239b6b184 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 25 Nov 2018 16:59:39 +0100 Subject: [PATCH 080/170] Working! --- .../instance/applyWith..st | 4 +++ .../methodProperties.json | 1 + .../LBGitFileConflict.class/README.md | 0 .../class/left.right..st | 7 +++++ .../instance/applyWith..st | 4 +++ .../instance/asDiffNode.st | 7 +++++ .../LBGitFileConflict.class/instance/body.st | 11 ++++++++ .../instance/choice.st | 5 ++++ .../instance/leftChange..st | 4 +++ .../instance/leftChange.st | 4 +++ .../instance/rightChange..st | 4 +++ .../instance/rightChange.st | 4 +++ .../LBGitFileConflict.class/instance/title.st | 4 +++ .../methodProperties.json | 13 +++++++++ .../LBGitFileConflict.class/properties.json | 15 +++++++++++ .../LBGitFileDiff.class/instance/applyTo..st | 4 +++ .../instance/applyWith..st | 4 +++ .../instance/mergeWith..st | 6 +++++ .../LBGitFileDiff.class/methodProperties.json | 3 +++ .../LBGitFileListDiff.class/class/empty.st | 5 ++++ .../instance/applyToContainer..st | 8 +++--- .../instance/createFile..st | 11 ++++---- .../instance/deleteFile..st | 10 +++---- .../instance/diff.against..st | 6 ++--- .../instance/diffAt..st | 6 +++++ .../instance/diffPaths.st | 4 +++ .../instance/isFileModified..st | 3 +-- .../instance/isRemoval.st | 4 +++ .../instance/mergeWith..st | 14 ++++++++++ .../instance/sourceReferenceOn..st | 4 +++ .../instance/target..st | 4 +++ .../instance/target.st | 4 +++ .../instance/targetReferenceOn..st | 6 +++++ .../instance/updateFile..st | 2 +- .../methodProperties.json | 19 +++++++++---- .../LBGitFileListDiff.class/properties.json | 3 ++- .../LBGitFileMetadata.class/README.md | 0 .../class/onTreeEntry..st | 5 ++++ .../instance/entryHash.st | 6 +++++ .../instance/hasChangesTo..st | 4 +++ .../LBGitFileMetadata.class/instance/path..st | 4 +++ .../LBGitFileMetadata.class/instance/path.st | 4 +++ .../instance/treeEntry..st | 4 +++ .../instance/treeEntry.st | 4 +++ .../methodProperties.json | 10 +++++++ .../LBGitFileMetadata.class/properties.json | 15 +++++++++++ .../instance/applyWith..st | 4 +++ .../methodProperties.json | 1 + .../instance/applyWith..st | 4 +++ .../methodProperties.json | 1 + .../LBGitFilesArtifact.class/README.md | 0 .../instance/collectTrackedFiles.st | 4 +++ .../instance/diffAgainst..st | 4 +++ .../instance/diffContentAgainstThatOf..st | 1 + .../instance/displayText.st | 0 .../instance/isLoadable.st | 4 +++ .../instance/isSquotFile..st | 0 .../instance/ownerSnapshot..st | 0 .../instance/ownerSnapshot.st | 0 .../instance/path.st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 4 +++ .../reverseDiffAgainstRecordedFiles..st | 4 +++ .../reverseDiffAgainstUnrecordedFiles..st | 0 .../instance/reverseDiffContentAgainst..st | 0 .../instance/rootDirectory..st | 0 .../instance/rootDirectory.st | 0 .../instance/trackedFiles..st | 0 .../instance/trackedFiles.st | 0 .../instance/wantsToBeInTableOfContents.st | 0 .../methodProperties.json | 22 +++++++++++++++ .../LBGitFilesArtifact.class/properties.json | 16 +++++++++++ .../LBGitLiveFilesArtifact.class/README.md | 0 .../instance/collectTrackedFiles.st | 12 +++++++++ .../instance/diffAgainst..st | 5 ++++ .../instance/initializeOn..st | 4 +++ .../instance/printOn..st | 5 ++++ .../instance/reverseDiffAgainstLiveFiles..st | 4 +++ .../reverseDiffAgainstRecordedFiles..st | 7 +++++ .../methodProperties.json | 10 +++++++ .../properties.json | 14 ++++++++++ .../instance/collectFilesOf..st | 2 +- .../instance/collectTrackedFiles.st | 4 ++- .../instance/content..st | 4 --- .../instance/content.st | 8 ------ .../instance/diffAgainst..st | 6 ++--- .../instance/isLoadable.st | 4 --- .../instance/reverseDiffAgainstLiveFiles..st | 4 +++ .../reverseDiffAgainstRecordedFiles..st | 4 +++ .../instance/shadows.st | 4 --- .../methodProperties.json | 27 +++++-------------- .../properties.json | 7 ++--- 91 files changed, 400 insertions(+), 77 deletions(-) create mode 100644 LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st create mode 100644 LBGitTests.package/LBGitFileConflict.class/README.md create mode 100644 LBGitTests.package/LBGitFileConflict.class/class/left.right..st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/body.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/choice.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/instance/title.st create mode 100644 LBGitTests.package/LBGitFileConflict.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileConflict.class/properties.json create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st create mode 100644 LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/class/empty.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/target..st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/target.st create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/README.md create mode 100644 LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/path..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/path.st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFileMetadata.class/properties.json create mode 100644 LBGitTests.package/LBGitFileModification.class/instance/applyWith..st create mode 100644 LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/README.md create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/diffContentAgainstThatOf..st (89%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/displayText.st (100%) create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/isSquotFile..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/ownerSnapshot..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/ownerSnapshot.st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/path.st (100%) create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/reverseDiffAgainstUnrecordedFiles..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/reverseDiffContentAgainst..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/rootDirectory..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/rootDirectory.st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/trackedFiles..st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/trackedFiles.st (100%) rename LBGitTests.package/{LBGitRecordedFilesArtifact.class => LBGitFilesArtifact.class}/instance/wantsToBeInTableOfContents.st (100%) create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitFilesArtifact.class/properties.json create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/README.md create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json delete mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st delete mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st create mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st delete mode 100644 LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st b/LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st new file mode 100644 index 000000000..32f22605a --- /dev/null +++ b/LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + + aFileListDiff createFile: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileAddition.class/methodProperties.json b/LBGitTests.package/LBGitFileAddition.class/methodProperties.json index e9ab44f72..f382b01a4 100644 --- a/LBGitTests.package/LBGitFileAddition.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileAddition.class/methodProperties.json @@ -2,5 +2,6 @@ "class" : { }, "instance" : { + "applyWith:" : "LB 11/25/2018 16:39", "before" : "LB 11/23/2018 18:43", "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFileConflict.class/README.md b/LBGitTests.package/LBGitFileConflict.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileConflict.class/class/left.right..st b/LBGitTests.package/LBGitFileConflict.class/class/left.right..st new file mode 100644 index 000000000..21b179855 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/class/left.right..st @@ -0,0 +1,7 @@ +as yet unclassified +left: leftFileDiff right: rightFileDiff + + ^ self new + leftChange: leftFileDiff; + rightChange: rightFileDiff; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st b/LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st new file mode 100644 index 000000000..3b2cd8b73 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + "A conflict cannot be applied" + self choice applyWith: aFileListDiff \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st b/LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st new file mode 100644 index 000000000..7bdb70de9 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st @@ -0,0 +1,7 @@ +as yet unclassified +asDiffNode + + ^ SquotMergeDiffNode + title: self title + content: self + children: #() \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/body.st b/LBGitTests.package/LBGitFileConflict.class/instance/body.st new file mode 100644 index 000000000..4dad0e8d1 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/body.st @@ -0,0 +1,11 @@ +as yet unclassified +body + + ^ +('Loaded change: ', self leftChange title) asText allBold, ' + +', self leftChange body, ' + +',('Incoming change: ', self rightChange title) asText allBold, ' + +', self rightChange body \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/choice.st b/LBGitTests.package/LBGitFileConflict.class/instance/choice.st new file mode 100644 index 000000000..11b5b9b9a --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/choice.st @@ -0,0 +1,5 @@ +as yet unclassified +choice + + self flag: #TODO. + ^ self rightChange \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st b/LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st new file mode 100644 index 000000000..7b89be7d5 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st @@ -0,0 +1,4 @@ +accessing +leftChange: anObject + + leftChange := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st b/LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st new file mode 100644 index 000000000..e44e107d3 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st @@ -0,0 +1,4 @@ +accessing +leftChange + + ^ leftChange \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st b/LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st new file mode 100644 index 000000000..b842b9dee --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st @@ -0,0 +1,4 @@ +accessing +rightChange: anObject + + rightChange := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st b/LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st new file mode 100644 index 000000000..4fd62848e --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st @@ -0,0 +1,4 @@ +accessing +rightChange + + ^ rightChange \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/title.st b/LBGitTests.package/LBGitFileConflict.class/instance/title.st new file mode 100644 index 000000000..ae1128eb8 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Conflicting changes for: ', self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileConflict.class/methodProperties.json b/LBGitTests.package/LBGitFileConflict.class/methodProperties.json new file mode 100644 index 000000000..47f88cc2c --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/methodProperties.json @@ -0,0 +1,13 @@ +{ + "class" : { + "left:right:" : "LB 11/25/2018 16:22" }, + "instance" : { + "applyWith:" : "LB 11/25/2018 16:47", + "asDiffNode" : "LB 11/25/2018 16:19", + "body" : "LB 11/25/2018 16:35", + "choice" : "LB 11/25/2018 16:47", + "leftChange" : "LB 11/25/2018 16:22", + "leftChange:" : "LB 11/25/2018 16:22", + "rightChange" : "LB 11/25/2018 16:22", + "rightChange:" : "LB 11/25/2018 16:22", + "title" : "LB 11/25/2018 16:20" } } diff --git a/LBGitTests.package/LBGitFileConflict.class/properties.json b/LBGitTests.package/LBGitFileConflict.class/properties.json new file mode 100644 index 000000000..017c4b331 --- /dev/null +++ b/LBGitTests.package/LBGitFileConflict.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "leftChange", + "rightChange" ], + "name" : "LBGitFileConflict", + "pools" : [ + ], + "super" : "LBGitFileDiff", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st b/LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st new file mode 100644 index 000000000..01c58adea --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st @@ -0,0 +1,4 @@ +as yet unclassified +applyTo: anObjectContainer + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st b/LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st new file mode 100644 index 000000000..67539f7f8 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st b/LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st new file mode 100644 index 000000000..d59ec3e99 --- /dev/null +++ b/LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st @@ -0,0 +1,6 @@ +as yet unclassified +mergeWith: anotherFileDiff + + ^ (LBGitFileConflict left: self right: anotherFileDiff) + path: self path; + yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileDiff.class/methodProperties.json index 491103eb7..3db645d3e 100644 --- a/LBGitTests.package/LBGitFileDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileDiff.class/methodProperties.json @@ -3,9 +3,12 @@ }, "instance" : { "after" : "LB 11/23/2018 18:50", + "applyTo:" : "LB 11/25/2018 16:37", + "applyWith:" : "LB 11/25/2018 16:39", "asDiffNode" : "LB 11/23/2018 15:14", "before" : "LB 11/23/2018 18:50", "body" : "LB 11/23/2018 18:37", + "mergeWith:" : "LB 11/25/2018 16:34", "parent" : "LB 11/23/2018 18:42", "parent:" : "LB 11/23/2018 18:42", "path" : "LB 11/23/2018 18:51", diff --git a/LBGitTests.package/LBGitFileListDiff.class/class/empty.st b/LBGitTests.package/LBGitFileListDiff.class/class/empty.st new file mode 100644 index 000000000..a002b5974 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/class/empty.st @@ -0,0 +1,5 @@ +as yet unclassified +empty + + ^ self new + diffs: Array empty. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st index f682aa865..084415f22 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st @@ -1,6 +1,6 @@ -as yet unclassified +applying applyToContainer: anObjectContainer - self added do: [:each | self createFile: each]. - self modified do: [:each | self updateFile: each]. - self removed do: [:each | self deleteFile: each]. \ No newline at end of file + (anObjectContainer class canUnderstand: #directory) + ifTrue: [self target: anObjectContainer directory]. + self diffs do: [:each | each applyWith: self]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st index 3240b4434..d85c3e94f 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st @@ -1,8 +1,9 @@ -as yet unclassified +applying createFile: aPath - | gitReference workingReference | - gitReference := self gitReferenceOn: aPath. - workingReference := self workingReferenceOn: aPath. + | sourceReference targetReference | + sourceReference := self sourceReferenceOn: aPath. + sourceReference exists ifFalse: [^ self]. + targetReference := self targetReferenceOn: aPath. self flag: #TODO. "Do ensure the file does NOT exist workingReference ensureFile." - gitReference copyTo: workingReference. \ No newline at end of file + sourceReference copyTo: targetReference. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st index 2a6e8da01..98e940619 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st @@ -1,7 +1,7 @@ -as yet unclassified +applying deleteFile: aPath - | workingReference | - workingReference := self workingReferenceOn: aPath. - workingReference exists - ifTrue: [workingReference delete] \ No newline at end of file + | targetReference | + targetReference := self targetReferenceOn: aPath. + targetReference exists + ifTrue: [targetReference delete] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st index 9e6d026d1..4cb8651c7 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st @@ -5,9 +5,9 @@ diff: leftArtifact against: rightArtifact left: leftArtifact; right: rightArtifact. self - added: (self right shadows keys difference: self left shadows keys); - stayed: (self right shadows keys intersection: self left shadows keys); - removed: (self left shadows keys difference: self right shadows keys). + added: (self right trackedFiles keys difference: self left trackedFiles keys); + stayed: (self right trackedFiles keys intersection: self left trackedFiles keys); + removed: (self left trackedFiles keys difference: self right trackedFiles keys). self modified: (self stayed select: [:each | self isFileModified: each]). self stayed: (self stayed difference: self modified). self diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st new file mode 100644 index 000000000..9a7bc586d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st @@ -0,0 +1,6 @@ +accessing +diffAt: aPath + + ^ (self diffs select: [:each | each path = aPath]) + ifEmpty: [nil] + ifNotEmpty: [:found | found anyOne] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st b/LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st new file mode 100644 index 000000000..5872a1812 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st @@ -0,0 +1,4 @@ +as yet unclassified +diffPaths + + ^ self diffs collect: [:each | each path] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st b/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st index b5d5567f8..119fa08c0 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st @@ -1,5 +1,4 @@ diff creation isFileModified: aPath - ^ (self left trackedFiles at: aPath) entryHash - ~= (self right trackedFiles at: aPath) entryHash \ No newline at end of file + ^ (self left trackedFiles at: aPath) hasChangesTo: (self right trackedFiles at: aPath) \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st b/LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st new file mode 100644 index 000000000..eef294d7b --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st @@ -0,0 +1,4 @@ +applying +isRemoval + + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st new file mode 100644 index 000000000..670b6523d --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st @@ -0,0 +1,14 @@ +as yet unclassified +mergeWith: otherFileListDiff + + | commonPaths resultingDiffs | + resultingDiffs := OrderedCollection new. + commonPaths := self diffPaths intersection: otherFileListDiff diffPaths. + resultingDiffs addAll: (self diffs reject: [:each | commonPaths includes: each path]). + resultingDiffs addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]). + resultingDiffs addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). + self halt. + ^ LBGitFileListDiff new + left: self right; + right: otherFileListDiff right; + diffs: resultingDiffs \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st new file mode 100644 index 000000000..a7f327e4b --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st @@ -0,0 +1,4 @@ +applying +sourceReferenceOn: aPath + + ^ self rightReferenceOn: aPath \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/target..st b/LBGitTests.package/LBGitFileListDiff.class/instance/target..st new file mode 100644 index 000000000..08fc09ad3 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/target..st @@ -0,0 +1,4 @@ +accessing +target: anObject + + target := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/target.st b/LBGitTests.package/LBGitFileListDiff.class/instance/target.st new file mode 100644 index 000000000..66264783f --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/target.st @@ -0,0 +1,4 @@ +accessing +target + + ^ target \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st new file mode 100644 index 000000000..bda1615a6 --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st @@ -0,0 +1,6 @@ +applying +targetReferenceOn: aPath + + ^ self target + ifNil: [self left rootDirectory resolve: aPath] + ifNotNil: [self target resolve: aPath] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st b/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st index 5d4dc0cd8..952591ca3 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st @@ -1,4 +1,4 @@ -accessing +applying updateFile: aPath self diff --git a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json index dfd27c7d4..dd5553d90 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json @@ -1,27 +1,32 @@ { "class" : { + "empty" : "LB 11/25/2018 14:13", "left:right:" : "LB 11/22/2018 15:36" }, "instance" : { "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", "adjustedBy:" : "LB 11/22/2018 15:13", - "applyToContainer:" : "LB 11/23/2018 19:08", + "applyToContainer:" : "LB 11/25/2018 16:41", "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 11/23/2018 16:31", - "deleteFile:" : "LB 11/22/2018 15:34", - "diff:against:" : "LB 11/23/2018 16:20", + "createFile:" : "LB 11/25/2018 16:57", + "deleteFile:" : "LB 11/25/2018 15:55", + "diff:against:" : "LB 11/25/2018 13:25", "diffAdded" : "LB 11/23/2018 18:52", + "diffAt:" : "LB 11/25/2018 16:14", "diffModified" : "LB 11/23/2018 18:52", + "diffPaths" : "LB 11/25/2018 16:05", "diffRemoved" : "LB 11/23/2018 18:52", "diffs" : "LB 11/23/2018 15:18", "diffs:" : "LB 11/23/2018 15:18", "gitReferenceOn:" : "LB 11/23/2018 16:31", "hasChanges" : "LB 11/22/2018 12:07", "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", - "isFileModified:" : "LB 11/23/2018 16:13", + "isFileModified:" : "LB 11/25/2018 15:20", + "isRemoval" : "LB 11/25/2018 16:00", "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", "leftReferenceOn:" : "LB 11/23/2018 16:31", + "mergeWith:" : "LB 11/25/2018 16:33", "mergeWithRemoval:" : "LB 11/22/2018 12:19", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", @@ -33,11 +38,15 @@ "right" : "LB 11/22/2018 11:14", "right:" : "LB 11/22/2018 11:14", "rightReferenceOn:" : "LB 11/23/2018 16:31", + "sourceReferenceOn:" : "LB 11/25/2018 15:56", "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", "squotHasChanges" : "LB 11/23/2018 15:24", "squotHasConflicts" : "LB 11/23/2018 15:25", "stayed" : "LB 11/22/2018 11:17", "stayed:" : "LB 11/22/2018 11:17", + "target" : "LB 11/25/2018 15:53", + "target:" : "LB 11/25/2018 15:53", + "targetReferenceOn:" : "LB 11/25/2018 16:46", "topNodes" : "LB 11/23/2018 15:22", "updateFile:" : "LB 11/23/2018 18:56", "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGitTests.package/LBGitFileListDiff.class/properties.json b/LBGitTests.package/LBGitFileListDiff.class/properties.json index 73b0eb52e..4dc3697b9 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/properties.json +++ b/LBGitTests.package/LBGitFileListDiff.class/properties.json @@ -13,7 +13,8 @@ "removed", "stayed", "modified", - "diffs" ], + "diffs", + "target" ], "name" : "LBGitFileListDiff", "pools" : [ ], diff --git a/LBGitTests.package/LBGitFileMetadata.class/README.md b/LBGitTests.package/LBGitFileMetadata.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st b/LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st new file mode 100644 index 000000000..b91d8447b --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st @@ -0,0 +1,5 @@ +as yet unclassified +onTreeEntry: aGitTreeEntry + + ^ self new + treeEntry: aGitTreeEntry \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st b/LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st new file mode 100644 index 000000000..c4fa6a8c5 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st @@ -0,0 +1,6 @@ +accessing +entryHash + + ^ self treeEntry + ifNil: [nil] + ifNotNil: [self treeEntry entryHash] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st new file mode 100644 index 000000000..a571daa3f --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st @@ -0,0 +1,4 @@ +as yet unclassified +hasChangesTo: otherFileMetaData + + ^ self entryHash ~= otherFileMetaData entryHash \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/path..st b/LBGitTests.package/LBGitFileMetadata.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/path.st b/LBGitTests.package/LBGitFileMetadata.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st b/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st new file mode 100644 index 000000000..2efd7749f --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st @@ -0,0 +1,4 @@ +accessing +treeEntry: anObject + + treeEntry := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st b/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st new file mode 100644 index 000000000..d6dfefb76 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st @@ -0,0 +1,4 @@ +accessing +treeEntry + + ^ treeEntry \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json b/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json new file mode 100644 index 000000000..1e1504b31 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + "onTreeEntry:" : "LB 11/25/2018 15:17" }, + "instance" : { + "entryHash" : "LB 11/25/2018 15:14", + "hasChangesTo:" : "LB 11/25/2018 15:14", + "path" : "LB 11/25/2018 15:29", + "path:" : "LB 11/25/2018 15:29", + "treeEntry" : "LB 11/25/2018 15:14", + "treeEntry:" : "LB 11/25/2018 15:14" } } diff --git a/LBGitTests.package/LBGitFileMetadata.class/properties.json b/LBGitTests.package/LBGitFileMetadata.class/properties.json new file mode 100644 index 000000000..4d92d8ab8 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "path", + "treeEntry" ], + "name" : "LBGitFileMetadata", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileModification.class/instance/applyWith..st b/LBGitTests.package/LBGitFileModification.class/instance/applyWith..st new file mode 100644 index 000000000..e3a16c84c --- /dev/null +++ b/LBGitTests.package/LBGitFileModification.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + + aFileListDiff updateFile: self path. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileModification.class/methodProperties.json b/LBGitTests.package/LBGitFileModification.class/methodProperties.json index bd7448c6a..47f7175dc 100644 --- a/LBGitTests.package/LBGitFileModification.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileModification.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { + "applyWith:" : "LB 11/25/2018 16:40", "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st b/LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st new file mode 100644 index 000000000..42b0318e3 --- /dev/null +++ b/LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + + aFileListDiff deleteFile: self path. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json b/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json index ff9a42aa4..71b972692 100644 --- a/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json @@ -3,4 +3,5 @@ }, "instance" : { "after" : "LB 11/23/2018 19:04", + "applyWith:" : "LB 11/25/2018 16:40", "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGitTests.package/LBGitFilesArtifact.class/README.md b/LBGitTests.package/LBGitFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..1f72266e9 --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,4 @@ +as yet unclassified +collectTrackedFiles + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..e0420bc4d --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +1,4 @@ +diffing +diffAgainst: otherFilesArtifact + + ^ LBGitFileListDiff left: self right: otherFilesArtifact \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st similarity index 89% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st index 4ae63b63e..f849520c8 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffContentAgainstThatOf..st +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st @@ -1,4 +1,5 @@ as yet unclassified diffContentAgainstThatOf: anArtifact "Double dispatch with reverseDiffContentAgainst:" + self deprecated. ^ anArtifact reverseDiffContentAgainst: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/displayText.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/displayText.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/displayText.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st new file mode 100644 index 000000000..8b0d22d2c --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st @@ -0,0 +1,4 @@ +as yet unclassified +isLoadable + "This was needed for commiting" + ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/isSquotFile..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isSquotFile..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/isSquotFile..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/ownerSnapshot.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/path.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/path.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/path.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..91c2c2192 --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstLiveFiles: otherFilesArtifact + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..cdc89b8bf --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffContentAgainst..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/rootDirectory.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory.st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st b/LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles..st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/trackedFiles.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles.st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/LBGitTests.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/wantsToBeInTableOfContents.st rename to LBGitTests.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..b813ef1f8 --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json @@ -0,0 +1,22 @@ +{ + "class" : { + }, + "instance" : { + "collectTrackedFiles" : "LB 11/25/2018 13:34", + "diffAgainst:" : "LB 11/25/2018 13:35", + "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", + "displayText" : "LB 11/20/2018 15:09", + "isLoadable" : "LB 11/25/2018 13:22", + "isSquotFile:" : "LB 11/22/2018 16:43", + "ownerSnapshot" : "LB 11/20/2018 15:14", + "ownerSnapshot:" : "LB 11/20/2018 15:14", + "path" : "LB 11/20/2018 10:19", + "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", + "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", + "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", + "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", + "rootDirectory" : "LB 11/20/2018 10:17", + "rootDirectory:" : "LB 11/20/2018 10:17", + "trackedFiles" : "LB 11/22/2018 15:46", + "trackedFiles:" : "LB 11/20/2018 15:12", + "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGitTests.package/LBGitFilesArtifact.class/properties.json b/LBGitTests.package/LBGitFilesArtifact.class/properties.json new file mode 100644 index 000000000..fe8760352 --- /dev/null +++ b/LBGitTests.package/LBGitFilesArtifact.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "ownerSnapshot", + "rootDirectory", + "trackedFiles" ], + "name" : "LBGitFilesArtifact", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/README.md b/LBGitTests.package/LBGitLiveFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..f09b71701 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,12 @@ +as yet unclassified +collectTrackedFiles + self halt. + "use flatten" + self trackedFiles: + (((((((self rootDirectory children reject: [:each | each path segments last = '.git']) + collect: [:each | each allFiles]) + inject: Set new into: [:set :each | set addAll: each. set]) + collect: [:each | each relativeTo: self rootDirectory]) + collect: [:each | each segments fold: [:all :eachSegment | all,'/',eachSegment]]) + reject: [:each | self isSquotFile: each]) + collect: [:each | each -> (LBGitFileMetadata new path: each)]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..a921c4a28 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +1,5 @@ +diffing +diffAgainst: otherFilesArtifact + + self isThisEverCalled: 'A live artifact appeared on the right(wrong) side'. + ^ otherFilesArtifact reverseDiffAgainstLiveFiles: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st new file mode 100644 index 000000000..cda4f4517 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st @@ -0,0 +1,4 @@ +as yet unclassified +initializeOn: aRecordedFilesArtifact + + self rootDirectory: (aRecordedFilesArtifact rootDirectory fileSystem repository repository instVarNamed: #reference). \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st new file mode 100644 index 000000000..57a9c7f1e --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st @@ -0,0 +1,5 @@ +as yet unclassified +printOn: aStream + + super printOn: aStream. + aStream nextPutAll: '(live)'. \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..769bf12b9 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstLiveFiles: otherFilesArtifact + "There is only one live file system" + ^ self shouldNotImplement \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..0eea8e098 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,7 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + self flag: #TODO. + self halt. + self initializeOn: otherFilesArtifact. + ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..dd5e55eaf --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + }, + "instance" : { + "collectTrackedFiles" : "LB 11/25/2018 15:36", + "diffAgainst:" : "LB 11/25/2018 14:10", + "initializeOn:" : "LB 11/25/2018 14:43", + "printOn:" : "LB 11/25/2018 13:44", + "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", + "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:45" } } diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json b/LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json new file mode 100644 index 000000000..643cec896 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGitTests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitLiveFilesArtifact", + "pools" : [ + ], + "super" : "LBGitFilesArtifact", + "type" : "normal" } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st index a6441cf5c..761a66225 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st @@ -6,6 +6,6 @@ collectFilesOf: aGitTreeEntrySet aGitTreeEntrySet do: [:each | each isInDirectoryMode ifTrue: [(self collectFilesOf: each object entries) associationsDo: [:eachSub | result add: (each entryName,'/', eachSub key) -> eachSub value]] - ifFalse: [result at: each entryName put: each]]. + ifFalse: [result at: each entryName put: (LBGitFileMetadata onTreeEntry: each)]]. result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. ^ result \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st index aca9a93ba..3f65829d1 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -2,4 +2,6 @@ as yet unclassified collectTrackedFiles self trackedFiles: - (self collectFilesOf: self commit tree entries) \ No newline at end of file + (self collectFilesOf: self commit tree entries). + self trackedFiles keysDo: + [:key | (self trackedFiles at: key) path: key] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st deleted file mode 100644 index ee3ef071a..000000000 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -content: anObject - - content := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st deleted file mode 100644 index b83b71b41..000000000 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/content.st +++ /dev/null @@ -1,8 +0,0 @@ -as yet unclassified -content - - self flag: #DEPRECATED. - ^ content ifNil: - [self collectTrackedFiles. - self content: (SquotShadowGraph withSingleShadow: (LBGitFileListShadow on: self)). - content] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st index 022d3d67d..68a9f542d 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st @@ -1,4 +1,4 @@ -as yet unclassified -diffAgainst: otherRecordedFilesArtifact +diffing +diffAgainst: otherFilesArtifact - ^ LBGitFileListDiff left: self right: otherRecordedFilesArtifact \ No newline at end of file + ^ otherFilesArtifact reverseDiffAgainstRecordedFiles: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st deleted file mode 100644 index e71e31dbe..000000000 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/isLoadable.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -isLoadable - - ^ false \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..914d52359 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstLiveFiles: otherFilesArtifact + + ^ self halt \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..08e02cc19 --- /dev/null +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st deleted file mode 100644 index acf662b3e..000000000 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/shadows.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -shadows - - ^ (self trackedFiles keys collect: [:each | each -> (LBGitDeserializedShadow onReference: (self rootDirectory resolve: each))]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json index e778639fa..c28514ea4 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -2,25 +2,10 @@ "class" : { }, "instance" : { - "collectFilesOf:" : "LB 11/23/2018 16:17", - "collectTrackedFiles" : "LB 11/22/2018 15:45", + "collectFilesOf:" : "LB 11/25/2018 15:16", + "collectTrackedFiles" : "LB 11/25/2018 15:31", "commit" : "LB 11/20/2018 16:28", - "content" : "LB 11/22/2018 15:46", - "content:" : "LB 11/22/2018 10:38", - "diffAgainst:" : "LB 11/22/2018 12:03", - "diffContentAgainstThatOf:" : "LB 11/22/2018 10:07", - "displayText" : "LB 11/20/2018 15:09", - "isLoadable" : "LB 11/20/2018 15:07", - "isSquotFile:" : "LB 11/22/2018 16:43", - "ownerSnapshot" : "LB 11/20/2018 15:14", - "ownerSnapshot:" : "LB 11/20/2018 15:14", - "path" : "LB 11/20/2018 10:19", - "printOn:" : "LB 11/22/2018 15:44", - "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", - "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", - "rootDirectory" : "LB 11/20/2018 10:17", - "rootDirectory:" : "LB 11/20/2018 10:17", - "shadows" : "LB 11/23/2018 16:07", - "trackedFiles" : "LB 11/22/2018 15:46", - "trackedFiles:" : "LB 11/20/2018 15:12", - "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } + "diffAgainst:" : "LB 11/25/2018 14:06", + "printOn:" : "LB 11/25/2018 13:44", + "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:09", + "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08" } } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json index 10068737d..8adc7680d 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json @@ -6,12 +6,9 @@ ], "commentStamp" : "", "instvars" : [ - "ownerSnapshot", - "rootDirectory", - "trackedFiles", - "content" ], + ], "name" : "LBGitRecordedFilesArtifact", "pools" : [ ], - "super" : "Object", + "super" : "LBGitFilesArtifact", "type" : "normal" } From 2256f11288c4562ef525a2f9fa364ff56f991fa2 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 16:11:46 +0100 Subject: [PATCH 081/170] Feature complete (hopefully) (lets label it with @version 1.0.0) --- .../LBGitFileListDiff.class/class/left.right..st | 2 +- .../instance/adjustedBy..st | 2 +- .../instance/applyToContainer..st | 6 ++++-- .../instance/diff.against..st | 3 +-- .../instance/mergeWith..st | 1 - .../instance/workingDirectory.st | 4 ++++ .../LBGitFileListDiff.class/methodProperties.json | 11 ++++++----- .../instance/contentChangesTo..st | 5 +++++ .../LBGitFileMetadata.class/instance/contents.st | 11 +++++++++++ .../instance/gitChangesTo..st | 5 +++++ .../instance/hasChangesTo..st | 4 +++- .../LBGitFileMetadata.class/methodProperties.json | 5 ++++- .../instance/allFiles.st | 6 ++++++ .../instance/collectTrackedFiles.st | 15 +++++---------- .../instance/pathAndMetadataFor..st | 7 +++++++ .../instance/reverseDiffAgainstRecordedFiles..st | 2 -- .../methodProperties.json | 6 ++++-- .../instance/collectTrackedFiles.st | 2 +- .../methodProperties.json | 2 +- 19 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/contents.st create mode 100644 LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st create mode 100644 LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st b/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st index 36eead912..b665e9b7f 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st +++ b/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st @@ -1,6 +1,6 @@ as yet unclassified left: leftArtifact right: rightArtifact - self halt. + ^ self new diff: leftArtifact against: rightArtifact; yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st index 4cfbad180..8c1c5f991 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st @@ -1,5 +1,5 @@ as yet unclassified adjustedBy: aDiffNode - self flag: #TODO "This allows to either select or deselect file changes in the future". + self diffs: ((aDiffNode children select: [:each | each isActive]) collect: [:each | each content]). ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st index 084415f22..a49c0c5f5 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st @@ -1,6 +1,8 @@ applying applyToContainer: anObjectContainer - (anObjectContainer class canUnderstand: #directory) - ifTrue: [self target: anObjectContainer directory]. + self target: ((anObjectContainer class canUnderstand: #directory) + ifTrue: [anObjectContainer directory] + ifFalse: [self workingDirectory]). + self diffs do: [:each | each applyWith: self]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st index 4cb8651c7..e57fbd29d 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st @@ -11,5 +11,4 @@ diff: leftArtifact against: rightArtifact self modified: (self stayed select: [:each | self isFileModified: each]). self stayed: (self stayed difference: self modified). self - createDiffs. - self halt. \ No newline at end of file + createDiffs. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st index 670b6523d..79f8d171b 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st @@ -7,7 +7,6 @@ mergeWith: otherFileListDiff resultingDiffs addAll: (self diffs reject: [:each | commonPaths includes: each path]). resultingDiffs addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]). resultingDiffs addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). - self halt. ^ LBGitFileListDiff new left: self right; right: otherFileListDiff right; diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st b/LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st new file mode 100644 index 000000000..00210ea1e --- /dev/null +++ b/LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self right rootDirectory fileSystem repository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json index dd5553d90..df9f859c3 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json @@ -1,16 +1,16 @@ { "class" : { "empty" : "LB 11/25/2018 14:13", - "left:right:" : "LB 11/22/2018 15:36" }, + "left:right:" : "LB 11/26/2018 16:06" }, "instance" : { "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", - "adjustedBy:" : "LB 11/22/2018 15:13", - "applyToContainer:" : "LB 11/25/2018 16:41", + "adjustedBy:" : "LB 11/26/2018 16:04", + "applyToContainer:" : "LB 11/26/2018 16:06", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 11/25/2018 16:57", "deleteFile:" : "LB 11/25/2018 15:55", - "diff:against:" : "LB 11/25/2018 13:25", + "diff:against:" : "LB 11/26/2018 16:06", "diffAdded" : "LB 11/23/2018 18:52", "diffAt:" : "LB 11/25/2018 16:14", "diffModified" : "LB 11/23/2018 18:52", @@ -26,7 +26,7 @@ "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", "leftReferenceOn:" : "LB 11/23/2018 16:31", - "mergeWith:" : "LB 11/25/2018 16:33", + "mergeWith:" : "LB 11/26/2018 16:06", "mergeWithRemoval:" : "LB 11/22/2018 12:19", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", @@ -49,4 +49,5 @@ "targetReferenceOn:" : "LB 11/25/2018 16:46", "topNodes" : "LB 11/23/2018 15:22", "updateFile:" : "LB 11/23/2018 18:56", + "workingDirectory" : "LB 11/26/2018 15:35", "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st new file mode 100644 index 000000000..e0ef646ba --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st @@ -0,0 +1,5 @@ +as yet unclassified +contentChangesTo: otherFileMetaData + + (self contents isNil or: [otherFileMetaData contents isNil]) ifTrue: [^nil]. + ^ self contents ~= otherFileMetaData contents \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/contents.st b/LBGitTests.package/LBGitFileMetadata.class/instance/contents.st new file mode 100644 index 000000000..12972e65a --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/contents.st @@ -0,0 +1,11 @@ +as yet unclassified +contents + + | stream content | + ^ (self path notNil and: [self path exists]) + ifFalse: [nil] + ifTrue: + [stream := self path readStream binary. + content := stream contents. + stream close. + content] diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st new file mode 100644 index 000000000..6ea3049c0 --- /dev/null +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st @@ -0,0 +1,5 @@ +as yet unclassified +gitChangesTo: otherFileMetaData + + (self entryHash isNil or: [otherFileMetaData entryHash isNil]) ifTrue: [^nil]. + ^ self entryHash ~= otherFileMetaData entryHash \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st index a571daa3f..ea47dbe2e 100644 --- a/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st +++ b/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st @@ -1,4 +1,6 @@ as yet unclassified hasChangesTo: otherFileMetaData - ^ self entryHash ~= otherFileMetaData entryHash \ No newline at end of file + (self gitChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. + (self contentChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. + ^ false. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json b/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json index 1e1504b31..b9341b462 100644 --- a/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json +++ b/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json @@ -2,8 +2,11 @@ "class" : { "onTreeEntry:" : "LB 11/25/2018 15:17" }, "instance" : { + "contentChangesTo:" : "LB 11/25/2018 17:26", + "contents" : "LB 11/25/2018 17:29", "entryHash" : "LB 11/25/2018 15:14", - "hasChangesTo:" : "LB 11/25/2018 15:14", + "gitChangesTo:" : "LB 11/25/2018 17:02", + "hasChangesTo:" : "LB 11/25/2018 17:27", "path" : "LB 11/25/2018 15:29", "path:" : "LB 11/25/2018 15:29", "treeEntry" : "LB 11/25/2018 15:14", diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st new file mode 100644 index 000000000..ea128e2a6 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st @@ -0,0 +1,6 @@ +collecting tracked files +allFiles + + ^ ((self rootDirectory children + reject: [:each | each path segments last = '.git']) + collect: [:each | each allFiles]) flatten \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st index f09b71701..54636a84d 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st @@ -1,12 +1,7 @@ -as yet unclassified +collecting tracked files collectTrackedFiles - self halt. - "use flatten" + self trackedFiles: - (((((((self rootDirectory children reject: [:each | each path segments last = '.git']) - collect: [:each | each allFiles]) - inject: Set new into: [:set :each | set addAll: each. set]) - collect: [:each | each relativeTo: self rootDirectory]) - collect: [:each | each segments fold: [:all :eachSegment | all,'/',eachSegment]]) - reject: [:each | self isSquotFile: each]) - collect: [:each | each -> (LBGitFileMetadata new path: each)]) asDictionary \ No newline at end of file + ((self allFiles + collect: [:each | self pathAndMetadataFor: each]) + reject: [:each | self isSquotFile: each key]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st new file mode 100644 index 000000000..dc96df514 --- /dev/null +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st @@ -0,0 +1,7 @@ +collecting tracked files +pathAndMetadataFor: aFSReference + + | path | + path := (aFSReference relativeTo: self rootDirectory) + segments fold: [:all :eachSegment | all,'/',eachSegment]. + ^ path -> (LBGitFileMetadata new path: aFSReference) \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st index 0eea8e098..3d5ecd637 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -1,7 +1,5 @@ diffing reverseDiffAgainstRecordedFiles: otherFilesArtifact - self flag: #TODO. - self halt. self initializeOn: otherFilesArtifact. ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json index dd5e55eaf..3fcd032bb 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -2,9 +2,11 @@ "class" : { }, "instance" : { - "collectTrackedFiles" : "LB 11/25/2018 15:36", + "allFiles" : "LB 11/25/2018 17:19", + "collectTrackedFiles" : "LB 11/26/2018 16:06", "diffAgainst:" : "LB 11/25/2018 14:10", "initializeOn:" : "LB 11/25/2018 14:43", + "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", - "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:45" } } + "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06" } } diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st index 3f65829d1..32583b8ad 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -4,4 +4,4 @@ collectTrackedFiles self trackedFiles: (self collectFilesOf: self commit tree entries). self trackedFiles keysDo: - [:key | (self trackedFiles at: key) path: key] \ No newline at end of file + [:key | (self trackedFiles at: key) path: (self rootDirectory resolve: key)] \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json index c28514ea4..ec9000550 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -3,7 +3,7 @@ }, "instance" : { "collectFilesOf:" : "LB 11/25/2018 15:16", - "collectTrackedFiles" : "LB 11/25/2018 15:31", + "collectTrackedFiles" : "LB 11/25/2018 17:33", "commit" : "LB 11/20/2018 16:28", "diffAgainst:" : "LB 11/25/2018 14:06", "printOn:" : "LB 11/25/2018 13:44", From a6c00f1021ba50bea5a7ea8075bac3f267f233d3 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 16:18:54 +0100 Subject: [PATCH 082/170] Remove unused classes --- .../LBGitDeserializedShadow.class/README.md | 0 .../class/onReference..st | 6 ------ .../instance/content.st | 4 ---- .../methodProperties.json | 5 ----- .../properties.json | 14 ------------- LBGitTests.package/LBGitDiff.class/README.md | 0 .../LBGitDiff.class/instance/chosenOption.st | 6 ------ .../initializeSquotDiffNodes.with..st | 12 ----------- .../LBGitDiff.class/instance/isLeftChosen.st | 5 ----- .../LBGitDiff.class/instance/left..st | 4 ---- .../LBGitDiff.class/instance/left.st | 4 ---- .../instance/newSquotDiffNodes.st | 8 ------- .../LBGitDiff.class/instance/options.st | 4 ---- .../LBGitDiff.class/instance/right..st | 4 ---- .../LBGitDiff.class/instance/right.st | 4 ---- .../instance/squotAdjustToResemble..st | 4 ---- .../instance/squotApplyTo.with..st | 5 ----- .../instance/squotApplyToLoaded.with..st | 5 ----- .../instance/squotChangeAsStringOrText.st | 9 -------- .../instance/squotHasChanges.st | 4 ---- .../instance/squotHasConflicts.st | 4 ---- .../LBGitDiff.class/instance/writeTo..st | 4 ---- .../LBGitDiff.class/methodProperties.json | 20 ------------------ .../LBGitDiff.class/properties.json | 17 --------------- .../LBGitFileInfo.class/README.md | 0 .../class/fromGitReference..st | 11 ---------- .../LBGitFileInfo.class/class/on.in..st | 7 ------- .../class/onGitReference..st | 13 ------------ .../instance/browseFromSquot..st | 4 ---- .../instance/captureWithSquot..st | 4 ---- .../instance/captureWithSquot.st | 5 ----- .../LBGitFileInfo.class/instance/content..st | 6 ------ .../LBGitFileInfo.class/instance/content.st | 8 ------- .../LBGitFileInfo.class/instance/path..st | 4 ---- .../LBGitFileInfo.class/instance/path.st | 4 ---- .../LBGitFileInfo.class/instance/reference.st | 4 ---- .../instance/rootDirectory..st | 4 ---- .../instance/rootDirectory.st | 4 ---- .../instance/squotAddTransientStoreInfoTo..st | 4 ---- .../instance/squotInitializeStoreInfo..st | 5 ----- .../squotRemoveTransientStoreInfoFrom..st | 4 ---- .../instance/squotShadowFactory.st | 4 ---- .../instance/squotShouldKeepIdentity.st | 4 ---- .../LBGitFileInfo.class/methodProperties.json | 21 ------------------- .../LBGitFileInfo.class/properties.json | 15 ------------- .../LBGitFileListShadow.class/README.md | 0 .../LBGitFileListShadow.class/class/on..st | 4 ---- .../instance/content.st | 4 ---- .../LBGitFileListShadow.class/instance/on..st | 5 ----- .../instance/paths..st | 4 ---- .../instance/paths.st | 4 ---- .../instance/squotDiffAgainst.with..st | 6 ------ .../methodProperties.json | 9 -------- .../LBGitFileListShadow.class/properties.json | 14 ------------- .../LBGitFileShadow.class/README.md | 0 .../instance/content..st | 8 ------- .../LBGitFileShadow.class/instance/content.st | 11 ---------- .../instance/fileInfo..st | 4 ---- .../instance/fileInfo.st | 4 ---- .../instance/gitContent.st | 11 ---------- .../instance/gitReference..st | 4 ---- .../instance/gitReference.st | 4 ---- .../LBGitFileShadow.class/instance/path.st | 4 ---- .../instance/reference.st | 4 ---- .../instance/squotDiffAgainst.with..st | 6 ------ .../squotDiffAgainst.withBase.with..st | 4 ---- .../instance/squotMaterializeWith..st | 9 -------- .../instance/squotPreferredSerializer.st | 4 ---- .../instance/squotWith.diffFromSequence..st | 4 ---- .../LBGitFileShadow.class/instance/value.st | 4 ---- .../instance/writeTo..st | 4 ---- .../methodProperties.json | 20 ------------------ .../LBGitFileShadow.class/properties.json | 17 --------------- .../instance/diffAgainst..st | 1 + .../methodProperties.json | 2 +- .../instance/reverseDiffAgainstLiveFiles..st | 3 ++- .../methodProperties.json | 2 +- .../LBGitSerializedShadow.class/README.md | 0 .../LBGitSerializedShadow.class/class/of..st | 6 ------ .../instance/content..st | 4 ---- .../instance/content.st | 4 ---- .../methodProperties.json | 6 ------ .../properties.json | 14 ------------- .../LBGitSerializer.class/README.md | 0 .../LBGitSerializer.class/class/initialize.st | 5 ----- .../instance/atPathOf.writeStreamDo..st | 5 ----- .../instance/fillContentOf.from..st | 6 ------ .../LBGitSerializer.class/instance/version.st | 4 ---- .../LBGitSerializer.class/instance/write..st | 4 ---- .../methodProperties.json | 8 ------- .../LBGitSerializer.class/properties.json | 16 -------------- .../instance/captureLazySnapshot.st | 2 -- .../methodProperties.json | 2 +- .../instance/addFile..st | 9 -------- .../instance/gitDirectory.st | 4 ---- .../instance/rootDirectory.st | 5 ----- .../methodProperties.json | 7 ------- .../properties.json | 2 -- 98 files changed, 6 insertions(+), 578 deletions(-) delete mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/README.md delete mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st delete mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitDeserializedShadow.class/properties.json delete mode 100644 LBGitTests.package/LBGitDiff.class/README.md delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/chosenOption.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/left..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/left.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/options.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/right..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/right.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st delete mode 100644 LBGitTests.package/LBGitDiff.class/instance/writeTo..st delete mode 100644 LBGitTests.package/LBGitDiff.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitDiff.class/properties.json delete mode 100644 LBGitTests.package/LBGitFileInfo.class/README.md delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/on.in..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/content..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/path.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/reference.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st delete mode 100644 LBGitTests.package/LBGitFileInfo.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitFileInfo.class/properties.json delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/README.md delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/class/on..st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/on..st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/paths..st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/paths.st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitFileListShadow.class/properties.json delete mode 100644 LBGitTests.package/LBGitFileShadow.class/README.md delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/path.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/reference.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/value.st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st delete mode 100644 LBGitTests.package/LBGitFileShadow.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitFileShadow.class/properties.json delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/README.md delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/class/of..st delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/instance/content..st delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/instance/content.st delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitSerializedShadow.class/properties.json delete mode 100644 LBGitTests.package/LBGitSerializer.class/README.md delete mode 100644 LBGitTests.package/LBGitSerializer.class/class/initialize.st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/version.st delete mode 100644 LBGitTests.package/LBGitSerializer.class/instance/write..st delete mode 100644 LBGitTests.package/LBGitSerializer.class/methodProperties.json delete mode 100644 LBGitTests.package/LBGitSerializer.class/properties.json delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json delete mode 100644 LBGitTests.package/SquotWorkingCopy.extension/properties.json diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/README.md b/LBGitTests.package/LBGitDeserializedShadow.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st b/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st deleted file mode 100644 index 5d0de69aa..000000000 --- a/LBGitTests.package/LBGitDeserializedShadow.class/class/onReference..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -onReference: aFileReference - - ^ self new - gitReference: aFileReference; - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st b/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st deleted file mode 100644 index 05dbfbb34..000000000 --- a/LBGitTests.package/LBGitDeserializedShadow.class/instance/content.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -content - - ^ self gitContent \ No newline at end of file diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json b/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json deleted file mode 100644 index af3c6be75..000000000 --- a/LBGitTests.package/LBGitDeserializedShadow.class/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - "onReference:" : "LB 11/18/2018 13:16" }, - "instance" : { - "content" : "LB 11/18/2018 13:21" } } diff --git a/LBGitTests.package/LBGitDeserializedShadow.class/properties.json b/LBGitTests.package/LBGitDeserializedShadow.class/properties.json deleted file mode 100644 index 803097ba3..000000000 --- a/LBGitTests.package/LBGitDeserializedShadow.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitDeserializedShadow", - "pools" : [ - ], - "super" : "LBGitFileShadow", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitDiff.class/README.md b/LBGitTests.package/LBGitDiff.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st b/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st deleted file mode 100644 index 5a210b635..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/chosenOption.st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -chosenOption - - ^ self isLeftChosen - ifTrue: [self options first] - ifFalse: [self options second] \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st deleted file mode 100644 index 10f6ec245..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/initializeSquotDiffNodes.with..st +++ /dev/null @@ -1,12 +0,0 @@ -Squot-diff-converting -initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder - "Initialize the previously allocated diff nodes in aCollection, using the builder to convert - the diffs of related objects." - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure and you chose to initialize all nodes upon their allocation already, - you may implement this method to do nothing." - aCollection first - title: 'changes' - content: self - children: Array empty. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st b/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st deleted file mode 100644 index ec6574c1b..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/isLeftChosen.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -isLeftChosen - - self flag: #TODO."Later allow to choose which version to take" - ^ true \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left..st b/LBGitTests.package/LBGitDiff.class/instance/left..st deleted file mode 100644 index b701cc139..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/left..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left: anObject - - left := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/left.st b/LBGitTests.package/LBGitDiff.class/instance/left.st deleted file mode 100644 index 7a159c36d..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/left.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left - - ^ left \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st b/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st deleted file mode 100644 index 03901d2fa..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/newSquotDiffNodes.st +++ /dev/null @@ -1,8 +0,0 @@ -Squot-diff-converting -newSquotDiffNodes - "Answer new, uninitialized SquotDiffNodes that will later be initialized - in #initializeSquotDiffNodes:with:" - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure, you may also fully initialize the nodes here already." - ^ Array with: SquotDiffNode new \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/options.st b/LBGitTests.package/LBGitDiff.class/instance/options.st deleted file mode 100644 index 2834ddca1..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/options.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -options - - ^ {self left. self right} \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right..st b/LBGitTests.package/LBGitDiff.class/instance/right..st deleted file mode 100644 index 9e650c91e..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/right..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right: anObject - - right := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/right.st b/LBGitTests.package/LBGitDiff.class/instance/right.st deleted file mode 100644 index 85787af13..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/right.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right - - ^ right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st b/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st deleted file mode 100644 index 6dfbbc0ec..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotAdjustToResemble..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-manipulation -squotAdjustToResemble: aSquotDiffNode - "Answer an object of the same type as me that describes the changes in aSquotDiffNode." - ^ self \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st deleted file mode 100644 index 0796452e3..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotApplyTo.with..st +++ /dev/null @@ -1,5 +0,0 @@ -Squot-diff-patching -squotApplyTo: aShadow with: aPatcher - "Apply my changes to aShadow (the representation of an object in a snapshot) and answer the result." - aShadow content: self chosenOption. - ^ aShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st b/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st deleted file mode 100644 index 8fb1815a5..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotApplyToLoaded.with..st +++ /dev/null @@ -1,5 +0,0 @@ -Squot-diff-patching -squotApplyToLoaded: anObject with: aPatcher - "Modify anObject such that it matches what I model and answer the modified object, even if it was modified in-place." - "Here the fileInfo object is modified" - ^ anObject \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st b/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st deleted file mode 100644 index bb5c5557b..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotChangeAsStringOrText.st +++ /dev/null @@ -1,9 +0,0 @@ -as yet unclassified -squotChangeAsStringOrText - - ^ -'New Value: -', self left, ' - -Old Value: -', self right. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st deleted file mode 100644 index f836d2424..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasChanges.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasChanges - "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self left ~= self right \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st b/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st deleted file mode 100644 index 77972d642..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/squotHasConflicts.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasConflicts - "Answer whether a choice must be made before this can be applied to something." - ^ self squotHasChanges \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st b/LBGitTests.package/LBGitDiff.class/instance/writeTo..st deleted file mode 100644 index f939af043..000000000 --- a/LBGitTests.package/LBGitDiff.class/instance/writeTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -writeTo: aStream - - aStream nextPutAll: self chosenOption. \ No newline at end of file diff --git a/LBGitTests.package/LBGitDiff.class/methodProperties.json b/LBGitTests.package/LBGitDiff.class/methodProperties.json deleted file mode 100644 index f017a3ed4..000000000 --- a/LBGitTests.package/LBGitDiff.class/methodProperties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "chosenOption" : "LB 11/10/2018 14:49", - "initializeSquotDiffNodes:with:" : "LB 11/10/2018 15:05", - "isLeftChosen" : "LB 11/10/2018 14:48", - "left" : "LB 11/10/2018 13:00", - "left:" : "LB 11/14/2018 20:41", - "newSquotDiffNodes" : "LB 11/10/2018 15:05", - "options" : "LB 11/10/2018 14:46", - "right" : "LB 11/10/2018 13:00", - "right:" : "LB 11/10/2018 13:00", - "squotAdjustToResemble:" : "LB 11/10/2018 15:08", - "squotApplyTo:with:" : "LB 11/13/2018 16:52", - "squotApplyToLoaded:with:" : "LB 11/10/2018 14:51", - "squotChangeAsStringOrText" : "LB 11/13/2018 14:47", - "squotHasChanges" : "LB 11/17/2018 12:19", - "squotHasConflicts" : "LB 11/10/2018 13:01", - "writeTo:" : "LB 11/10/2018 15:10" } } diff --git a/LBGitTests.package/LBGitDiff.class/properties.json b/LBGitTests.package/LBGitDiff.class/properties.json deleted file mode 100644 index b2b3d7baf..000000000 --- a/LBGitTests.package/LBGitDiff.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotDiff classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "left", - "right" ], - "name" : "LBGitDiff", - "pools" : [ - ], - "super" : "Object", - "traitcomposition" : "TSquotDiff", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileInfo.class/README.md b/LBGitTests.package/LBGitFileInfo.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st deleted file mode 100644 index 772bb2dab..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/fromGitReference..st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -fromGitReference: aFSReference - - | workingReference path | - workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. - path := ''. - aFSReference path do: [:each | path := path,'/',each]. - path := path copyFrom: 2 to: path size. - ^ self - on: path - in: workingReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/on.in..st b/LBGitTests.package/LBGitFileInfo.class/class/on.in..st deleted file mode 100644 index 62f9bca86..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/on.in..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -on: aString in: aFSReference - - ^ self new - path: aString; - rootDirectory: aFSReference - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st b/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st deleted file mode 100644 index 2435fcf09..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/class/onGitReference..st +++ /dev/null @@ -1,13 +0,0 @@ -as yet unclassified -onGitReference: aFSReference - - | workingReference gitReference path | - workingReference := aFSReference fileSystem repository repository instVarNamed: #reference. - gitReference := aFSReference parent. - path := ''. - aFSReference path do: [:each | path := path,'/',each]. - path := path copyFrom: 2 to: path size. - ^ self - on: path - in: workingReference - git: gitReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st deleted file mode 100644 index c580153ae..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/browseFromSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -browseFromSquot: aSquotLiveObject - - self shouldBeImplemented. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st deleted file mode 100644 index cd2676963..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -captureWithSquot: aCapturer - - ^ aCapturer shadowOf: self ifAbsentPut: [self captureWithSquot] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st b/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st deleted file mode 100644 index 55fa52ae2..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/captureWithSquot.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -captureWithSquot - - "self squotShadowFactory" - ^ LBGitSerializedShadow of: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/content..st b/LBGitTests.package/LBGitFileInfo.class/instance/content..st deleted file mode 100644 index 4fcc4f963..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/content..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -content: aByteArray - - self reference writeStream binary - nextPutAll: aByteArray; - close. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/content.st b/LBGitTests.package/LBGitFileInfo.class/instance/content.st deleted file mode 100644 index e8a6679f8..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/content.st +++ /dev/null @@ -1,8 +0,0 @@ -as yet unclassified -content - - | stream content | - stream := self reference readStream binary. - content := stream contents. - stream close. - ^ content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path..st b/LBGitTests.package/LBGitFileInfo.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/path.st b/LBGitTests.package/LBGitFileInfo.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/reference.st b/LBGitTests.package/LBGitFileInfo.class/instance/reference.st deleted file mode 100644 index 125968d46..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/reference.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -reference - - ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st deleted file mode 100644 index 87a97cde3..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory: anObject - - rootDirectory := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st b/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st deleted file mode 100644 index 5d66c63e9..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ rootDirectory \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st deleted file mode 100644 index 62db22e86..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotAddTransientStoreInfoTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotAddTransientStoreInfoTo: aTrackableObjectMetadata - - self flag: #TODO. "What does it do?" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st deleted file mode 100644 index a0bd9fe44..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotInitializeStoreInfo..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -squotInitializeStoreInfo: aTrackedObjectMetadata - "Initialize metadata about me when stored in an artifact. - Subclasses may override to add additional properties. Do not forget to call super!" - super squotInitializeStoreInfo: aTrackedObjectMetadata. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st b/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st deleted file mode 100644 index de82a5bdc..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotRemoveTransientStoreInfoFrom..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotRemoveTransientStoreInfoFrom: aDictionary - - self flag: #TODO. "What does it do?". \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st deleted file mode 100644 index 92de5ef7e..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotShadowFactory.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShadowFactory - - ^ LBGitFileShadow \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st b/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st deleted file mode 100644 index 921620b77..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/instance/squotShouldKeepIdentity.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotShouldKeepIdentity - - ^ false \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json b/LBGitTests.package/LBGitFileInfo.class/methodProperties.json deleted file mode 100644 index 6a7531677..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/methodProperties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "class" : { - "fromGitReference:" : "LB 11/18/2018 14:02", - "on:in:" : "LB 11/10/2018 15:56", - "onGitReference:" : "LB 11/17/2018 12:19" }, - "instance" : { - "browseFromSquot:" : "LB 11/10/2018 12:00", - "captureWithSquot" : "LB 11/18/2018 13:28", - "captureWithSquot:" : "LB 11/10/2018 12:14", - "content" : "LB 11/18/2018 12:56", - "content:" : "LB 11/18/2018 13:32", - "path" : "LB 11/10/2018 14:18", - "path:" : "LB 11/10/2018 14:18", - "reference" : "LB 11/18/2018 12:35", - "rootDirectory" : "LB 11/10/2018 16:10", - "rootDirectory:" : "LB 11/10/2018 16:10", - "squotAddTransientStoreInfoTo:" : "LB 11/10/2018 12:11", - "squotInitializeStoreInfo:" : "LB 11/18/2018 14:13", - "squotRemoveTransientStoreInfoFrom:" : "LB 11/10/2018 12:29", - "squotShadowFactory" : "LB 11/10/2018 12:18", - "squotShouldKeepIdentity" : "LB 11/14/2018 22:38" } } diff --git a/LBGitTests.package/LBGitFileInfo.class/properties.json b/LBGitTests.package/LBGitFileInfo.class/properties.json deleted file mode 100644 index 6a7d90a58..000000000 --- a/LBGitTests.package/LBGitFileInfo.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "path", - "rootDirectory" ], - "name" : "LBGitFileInfo", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileListShadow.class/README.md b/LBGitTests.package/LBGitFileListShadow.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitFileListShadow.class/class/on..st b/LBGitTests.package/LBGitFileListShadow.class/class/on..st deleted file mode 100644 index 64b0b682d..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/class/on..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -on: aRecordedFilesArtifact - - ^ self new on: aRecordedFilesArtifact \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/content.st b/LBGitTests.package/LBGitFileListShadow.class/instance/content.st deleted file mode 100644 index 84c387103..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/instance/content.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -content - - ^ self paths \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/on..st b/LBGitTests.package/LBGitFileListShadow.class/instance/on..st deleted file mode 100644 index 87e3d6636..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/instance/on..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -on: aRecordedFilesArtifact - - self paths: - (aRecordedFilesArtifact trackedFiles collect: [:each | each -> (LBGitDeserializedShadow onReference: (aRecordedFilesArtifact rootDirectory resolve: each))]) asDictionary \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st b/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st deleted file mode 100644 index 1b211b626..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/instance/paths..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -paths: anObject - - paths := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st b/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st deleted file mode 100644 index 2043ce481..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/instance/paths.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -paths - - ^ paths \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st deleted file mode 100644 index 2b6cf238c..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/instance/squotDiffAgainst.with..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -squotDiffAgainst: otherFileListShadow with: aDiffBuilder - - ^ aDiffBuilder diffFrom: self to: otherFileListShadow - ifNew: [LBGitFileListDiff left: otherFileListShadow content right: self content.] - andInitialize: [:diff | ] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json deleted file mode 100644 index 669cc58b9..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/methodProperties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "class" : { - "on:" : "LB 11/22/2018 10:52" }, - "instance" : { - "content" : "LB 11/22/2018 11:12", - "on:" : "LB 11/22/2018 11:11", - "paths" : "LB 11/22/2018 10:53", - "paths:" : "LB 11/22/2018 10:53", - "squotDiffAgainst:with:" : "LB 11/22/2018 11:13" } } diff --git a/LBGitTests.package/LBGitFileListShadow.class/properties.json b/LBGitTests.package/LBGitFileListShadow.class/properties.json deleted file mode 100644 index a9bd0a299..000000000 --- a/LBGitTests.package/LBGitFileListShadow.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "paths" ], - "name" : "LBGitFileListShadow", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitFileShadow.class/README.md b/LBGitTests.package/LBGitFileShadow.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content..st b/LBGitTests.package/LBGitFileShadow.class/instance/content..st deleted file mode 100644 index bce5a5897..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content..st +++ /dev/null @@ -1,8 +0,0 @@ -as yet unclassified -content: aByteArray - - self shouldNotImplement. - "content := aByteArray." - self reference writeStream binary - nextPutAll: aByteArray; - close. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/content.st b/LBGitTests.package/LBGitFileShadow.class/instance/content.st deleted file mode 100644 index 136658f07..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/content.st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -content - - self shouldNotImplement. - ^ self reference exists - ifTrue: [| stream content | - stream := self reference readStream binary. - content := stream contents. - stream close. - content] - ifFalse: [nil] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st deleted file mode 100644 index 0218dc36f..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileInfo: anObject - - fileInfo := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st b/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st deleted file mode 100644 index af7b2cc6a..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/fileInfo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileInfo - - ^ fileInfo \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st deleted file mode 100644 index c42b2562c..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitContent.st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -gitContent - - | stream content | - ^ self gitReference exists - ifFalse: [nil] - ifTrue: - [stream := self gitReference readStream binary. - content := stream contents. - stream close. - ^ content] diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st deleted file mode 100644 index 86d6a2622..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitReference: anObject - - gitReference := anObject. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st b/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st deleted file mode 100644 index 703f56538..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/gitReference.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitReference - - ^ gitReference \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/path.st b/LBGitTests.package/LBGitFileShadow.class/instance/path.st deleted file mode 100644 index e87044962..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ self fileInfo path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st b/LBGitTests.package/LBGitFileShadow.class/instance/reference.st deleted file mode 100644 index 36d9c87bc..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/reference.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -reference - - ^ self rootDirectory resolve: self path \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st deleted file mode 100644 index 3ab6a3224..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.with..st +++ /dev/null @@ -1,6 +0,0 @@ -Squot-shadow-diffing -squotDiffAgainst: otherShadow with: aDiffBuilder - "Answer an object that describes the differences between me and otherContent." - ^ aDiffBuilder diffFrom: self to: otherShadow - ifNew: [LBGitDiff new left: otherShadow content; right: self content.] - andInitialize: [:diff | "Do nothing for now diff diff: self against: otherShadow with: aDiffBuilder"] \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st deleted file mode 100644 index ab99dee99..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotDiffAgainst.withBase.with..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-shadow-diffing -squotDiffAgainst: otherShadow withBase: baseShadow with: aDiffBuilder - "Answer an object that describes the merge between me and otherContent based on baseContent." - ^ self squotDiffAgainst: otherShadow with: aDiffBuilder \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st deleted file mode 100644 index 60353849c..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotMaterializeWith..st +++ /dev/null @@ -1,9 +0,0 @@ -Squot-shadow -squotMaterializeWith: aMaterializer - "Answer the object restored from me. Double dispatch path" - | fileInfo | - self halt: 'Please write me to a file'. - fileInfo := LBGitFileInfo fromGitReference: self gitReference. - fileInfo content: self content. - ^ fileInfo - "^ aMaterializer materialize: self in: self fileInfo" \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st b/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st deleted file mode 100644 index dfaee424a..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotPreferredSerializer.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-shadow -squotPreferredSerializer - - ^ LBGitSerializer \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st b/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st deleted file mode 100644 index cb274bde7..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/squotWith.diffFromSequence..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -squotWith: aDiffBuilder diffFromSequence: leftSequence - - ^ LBGitDiff new left: leftSequence; right: self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/value.st b/LBGitTests.package/LBGitFileShadow.class/instance/value.st deleted file mode 100644 index 323347cb2..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/value.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -value - - ^ self content \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st b/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st deleted file mode 100644 index 8a52179f0..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/instance/writeTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -writeTo: aStream - - aStream nextPutAll: self content. \ No newline at end of file diff --git a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json b/LBGitTests.package/LBGitFileShadow.class/methodProperties.json deleted file mode 100644 index a6663b265..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/methodProperties.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "content" : "LB 11/18/2018 13:20", - "content:" : "LB 11/18/2018 13:20", - "fileInfo" : "LB 11/10/2018 15:57", - "fileInfo:" : "LB 11/10/2018 15:57", - "gitContent" : "LB 11/22/2018 11:24", - "gitReference" : "LB 11/18/2018 12:22", - "gitReference:" : "LB 11/18/2018 12:22", - "path" : "LB 11/10/2018 15:57", - "reference" : "LB 11/10/2018 16:10", - "squotDiffAgainst:with:" : "LB 11/18/2018 13:31", - "squotDiffAgainst:withBase:with:" : "LB 11/10/2018 13:07", - "squotMaterializeWith:" : "LB 11/18/2018 14:04", - "squotPreferredSerializer" : "LB 11/10/2018 13:41", - "squotWith:diffFromSequence:" : "LB 11/10/2018 13:26", - "value" : "LB 11/10/2018 13:09", - "writeTo:" : "LB 11/18/2018 14:27" } } diff --git a/LBGitTests.package/LBGitFileShadow.class/properties.json b/LBGitTests.package/LBGitFileShadow.class/properties.json deleted file mode 100644 index 5a572a717..000000000 --- a/LBGitTests.package/LBGitFileShadow.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotDiffableShadow classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "fileInfo", - "gitReference" ], - "name" : "LBGitFileShadow", - "pools" : [ - ], - "super" : "Object", - "traitcomposition" : "TSquotDiffableShadow", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st index a921c4a28..fad3b8ff8 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st @@ -1,5 +1,6 @@ diffing diffAgainst: otherFilesArtifact + "This can happen when you checkout" self isThisEverCalled: 'A live artifact appeared on the right(wrong) side'. ^ otherFilesArtifact reverseDiffAgainstLiveFiles: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json index 3fcd032bb..6fb9e42c7 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "allFiles" : "LB 11/25/2018 17:19", "collectTrackedFiles" : "LB 11/26/2018 16:06", - "diffAgainst:" : "LB 11/25/2018 14:10", + "diffAgainst:" : "LB 11/26/2018 16:13", "initializeOn:" : "LB 11/25/2018 14:43", "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st index 914d52359..ceafad9e2 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -1,4 +1,5 @@ diffing reverseDiffAgainstLiveFiles: otherFilesArtifact - ^ self halt \ No newline at end of file + otherFilesArtifact initializeOn: self. + ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json index ec9000550..0b56eb9b6 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -7,5 +7,5 @@ "commit" : "LB 11/20/2018 16:28", "diffAgainst:" : "LB 11/25/2018 14:06", "printOn:" : "LB 11/25/2018 13:44", - "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:09", + "reverseDiffAgainstLiveFiles:" : "LB 11/26/2018 16:15", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08" } } diff --git a/LBGitTests.package/LBGitSerializedShadow.class/README.md b/LBGitTests.package/LBGitSerializedShadow.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitSerializedShadow.class/class/of..st b/LBGitTests.package/LBGitSerializedShadow.class/class/of..st deleted file mode 100644 index c66acd120..000000000 --- a/LBGitTests.package/LBGitSerializedShadow.class/class/of..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -of: aFileInfo - - ^ self new - fileInfo: aFileInfo; - yourself \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st b/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st deleted file mode 100644 index 8e0c5f695..000000000 --- a/LBGitTests.package/LBGitSerializedShadow.class/instance/content..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -content: aByteArray - - ^ self fileInfo content: aByteArray \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st b/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st deleted file mode 100644 index 94e439df1..000000000 --- a/LBGitTests.package/LBGitSerializedShadow.class/instance/content.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -content - - ^ self fileInfo content \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json b/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json deleted file mode 100644 index ab32c7f9f..000000000 --- a/LBGitTests.package/LBGitSerializedShadow.class/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - "of:" : "LB 11/18/2018 13:16" }, - "instance" : { - "content" : "LB 11/18/2018 13:21", - "content:" : "LB 11/18/2018 13:33" } } diff --git a/LBGitTests.package/LBGitSerializedShadow.class/properties.json b/LBGitTests.package/LBGitSerializedShadow.class/properties.json deleted file mode 100644 index 899e97538..000000000 --- a/LBGitTests.package/LBGitSerializedShadow.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitSerializedShadow", - "pools" : [ - ], - "super" : "LBGitFileShadow", - "type" : "normal" } diff --git a/LBGitTests.package/LBGitSerializer.class/README.md b/LBGitTests.package/LBGitSerializer.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGitTests.package/LBGitSerializer.class/class/initialize.st b/LBGitTests.package/LBGitSerializer.class/class/initialize.st deleted file mode 100644 index b2b1676d0..000000000 --- a/LBGitTests.package/LBGitSerializer.class/class/initialize.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -initialize - - super initialize. - SquotFileSystemStore addDeserializerFactory: LBGitSerializer. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st b/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st deleted file mode 100644 index 6249b87d0..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/atPathOf.writeStreamDo..st +++ /dev/null @@ -1,5 +0,0 @@ -private -atPathOf: anArtifact writeStreamDo: aBlock - - "This writes a file shadow to the git system." - ^ (self rootDirectory resolve: anArtifact path) writeStreamDo: aBlock \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st b/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st deleted file mode 100644 index a24ff2688..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/fillContentOf.from..st +++ /dev/null @@ -1,6 +0,0 @@ -Squot deserialization -fillContentOf: anArtifact from: aFileOrDirectoryReference - - anArtifact content: - (SquotShadowGraph withSingleShadow: - (LBGitDeserializedShadow onReference: aFileOrDirectoryReference)) \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/version.st b/LBGitTests.package/LBGitSerializer.class/instance/version.st deleted file mode 100644 index df9a05a1d..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/version.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot serialization -version - - ^ '1.0.0' \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/instance/write..st b/LBGitTests.package/LBGitSerializer.class/instance/write..st deleted file mode 100644 index 12c2ba55b..000000000 --- a/LBGitTests.package/LBGitSerializer.class/instance/write..st +++ /dev/null @@ -1,4 +0,0 @@ -Squot serialization -write: anArtifact - - self atPathOf: anArtifact writeStreamDo: [:stream | anArtifact shadowOfTrackedObject writeTo: stream]. \ No newline at end of file diff --git a/LBGitTests.package/LBGitSerializer.class/methodProperties.json b/LBGitTests.package/LBGitSerializer.class/methodProperties.json deleted file mode 100644 index 1a90a311a..000000000 --- a/LBGitTests.package/LBGitSerializer.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - "initialize" : "LB 11/12/2018 20:53" }, - "instance" : { - "atPathOf:writeStreamDo:" : "LB 11/17/2018 12:19", - "fillContentOf:from:" : "LB 11/18/2018 13:16", - "version" : "LB 11/10/2018 13:33", - "write:" : "LB 11/10/2018 13:37" } } diff --git a/LBGitTests.package/LBGitSerializer.class/properties.json b/LBGitTests.package/LBGitSerializer.class/properties.json deleted file mode 100644 index b8779549c..000000000 --- a/LBGitTests.package/LBGitSerializer.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "LBGitTests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotCodec classTrait + TSquotSingleFileSerializer classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitSerializer", - "pools" : [ - ], - "super" : "SquotSerializer", - "traitcomposition" : "TSquotCodec + TSquotSingleFileSerializer", - "type" : "normal" } diff --git a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st index 2bf70a25d..66db6af1f 100644 --- a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st +++ b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st @@ -5,12 +5,10 @@ captureLazySnapshot builder := SquotSnapshot builder. addedPaths := Set new. [self artifactReferencesDo: [:each | | lazyArtifact | - self isThisEverCalled: 'A non package file and stuff'. lazyArtifact := self createLazyArtifactForObjectAt: each. builder add: lazyArtifact. addedPaths add: each path]] on: SquotNoTableOfContentsFound doAndPass: [:e | - self isThisEverCalled: 'The package file and stuff'. (self packageDirectoriesIn: directory) collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] thenDo: [:eachArtifact | builder add: eachArtifact. diff --git a/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json b/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json index cf993a715..2d08301a9 100644 --- a/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json +++ b/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "captureLazySnapshot" : "LB 11/20/2018 10:16", + "captureLazySnapshot" : "LB 11/26/2018 16:12", "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st b/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st deleted file mode 100644 index 528d8a78d..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/addFile..st +++ /dev/null @@ -1,9 +0,0 @@ -*LBGitTests -addFile: aString - - | path | - path := aString. self flag: #TODO. "resolve path" - self add: (LBGitFileInfo - on: path - in: self rootDirectory) - at: path. \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st deleted file mode 100644 index 0759acffd..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/gitDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -*LBGitTests -gitDirectory - - ^ self repository gitRepository repository baseDir \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st b/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st deleted file mode 100644 index f87e9b7c0..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/instance/rootDirectory.st +++ /dev/null @@ -1,5 +0,0 @@ -*LBGitTests -rootDirectory - - self flag: #TODO."Find nicer way. Please." - ^ self repository gitRepository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json b/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json deleted file mode 100644 index a1d0b7eba..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "addFile:" : "LB 11/18/2018 12:23", - "gitDirectory" : "LB 11/13/2018 17:06", - "rootDirectory" : "LB 11/12/2018 20:56" } } diff --git a/LBGitTests.package/SquotWorkingCopy.extension/properties.json b/LBGitTests.package/SquotWorkingCopy.extension/properties.json deleted file mode 100644 index b5406e048..000000000 --- a/LBGitTests.package/SquotWorkingCopy.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotWorkingCopy" } From bf28532f1e0c2c4a92c32198bd55e16c865f0287 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 16:20:07 +0100 Subject: [PATCH 083/170] Renamed package --- .squot | 2 +- .../.filetree | 0 .../.squot-contents | 0 .../README.md | 0 .../instance/applyToContainer..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../LBGitFileAddition.class/README.md | 0 .../instance/applyWith..st | 0 .../instance/before.st | 0 .../LBGitFileAddition.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileAddition.class/properties.json | 2 +- .../LBGitFileConflict.class/README.md | 0 .../class/left.right..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../LBGitFileConflict.class/instance/body.st | 0 .../instance/choice.st | 0 .../instance/leftChange..st | 0 .../instance/leftChange.st | 0 .../instance/rightChange..st | 0 .../instance/rightChange.st | 0 .../LBGitFileConflict.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileConflict.class/properties.json | 2 +- .../LBGitFileDiff.class/README.md | 0 .../LBGitFileDiff.class/instance/after.st | 0 .../LBGitFileDiff.class/instance/applyTo..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../LBGitFileDiff.class/instance/before.st | 0 .../LBGitFileDiff.class/instance/body.st | 0 .../instance/mergeWith..st | 0 .../LBGitFileDiff.class/instance/parent..st | 0 .../LBGitFileDiff.class/instance/parent.st | 0 .../LBGitFileDiff.class/instance/path..st | 0 .../LBGitFileDiff.class/instance/path.st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../LBGitFileDiff.class/instance/title.st | 0 .../LBGitFileDiff.class/methodProperties.json | 0 .../LBGitFileDiff.class/properties.json | 2 +- .../LBGitFileListDiff.class/README.md | 0 .../LBGitFileListDiff.class/class/empty.st | 0 .../class/left.right..st | 0 .../instance/added..st | 0 .../LBGitFileListDiff.class/instance/added.st | 0 .../instance/adjustedBy..st | 0 .../instance/applyToContainer..st | 0 .../instance/createDiffs.st | 0 .../instance/createFile..st | 0 .../instance/deleteFile..st | 0 .../instance/diff.against..st | 0 .../instance/diffAdded.st | 0 .../instance/diffAt..st | 0 .../instance/diffModified.st | 0 .../instance/diffPaths.st | 0 .../instance/diffRemoved.st | 0 .../instance/diffs..st | 0 .../LBGitFileListDiff.class/instance/diffs.st | 0 .../instance/gitReferenceOn..st | 0 .../instance/hasChanges.st | 0 .../initializeSquotDiffNodes.with..st | 0 .../instance/isFileModified..st | 0 .../instance/isRemoval.st | 0 .../LBGitFileListDiff.class/instance/left..st | 0 .../LBGitFileListDiff.class/instance/left.st | 0 .../instance/leftReferenceOn..st | 0 .../instance/mergeWith..st | 0 .../instance/mergeWithRemoval..st | 0 .../instance/modified..st | 0 .../instance/modified.st | 0 .../instance/newSquotDiffNodes.st | 0 .../instance/originalOrAddedArtifact.st | 0 .../LBGitFileListDiff.class/instance/path.st | 0 .../instance/removed..st | 0 .../instance/removed.st | 0 .../instance/right..st | 0 .../LBGitFileListDiff.class/instance/right.st | 0 .../instance/rightReferenceOn..st | 0 .../instance/sourceReferenceOn..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../instance/squotHasChanges.st | 0 .../instance/squotHasConflicts.st | 0 .../instance/stayed..st | 0 .../instance/stayed.st | 0 .../instance/target..st | 0 .../instance/target.st | 0 .../instance/targetReferenceOn..st | 0 .../instance/topNodes.st | 0 .../instance/updateFile..st | 0 .../instance/workingDirectory.st | 0 .../instance/workingReferenceOn..st | 0 .../methodProperties.json | 0 .../LBGitFileListDiff.class/properties.json | 2 +- .../LBGitFileMetadata.class/README.md | 0 .../class/onTreeEntry..st | 0 .../instance/contentChangesTo..st | 0 .../instance/contents.st | 0 .../instance/entryHash.st | 0 .../instance/gitChangesTo..st | 0 .../instance/hasChangesTo..st | 0 .../LBGitFileMetadata.class/instance/path..st | 0 .../LBGitFileMetadata.class/instance/path.st | 0 .../instance/treeEntry..st | 0 .../instance/treeEntry.st | 0 .../methodProperties.json | 0 .../LBGitFileMetadata.class/properties.json | 2 +- .../LBGitFileModification.class/README.md | 0 .../instance/applyWith..st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../LBGitFileRemoval.class/README.md | 0 .../LBGitFileRemoval.class/instance/after.st | 0 .../instance/applyWith..st | 0 .../LBGitFileRemoval.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileRemoval.class/properties.json | 2 +- .../LBGitFilesArtifact.class/README.md | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 0 .../instance/diffContentAgainstThatOf..st | 0 .../instance/displayText.st | 0 .../instance/isLoadable.st | 0 .../instance/isSquotFile..st | 0 .../instance/ownerSnapshot..st | 0 .../instance/ownerSnapshot.st | 0 .../LBGitFilesArtifact.class/instance/path.st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../reverseDiffAgainstUnrecordedFiles..st | 0 .../instance/reverseDiffContentAgainst..st | 0 .../instance/rootDirectory..st | 0 .../instance/rootDirectory.st | 0 .../instance/trackedFiles..st | 0 .../instance/trackedFiles.st | 0 .../instance/wantsToBeInTableOfContents.st | 0 .../methodProperties.json | 0 .../LBGitFilesArtifact.class/properties.json | 2 +- .../LBGitLiveFilesArtifact.class/README.md | 0 .../instance/allFiles.st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 0 .../instance/initializeOn..st | 0 .../instance/pathAndMetadataFor..st | 0 .../instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/collectFilesOf..st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/commit.st | 0 .../instance/diffAgainst..st | 0 .../instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../LBGitVoid.class/README.md | 0 .../LBGitVoid.class/instance/^equals.st | 0 .../LBGitVoid.class/instance/content.st | 0 .../LBGitVoid.class/instance/startShadow.st | 0 .../LBGitVoid.class/methodProperties.json | 0 .../LBGitVoid.class/properties.json | 2 +- LBGit.package/monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../properties.json | 0 .../instance/captureLazySnapshot.st | 23 ------------------- .../instance/captureSnapshot.st | 22 ------------------ .../methodProperties.json | 6 ----- .../properties.json | 2 -- .../monticello.meta/categories.st | 1 - 176 files changed, 14 insertions(+), 67 deletions(-) rename {LBGitTests.package => LBGit.package}/.filetree (100%) rename {LBGitTests.package => LBGit.package}/.squot-contents (100%) rename {LBGitTests.package => LBGit.package}/LBGitArtifactReplacementDiff.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitArtifactReplacementDiff.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitArtifactReplacementDiff.class/properties.json (88%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/instance/applyWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/instance/before.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/instance/title.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileAddition.class/properties.json (87%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/class/left.right..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/applyWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/asDiffNode.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/body.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/choice.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/leftChange..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/leftChange.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/rightChange..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/rightChange.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/instance/title.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileConflict.class/properties.json (88%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/after.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/applyTo..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/applyWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/asDiffNode.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/before.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/body.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/mergeWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/parent..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/parent.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/path..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/path.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/instance/title.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileDiff.class/properties.json (87%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/class/empty.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/class/left.right..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/added..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/added.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/adjustedBy..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/applyToContainer..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/createDiffs.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/createFile..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/deleteFile..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diff.against..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffAdded.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffAt..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffModified.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffPaths.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffRemoved.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffs..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/diffs.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/gitReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/hasChanges.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/isFileModified..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/isRemoval.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/left..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/left.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/leftReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/mergeWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/mergeWithRemoval..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/modified..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/modified.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/newSquotDiffNodes.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/path.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/removed..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/removed.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/right..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/right.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/rightReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/sourceReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/squotHasChanges.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/squotHasConflicts.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/stayed..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/stayed.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/target..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/target.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/targetReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/topNodes.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/updateFile..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/workingDirectory.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/instance/workingReferenceOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileListDiff.class/properties.json (92%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/class/onTreeEntry..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/contentChangesTo..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/contents.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/entryHash.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/gitChangesTo..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/hasChangesTo..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/path..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/path.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/treeEntry..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/instance/treeEntry.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileMetadata.class/properties.json (88%) rename {LBGitTests.package => LBGit.package}/LBGitFileModification.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileModification.class/instance/applyWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileModification.class/instance/title.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileModification.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileModification.class/properties.json (87%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/instance/after.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/instance/applyWith..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/instance/title.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFileRemoval.class/properties.json (87%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/displayText.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/isLoadable.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/isSquotFile..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/ownerSnapshot..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/ownerSnapshot.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/path.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/rootDirectory..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/rootDirectory.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/trackedFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/trackedFiles.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitFilesArtifact.class/properties.json (89%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/allFiles.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/initializeOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/printOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitLiveFilesArtifact.class/properties.json (87%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/commit.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/printOn..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitRecordedFilesArtifact.class/properties.json (88%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/README.md (100%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/instance/^equals.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/instance/content.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/instance/startShadow.st (100%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/methodProperties.json (100%) rename {LBGitTests.package => LBGit.package}/LBGitVoid.class/properties.json (86%) create mode 100644 LBGit.package/monticello.meta/categories.st rename {LBGitTests.package => LBGit.package}/monticello.meta/initializers.st (100%) rename {LBGitTests.package => LBGit.package}/properties.json (100%) delete mode 100644 LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st delete mode 100644 LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st delete mode 100644 LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json delete mode 100644 LBGitTests.package/SquotFileSystemStore.extension/properties.json delete mode 100644 LBGitTests.package/monticello.meta/categories.st diff --git a/.squot b/.squot index c664d34d7..7427e36d6 100644 --- a/.squot +++ b/.squot @@ -1,3 +1,3 @@ OrderedDictionary { - 'LBGitTests.package' : #SquotCypressCodeSerializer + 'LBGit.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGitTests.package/.filetree b/LBGit.package/.filetree similarity index 100% rename from LBGitTests.package/.filetree rename to LBGit.package/.filetree diff --git a/LBGitTests.package/.squot-contents b/LBGit.package/.squot-contents similarity index 100% rename from LBGitTests.package/.squot-contents rename to LBGit.package/.squot-contents diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/README.md b/LBGit.package/LBGitArtifactReplacementDiff.class/README.md similarity index 100% rename from LBGitTests.package/LBGitArtifactReplacementDiff.class/README.md rename to LBGit.package/LBGitArtifactReplacementDiff.class/README.md diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st rename to LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGitTests.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitArtifactReplacementDiff.class/methodProperties.json rename to LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json diff --git a/LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json b/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json similarity index 88% rename from LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json rename to LBGit.package/LBGitArtifactReplacementDiff.class/properties.json index a0ec57932..b908cfdbe 100644 --- a/LBGitTests.package/LBGitArtifactReplacementDiff.class/properties.json +++ b/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileAddition.class/README.md b/LBGit.package/LBGitFileAddition.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileAddition.class/README.md rename to LBGit.package/LBGitFileAddition.class/README.md diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st b/LBGit.package/LBGitFileAddition.class/instance/applyWith..st similarity index 100% rename from LBGitTests.package/LBGitFileAddition.class/instance/applyWith..st rename to LBGit.package/LBGitFileAddition.class/instance/applyWith..st diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/before.st b/LBGit.package/LBGitFileAddition.class/instance/before.st similarity index 100% rename from LBGitTests.package/LBGitFileAddition.class/instance/before.st rename to LBGit.package/LBGitFileAddition.class/instance/before.st diff --git a/LBGitTests.package/LBGitFileAddition.class/instance/title.st b/LBGit.package/LBGitFileAddition.class/instance/title.st similarity index 100% rename from LBGitTests.package/LBGitFileAddition.class/instance/title.st rename to LBGit.package/LBGitFileAddition.class/instance/title.st diff --git a/LBGitTests.package/LBGitFileAddition.class/methodProperties.json b/LBGit.package/LBGitFileAddition.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileAddition.class/methodProperties.json rename to LBGit.package/LBGitFileAddition.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileAddition.class/properties.json b/LBGit.package/LBGitFileAddition.class/properties.json similarity index 87% rename from LBGitTests.package/LBGitFileAddition.class/properties.json rename to LBGit.package/LBGitFileAddition.class/properties.json index 9d85ec1f5..02b7d511d 100644 --- a/LBGitTests.package/LBGitFileAddition.class/properties.json +++ b/LBGit.package/LBGitFileAddition.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileConflict.class/README.md b/LBGit.package/LBGitFileConflict.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/README.md rename to LBGit.package/LBGitFileConflict.class/README.md diff --git a/LBGitTests.package/LBGitFileConflict.class/class/left.right..st b/LBGit.package/LBGitFileConflict.class/class/left.right..st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/class/left.right..st rename to LBGit.package/LBGitFileConflict.class/class/left.right..st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st b/LBGit.package/LBGitFileConflict.class/instance/applyWith..st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/applyWith..st rename to LBGit.package/LBGitFileConflict.class/instance/applyWith..st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st b/LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/asDiffNode.st rename to LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/body.st b/LBGit.package/LBGitFileConflict.class/instance/body.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/body.st rename to LBGit.package/LBGitFileConflict.class/instance/body.st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/choice.st b/LBGit.package/LBGitFileConflict.class/instance/choice.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/choice.st rename to LBGit.package/LBGitFileConflict.class/instance/choice.st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st b/LBGit.package/LBGitFileConflict.class/instance/leftChange..st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/leftChange..st rename to LBGit.package/LBGitFileConflict.class/instance/leftChange..st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st b/LBGit.package/LBGitFileConflict.class/instance/leftChange.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/leftChange.st rename to LBGit.package/LBGitFileConflict.class/instance/leftChange.st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st b/LBGit.package/LBGitFileConflict.class/instance/rightChange..st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/rightChange..st rename to LBGit.package/LBGitFileConflict.class/instance/rightChange..st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st b/LBGit.package/LBGitFileConflict.class/instance/rightChange.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/rightChange.st rename to LBGit.package/LBGitFileConflict.class/instance/rightChange.st diff --git a/LBGitTests.package/LBGitFileConflict.class/instance/title.st b/LBGit.package/LBGitFileConflict.class/instance/title.st similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/instance/title.st rename to LBGit.package/LBGitFileConflict.class/instance/title.st diff --git a/LBGitTests.package/LBGitFileConflict.class/methodProperties.json b/LBGit.package/LBGitFileConflict.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileConflict.class/methodProperties.json rename to LBGit.package/LBGitFileConflict.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileConflict.class/properties.json b/LBGit.package/LBGitFileConflict.class/properties.json similarity index 88% rename from LBGitTests.package/LBGitFileConflict.class/properties.json rename to LBGit.package/LBGitFileConflict.class/properties.json index 017c4b331..13d600899 100644 --- a/LBGitTests.package/LBGitFileConflict.class/properties.json +++ b/LBGit.package/LBGitFileConflict.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileDiff.class/README.md b/LBGit.package/LBGitFileDiff.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/README.md rename to LBGit.package/LBGitFileDiff.class/README.md diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/after.st b/LBGit.package/LBGitFileDiff.class/instance/after.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/after.st rename to LBGit.package/LBGitFileDiff.class/instance/after.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st b/LBGit.package/LBGitFileDiff.class/instance/applyTo..st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/applyTo..st rename to LBGit.package/LBGitFileDiff.class/instance/applyTo..st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st b/LBGit.package/LBGitFileDiff.class/instance/applyWith..st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/applyWith..st rename to LBGit.package/LBGitFileDiff.class/instance/applyWith..st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st b/LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/asDiffNode.st rename to LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/before.st b/LBGit.package/LBGitFileDiff.class/instance/before.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/before.st rename to LBGit.package/LBGitFileDiff.class/instance/before.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/body.st b/LBGit.package/LBGitFileDiff.class/instance/body.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/body.st rename to LBGit.package/LBGitFileDiff.class/instance/body.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st b/LBGit.package/LBGitFileDiff.class/instance/mergeWith..st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/mergeWith..st rename to LBGit.package/LBGitFileDiff.class/instance/mergeWith..st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/parent..st b/LBGit.package/LBGitFileDiff.class/instance/parent..st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/parent..st rename to LBGit.package/LBGitFileDiff.class/instance/parent..st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/parent.st b/LBGit.package/LBGitFileDiff.class/instance/parent.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/parent.st rename to LBGit.package/LBGitFileDiff.class/instance/parent.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/path..st b/LBGit.package/LBGitFileDiff.class/instance/path..st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/path..st rename to LBGit.package/LBGitFileDiff.class/instance/path..st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/path.st b/LBGit.package/LBGitFileDiff.class/instance/path.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/path.st rename to LBGit.package/LBGitFileDiff.class/instance/path.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGitTests.package/LBGitFileDiff.class/instance/title.st b/LBGit.package/LBGitFileDiff.class/instance/title.st similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/instance/title.st rename to LBGit.package/LBGitFileDiff.class/instance/title.st diff --git a/LBGitTests.package/LBGitFileDiff.class/methodProperties.json b/LBGit.package/LBGitFileDiff.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileDiff.class/methodProperties.json rename to LBGit.package/LBGitFileDiff.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileDiff.class/properties.json b/LBGit.package/LBGitFileDiff.class/properties.json similarity index 87% rename from LBGitTests.package/LBGitFileDiff.class/properties.json rename to LBGit.package/LBGitFileDiff.class/properties.json index c3cac9066..883ee0eb8 100644 --- a/LBGitTests.package/LBGitFileDiff.class/properties.json +++ b/LBGit.package/LBGitFileDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileListDiff.class/README.md b/LBGit.package/LBGitFileListDiff.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/README.md rename to LBGit.package/LBGitFileListDiff.class/README.md diff --git a/LBGitTests.package/LBGitFileListDiff.class/class/empty.st b/LBGit.package/LBGitFileListDiff.class/class/empty.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/class/empty.st rename to LBGit.package/LBGitFileListDiff.class/class/empty.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/class/left.right..st b/LBGit.package/LBGitFileListDiff.class/class/left.right..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/class/left.right..st rename to LBGit.package/LBGitFileListDiff.class/class/left.right..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/added..st b/LBGit.package/LBGitFileListDiff.class/instance/added..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/added..st rename to LBGit.package/LBGitFileListDiff.class/instance/added..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/added.st b/LBGit.package/LBGitFileListDiff.class/instance/added.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/added.st rename to LBGit.package/LBGitFileListDiff.class/instance/added.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/adjustedBy..st rename to LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/applyToContainer..st rename to LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st b/LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/createDiffs.st rename to LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit.package/LBGitFileListDiff.class/instance/createFile..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/createFile..st rename to LBGit.package/LBGitFileListDiff.class/instance/createFile..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st b/LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/deleteFile..st rename to LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGit.package/LBGitFileListDiff.class/instance/diff.against..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diff.against..st rename to LBGit.package/LBGitFileListDiff.class/instance/diff.against..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st b/LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffAdded.st rename to LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st b/LBGit.package/LBGitFileListDiff.class/instance/diffAt..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffAt..st rename to LBGit.package/LBGitFileListDiff.class/instance/diffAt..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st b/LBGit.package/LBGitFileListDiff.class/instance/diffModified.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffModified.st rename to LBGit.package/LBGitFileListDiff.class/instance/diffModified.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st b/LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffPaths.st rename to LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st b/LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffRemoved.st rename to LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st b/LBGit.package/LBGitFileListDiff.class/instance/diffs..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffs..st rename to LBGit.package/LBGitFileListDiff.class/instance/diffs..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st b/LBGit.package/LBGitFileListDiff.class/instance/diffs.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/diffs.st rename to LBGit.package/LBGitFileListDiff.class/instance/diffs.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/gitReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st b/LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/hasChanges.st rename to LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st rename to LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st b/LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/isFileModified..st rename to LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st b/LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/isRemoval.st rename to LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/left..st b/LBGit.package/LBGitFileListDiff.class/instance/left..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/left..st rename to LBGit.package/LBGitFileListDiff.class/instance/left..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/left.st b/LBGit.package/LBGitFileListDiff.class/instance/left.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/left.st rename to LBGit.package/LBGitFileListDiff.class/instance/left.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/leftReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/mergeWith..st rename to LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st rename to LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/modified..st b/LBGit.package/LBGitFileListDiff.class/instance/modified..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/modified..st rename to LBGit.package/LBGitFileListDiff.class/instance/modified..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/modified.st b/LBGit.package/LBGitFileListDiff.class/instance/modified.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/modified.st rename to LBGit.package/LBGitFileListDiff.class/instance/modified.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st rename to LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st rename to LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/path.st b/LBGit.package/LBGitFileListDiff.class/instance/path.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/path.st rename to LBGit.package/LBGitFileListDiff.class/instance/path.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/removed..st b/LBGit.package/LBGitFileListDiff.class/instance/removed..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/removed..st rename to LBGit.package/LBGitFileListDiff.class/instance/removed..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/removed.st b/LBGit.package/LBGitFileListDiff.class/instance/removed.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/removed.st rename to LBGit.package/LBGitFileListDiff.class/instance/removed.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/right..st b/LBGit.package/LBGitFileListDiff.class/instance/right..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/right..st rename to LBGit.package/LBGitFileListDiff.class/instance/right..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/right.st b/LBGit.package/LBGitFileListDiff.class/instance/right.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/right.st rename to LBGit.package/LBGitFileListDiff.class/instance/right.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/rightReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/squotHasChanges.st rename to LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/squotHasConflicts.st rename to LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st b/LBGit.package/LBGitFileListDiff.class/instance/stayed..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/stayed..st rename to LBGit.package/LBGitFileListDiff.class/instance/stayed..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st b/LBGit.package/LBGitFileListDiff.class/instance/stayed.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/stayed.st rename to LBGit.package/LBGitFileListDiff.class/instance/stayed.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/target..st b/LBGit.package/LBGitFileListDiff.class/instance/target..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/target..st rename to LBGit.package/LBGitFileListDiff.class/instance/target..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/target.st b/LBGit.package/LBGitFileListDiff.class/instance/target.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/target.st rename to LBGit.package/LBGitFileListDiff.class/instance/target.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/targetReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st b/LBGit.package/LBGitFileListDiff.class/instance/topNodes.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/topNodes.st rename to LBGit.package/LBGitFileListDiff.class/instance/topNodes.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st b/LBGit.package/LBGitFileListDiff.class/instance/updateFile..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/updateFile..st rename to LBGit.package/LBGitFileListDiff.class/instance/updateFile..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st b/LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/workingDirectory.st rename to LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st diff --git a/LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/instance/workingReferenceOn..st rename to LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st diff --git a/LBGitTests.package/LBGitFileListDiff.class/methodProperties.json b/LBGit.package/LBGitFileListDiff.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileListDiff.class/methodProperties.json rename to LBGit.package/LBGitFileListDiff.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileListDiff.class/properties.json b/LBGit.package/LBGitFileListDiff.class/properties.json similarity index 92% rename from LBGitTests.package/LBGitFileListDiff.class/properties.json rename to LBGit.package/LBGitFileListDiff.class/properties.json index 4dc3697b9..02fe87e01 100644 --- a/LBGitTests.package/LBGitFileListDiff.class/properties.json +++ b/LBGit.package/LBGitFileListDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classtraitcomposition" : "TSquotDiff classTrait", diff --git a/LBGitTests.package/LBGitFileMetadata.class/README.md b/LBGit.package/LBGitFileMetadata.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/README.md rename to LBGit.package/LBGitFileMetadata.class/README.md diff --git a/LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st b/LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/class/onTreeEntry..st rename to LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/contentChangesTo..st rename to LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/contents.st b/LBGit.package/LBGitFileMetadata.class/instance/contents.st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/contents.st rename to LBGit.package/LBGitFileMetadata.class/instance/contents.st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st b/LBGit.package/LBGitFileMetadata.class/instance/entryHash.st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/entryHash.st rename to LBGit.package/LBGitFileMetadata.class/instance/entryHash.st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/gitChangesTo..st rename to LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/hasChangesTo..st rename to LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/path..st b/LBGit.package/LBGitFileMetadata.class/instance/path..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/path..st rename to LBGit.package/LBGitFileMetadata.class/instance/path..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/path.st b/LBGit.package/LBGitFileMetadata.class/instance/path.st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/path.st rename to LBGit.package/LBGitFileMetadata.class/instance/path.st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st b/LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry..st rename to LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st diff --git a/LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st b/LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/instance/treeEntry.st rename to LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st diff --git a/LBGitTests.package/LBGitFileMetadata.class/methodProperties.json b/LBGit.package/LBGitFileMetadata.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileMetadata.class/methodProperties.json rename to LBGit.package/LBGitFileMetadata.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileMetadata.class/properties.json b/LBGit.package/LBGitFileMetadata.class/properties.json similarity index 88% rename from LBGitTests.package/LBGitFileMetadata.class/properties.json rename to LBGit.package/LBGitFileMetadata.class/properties.json index 4d92d8ab8..2cf47549a 100644 --- a/LBGitTests.package/LBGitFileMetadata.class/properties.json +++ b/LBGit.package/LBGitFileMetadata.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileModification.class/README.md b/LBGit.package/LBGitFileModification.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileModification.class/README.md rename to LBGit.package/LBGitFileModification.class/README.md diff --git a/LBGitTests.package/LBGitFileModification.class/instance/applyWith..st b/LBGit.package/LBGitFileModification.class/instance/applyWith..st similarity index 100% rename from LBGitTests.package/LBGitFileModification.class/instance/applyWith..st rename to LBGit.package/LBGitFileModification.class/instance/applyWith..st diff --git a/LBGitTests.package/LBGitFileModification.class/instance/title.st b/LBGit.package/LBGitFileModification.class/instance/title.st similarity index 100% rename from LBGitTests.package/LBGitFileModification.class/instance/title.st rename to LBGit.package/LBGitFileModification.class/instance/title.st diff --git a/LBGitTests.package/LBGitFileModification.class/methodProperties.json b/LBGit.package/LBGitFileModification.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileModification.class/methodProperties.json rename to LBGit.package/LBGitFileModification.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileModification.class/properties.json b/LBGit.package/LBGitFileModification.class/properties.json similarity index 87% rename from LBGitTests.package/LBGitFileModification.class/properties.json rename to LBGit.package/LBGitFileModification.class/properties.json index 8da073bc0..5af52f707 100644 --- a/LBGitTests.package/LBGitFileModification.class/properties.json +++ b/LBGit.package/LBGitFileModification.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFileRemoval.class/README.md b/LBGit.package/LBGitFileRemoval.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFileRemoval.class/README.md rename to LBGit.package/LBGitFileRemoval.class/README.md diff --git a/LBGitTests.package/LBGitFileRemoval.class/instance/after.st b/LBGit.package/LBGitFileRemoval.class/instance/after.st similarity index 100% rename from LBGitTests.package/LBGitFileRemoval.class/instance/after.st rename to LBGit.package/LBGitFileRemoval.class/instance/after.st diff --git a/LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st b/LBGit.package/LBGitFileRemoval.class/instance/applyWith..st similarity index 100% rename from LBGitTests.package/LBGitFileRemoval.class/instance/applyWith..st rename to LBGit.package/LBGitFileRemoval.class/instance/applyWith..st diff --git a/LBGitTests.package/LBGitFileRemoval.class/instance/title.st b/LBGit.package/LBGitFileRemoval.class/instance/title.st similarity index 100% rename from LBGitTests.package/LBGitFileRemoval.class/instance/title.st rename to LBGit.package/LBGitFileRemoval.class/instance/title.st diff --git a/LBGitTests.package/LBGitFileRemoval.class/methodProperties.json b/LBGit.package/LBGitFileRemoval.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFileRemoval.class/methodProperties.json rename to LBGit.package/LBGitFileRemoval.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFileRemoval.class/properties.json b/LBGit.package/LBGitFileRemoval.class/properties.json similarity index 87% rename from LBGitTests.package/LBGitFileRemoval.class/properties.json rename to LBGit.package/LBGitFileRemoval.class/properties.json index e44384cfa..1ad09ea66 100644 --- a/LBGitTests.package/LBGitFileRemoval.class/properties.json +++ b/LBGit.package/LBGitFileRemoval.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitFilesArtifact.class/README.md b/LBGit.package/LBGitFilesArtifact.class/README.md similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/README.md rename to LBGit.package/LBGitFilesArtifact.class/README.md diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/diffAgainst..st rename to LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st rename to LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/displayText.st b/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/displayText.st rename to LBGit.package/LBGitFilesArtifact.class/instance/displayText.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st b/LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/isLoadable.st rename to LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/isSquotFile..st rename to LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st b/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st rename to LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st b/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st rename to LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/path.st b/LBGit.package/LBGitFilesArtifact.class/instance/path.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/path.st rename to LBGit.package/LBGitFilesArtifact.class/instance/path.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st rename to LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st rename to LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory..st b/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory..st rename to LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory.st b/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/rootDirectory.st rename to LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles..st rename to LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles.st b/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/trackedFiles.st rename to LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st rename to LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st diff --git a/LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitFilesArtifact.class/methodProperties.json rename to LBGit.package/LBGitFilesArtifact.class/methodProperties.json diff --git a/LBGitTests.package/LBGitFilesArtifact.class/properties.json b/LBGit.package/LBGitFilesArtifact.class/properties.json similarity index 89% rename from LBGitTests.package/LBGitFilesArtifact.class/properties.json rename to LBGit.package/LBGitFilesArtifact.class/properties.json index fe8760352..ee3953eb9 100644 --- a/LBGitTests.package/LBGitFilesArtifact.class/properties.json +++ b/LBGit.package/LBGitFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/README.md b/LBGit.package/LBGitLiveFilesArtifact.class/README.md similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/README.md rename to LBGit.package/LBGitLiveFilesArtifact.class/README.md diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/allFiles.st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/printOn..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/methodProperties.json rename to LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json diff --git a/LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json b/LBGit.package/LBGitLiveFilesArtifact.class/properties.json similarity index 87% rename from LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json rename to LBGit.package/LBGitLiveFilesArtifact.class/properties.json index 643cec896..ed761b97f 100644 --- a/LBGitTests.package/LBGitLiveFilesArtifact.class/properties.json +++ b/LBGit.package/LBGitLiveFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/README.md b/LBGit.package/LBGitRecordedFilesArtifact.class/README.md similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/README.md rename to LBGit.package/LBGitRecordedFilesArtifact.class/README.md diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/commit.st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/printOn..st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/methodProperties.json rename to LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json diff --git a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json similarity index 88% rename from LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json rename to LBGit.package/LBGitRecordedFilesArtifact.class/properties.json index 8adc7680d..5cf1ae603 100644 --- a/LBGitTests.package/LBGitRecordedFilesArtifact.class/properties.json +++ b/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGitTests.package/LBGitVoid.class/README.md b/LBGit.package/LBGitVoid.class/README.md similarity index 100% rename from LBGitTests.package/LBGitVoid.class/README.md rename to LBGit.package/LBGitVoid.class/README.md diff --git a/LBGitTests.package/LBGitVoid.class/instance/^equals.st b/LBGit.package/LBGitVoid.class/instance/^equals.st similarity index 100% rename from LBGitTests.package/LBGitVoid.class/instance/^equals.st rename to LBGit.package/LBGitVoid.class/instance/^equals.st diff --git a/LBGitTests.package/LBGitVoid.class/instance/content.st b/LBGit.package/LBGitVoid.class/instance/content.st similarity index 100% rename from LBGitTests.package/LBGitVoid.class/instance/content.st rename to LBGit.package/LBGitVoid.class/instance/content.st diff --git a/LBGitTests.package/LBGitVoid.class/instance/startShadow.st b/LBGit.package/LBGitVoid.class/instance/startShadow.st similarity index 100% rename from LBGitTests.package/LBGitVoid.class/instance/startShadow.st rename to LBGit.package/LBGitVoid.class/instance/startShadow.st diff --git a/LBGitTests.package/LBGitVoid.class/methodProperties.json b/LBGit.package/LBGitVoid.class/methodProperties.json similarity index 100% rename from LBGitTests.package/LBGitVoid.class/methodProperties.json rename to LBGit.package/LBGitVoid.class/methodProperties.json diff --git a/LBGitTests.package/LBGitVoid.class/properties.json b/LBGit.package/LBGitVoid.class/properties.json similarity index 86% rename from LBGitTests.package/LBGitVoid.class/properties.json rename to LBGit.package/LBGitVoid.class/properties.json index 1c16f9e60..dbff5f3da 100644 --- a/LBGitTests.package/LBGitVoid.class/properties.json +++ b/LBGit.package/LBGitVoid.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGitTests", + "category" : "LBGit", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/monticello.meta/categories.st b/LBGit.package/monticello.meta/categories.st new file mode 100644 index 000000000..86c88feb7 --- /dev/null +++ b/LBGit.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #LBGit! diff --git a/LBGitTests.package/monticello.meta/initializers.st b/LBGit.package/monticello.meta/initializers.st similarity index 100% rename from LBGitTests.package/monticello.meta/initializers.st rename to LBGit.package/monticello.meta/initializers.st diff --git a/LBGitTests.package/properties.json b/LBGit.package/properties.json similarity index 100% rename from LBGitTests.package/properties.json rename to LBGit.package/properties.json diff --git a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st deleted file mode 100644 index 66db6af1f..000000000 --- a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st +++ /dev/null @@ -1,23 +0,0 @@ -*LBGitTests -captureLazySnapshot - "read the table of contents and create lazy loading artifacts from the entries" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - [self artifactReferencesDo: [:each | | lazyArtifact | - lazyArtifact := self createLazyArtifactForObjectAt: each. - builder add: lazyArtifact. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st deleted file mode 100644 index e7a967d97..000000000 --- a/LBGitTests.package/SquotFileSystemStore.extension/instance/captureSnapshot.st +++ /dev/null @@ -1,22 +0,0 @@ -*LBGitTests -captureSnapshot - "read files from the filesystem and convert them into SquotArtifacts" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - 'Reading objects from files' displaySequentialProgress: - [[self artifactsDo: [:each | builder add: each. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self restorePackageFrom: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json b/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json deleted file mode 100644 index 2d08301a9..000000000 --- a/LBGitTests.package/SquotFileSystemStore.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "captureLazySnapshot" : "LB 11/26/2018 16:12", - "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGitTests.package/SquotFileSystemStore.extension/properties.json b/LBGitTests.package/SquotFileSystemStore.extension/properties.json deleted file mode 100644 index 053072453..000000000 --- a/LBGitTests.package/SquotFileSystemStore.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotFileSystemStore" } diff --git a/LBGitTests.package/monticello.meta/categories.st b/LBGitTests.package/monticello.meta/categories.st deleted file mode 100644 index 9b204d6b5..000000000 --- a/LBGitTests.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #LBGitTests! From 2008a7bb04eca81f5e54ec8e6d69f5c4b0cf393d Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 16:29:47 +0100 Subject: [PATCH 084/170] Added baseline --- .squot | 1 + BaselineOfLBGit.package/.filetree | 4 ++++ BaselineOfLBGit.package/.squot-contents | 5 +++++ .../BaselineOfLBGit.class/README.md | 0 .../BaselineOfLBGit.class/instance/baseline..st | 8 ++++++++ .../BaselineOfLBGit.class/methodProperties.json | 5 +++++ .../BaselineOfLBGit.class/properties.json | 14 ++++++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 BaselineOfLBGit.package/properties.json | 2 ++ .../instance/displayText.st | 4 +--- .../LBGitFilesArtifact.class/methodProperties.json | 2 +- 12 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 BaselineOfLBGit.package/.filetree create mode 100644 BaselineOfLBGit.package/.squot-contents create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/README.md create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json create mode 100644 BaselineOfLBGit.package/monticello.meta/categories.st create mode 100644 BaselineOfLBGit.package/monticello.meta/initializers.st create mode 100644 BaselineOfLBGit.package/properties.json diff --git a/.squot b/.squot index 7427e36d6..f00a3d17f 100644 --- a/.squot +++ b/.squot @@ -1,3 +1,4 @@ OrderedDictionary { + 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, 'LBGit.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/BaselineOfLBGit.package/.filetree b/BaselineOfLBGit.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/BaselineOfLBGit.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/BaselineOfLBGit.package/.squot-contents b/BaselineOfLBGit.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/BaselineOfLBGit.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md b/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st new file mode 100644 index 000000000..c243b26a7 --- /dev/null +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -0,0 +1,8 @@ +as yet unclassified +baseline: spec + + spec for: #common do: [ + spec + package: 'LBGit'; + group: 'default' with: #('LBGit') + ]. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json new file mode 100644 index 000000000..4e3a347de --- /dev/null +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "baseline:" : "LB 11/26/2018 16:27" } } diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json new file mode 100644 index 000000000..05e9fc2fb --- /dev/null +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "BaselineOfLBGit", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "BaselineOfLBGit", + "pools" : [ + ], + "super" : "BaselineOf", + "type" : "normal" } diff --git a/BaselineOfLBGit.package/monticello.meta/categories.st b/BaselineOfLBGit.package/monticello.meta/categories.st new file mode 100644 index 000000000..86c66b517 --- /dev/null +++ b/BaselineOfLBGit.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #BaselineOfLBGit! diff --git a/BaselineOfLBGit.package/monticello.meta/initializers.st b/BaselineOfLBGit.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/BaselineOfLBGit.package/properties.json b/BaselineOfLBGit.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/BaselineOfLBGit.package/properties.json @@ -0,0 +1,2 @@ +{ + } diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st b/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st index c65e9bc70..3361c3e3b 100644 --- a/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st +++ b/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st @@ -1,6 +1,4 @@ as yet unclassified displayText - ^ 'Recorded files: - example.pdf - beispiel.png' \ No newline at end of file + ^'Recorded files: (', (self trackedFiles keys inject: '' into: [:sum :each | sum, each, ', ']) ,')' \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json index b813ef1f8..1b959baca 100644 --- a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json @@ -5,7 +5,7 @@ "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", - "displayText" : "LB 11/20/2018 15:09", + "displayText" : "LB 11/26/2018 16:25", "isLoadable" : "LB 11/25/2018 13:22", "isSquotFile:" : "LB 11/22/2018 16:43", "ownerSnapshot" : "LB 11/20/2018 15:14", From 8b724fa460f59d1504c028d0671684c264cfba8d Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 16:31:29 +0100 Subject: [PATCH 085/170] Added extension metzhods in squot --- .../instance/captureLazySnapshot.st | 23 +++++++++++++++++++ .../instance/captureSnapshot.st | 22 ++++++++++++++++++ .../methodProperties.json | 6 +++++ .../properties.json | 2 ++ .../instance/artifacts.st | 11 +++++++++ .../methodProperties.json | 5 ++++ .../SquotImageStore.extension/properties.json | 2 ++ 7 files changed, 71 insertions(+) create mode 100644 LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st create mode 100644 LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st create mode 100644 LBGit.package/SquotFileSystemStore.extension/methodProperties.json create mode 100644 LBGit.package/SquotFileSystemStore.extension/properties.json create mode 100644 LBGit.package/SquotImageStore.extension/instance/artifacts.st create mode 100644 LBGit.package/SquotImageStore.extension/methodProperties.json create mode 100644 LBGit.package/SquotImageStore.extension/properties.json diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st new file mode 100644 index 000000000..c729a6333 --- /dev/null +++ b/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st @@ -0,0 +1,23 @@ +*LBGit +captureLazySnapshot + "read the table of contents and create lazy loading artifacts from the entries" + | builder addedPaths unrecordedFiles | + builder := SquotSnapshot builder. + addedPaths := Set new. + [self artifactReferencesDo: [:each | | lazyArtifact | + lazyArtifact := self createLazyArtifactForObjectAt: each. + builder add: lazyArtifact. + addedPaths add: each path]] + on: SquotNoTableOfContentsFound doAndPass: [:e | + (self packageDirectoriesIn: directory) + collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] + thenDo: [:eachArtifact | builder add: eachArtifact. + addedPaths add: eachArtifact path. + e add: eachArtifact]]. + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + rootDirectory: directory; + yourself). + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st new file mode 100644 index 000000000..07fcafe0e --- /dev/null +++ b/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st @@ -0,0 +1,22 @@ +*LBGit +captureSnapshot + "read files from the filesystem and convert them into SquotArtifacts" + | builder addedPaths unrecordedFiles | + builder := SquotSnapshot builder. + addedPaths := Set new. + 'Reading objects from files' displaySequentialProgress: + [[self artifactsDo: [:each | builder add: each. + addedPaths add: each path]] + on: SquotNoTableOfContentsFound doAndPass: [:e | + (self packageDirectoriesIn: directory) + collect: [:eachDirectory | self restorePackageFrom: eachDirectory] + thenDo: [:eachArtifact | builder add: eachArtifact. + addedPaths add: eachArtifact path. + e add: eachArtifact]]]. + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + rootDirectory: directory; + yourself). + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/LBGit.package/SquotFileSystemStore.extension/methodProperties.json b/LBGit.package/SquotFileSystemStore.extension/methodProperties.json new file mode 100644 index 000000000..2d08301a9 --- /dev/null +++ b/LBGit.package/SquotFileSystemStore.extension/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "captureLazySnapshot" : "LB 11/26/2018 16:12", + "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGit.package/SquotFileSystemStore.extension/properties.json b/LBGit.package/SquotFileSystemStore.extension/properties.json new file mode 100644 index 000000000..053072453 --- /dev/null +++ b/LBGit.package/SquotFileSystemStore.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotFileSystemStore" } diff --git a/LBGit.package/SquotImageStore.extension/instance/artifacts.st b/LBGit.package/SquotImageStore.extension/instance/artifacts.st new file mode 100644 index 000000000..e0b88b3b4 --- /dev/null +++ b/LBGit.package/SquotImageStore.extension/instance/artifacts.st @@ -0,0 +1,11 @@ +*LBGit +artifacts + | artifactsDictionary | + artifactsDictionary := Dictionary new. + self objectsWithPathsDo: [:each :path | + artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. + artifactsDictionary at: '' put: + (LBGitLiveFilesArtifact new + ownerSnapshot: self; + yourself). + ^ artifactsDictionary \ No newline at end of file diff --git a/LBGit.package/SquotImageStore.extension/methodProperties.json b/LBGit.package/SquotImageStore.extension/methodProperties.json new file mode 100644 index 000000000..e08277ec7 --- /dev/null +++ b/LBGit.package/SquotImageStore.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "artifacts" : "LB 11/25/2018 14:36" } } diff --git a/LBGit.package/SquotImageStore.extension/properties.json b/LBGit.package/SquotImageStore.extension/properties.json new file mode 100644 index 000000000..76f832df6 --- /dev/null +++ b/LBGit.package/SquotImageStore.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotImageStore" } From 89f94ced6a42117c91b6426207f7f4e65d6f9ca9 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 17:22:20 +0100 Subject: [PATCH 086/170] Removed isthisevercalled --- .../LBGitLiveFilesArtifact.class/instance/diffAgainst..st | 2 +- .../LBGitLiveFilesArtifact.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st index fad3b8ff8..37f456108 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st +++ b/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st @@ -2,5 +2,5 @@ diffing diffAgainst: otherFilesArtifact "This can happen when you checkout" - self isThisEverCalled: 'A live artifact appeared on the right(wrong) side'. + "self isThisEverCalled: 'A live artifact appeared on the right(wrong) side'." ^ otherFilesArtifact reverseDiffAgainstLiveFiles: self \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json index 6fb9e42c7..3d0a594d7 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "allFiles" : "LB 11/25/2018 17:19", "collectTrackedFiles" : "LB 11/26/2018 16:06", - "diffAgainst:" : "LB 11/26/2018 16:13", + "diffAgainst:" : "LB 11/26/2018 17:22", "initializeOn:" : "LB 11/25/2018 14:43", "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", From 82da911427e4e72ad2fc686a161681a09662ec6e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 17:51:11 +0100 Subject: [PATCH 087/170] Removed void class --- LBGit.package/LBGitVoid.class/README.md | 0 LBGit.package/LBGitVoid.class/instance/^equals.st | 4 ---- LBGit.package/LBGitVoid.class/instance/content.st | 4 ---- .../LBGitVoid.class/instance/startShadow.st | 4 ---- .../LBGitVoid.class/methodProperties.json | 7 ------- LBGit.package/LBGitVoid.class/properties.json | 14 -------------- 6 files changed, 33 deletions(-) delete mode 100644 LBGit.package/LBGitVoid.class/README.md delete mode 100644 LBGit.package/LBGitVoid.class/instance/^equals.st delete mode 100644 LBGit.package/LBGitVoid.class/instance/content.st delete mode 100644 LBGit.package/LBGitVoid.class/instance/startShadow.st delete mode 100644 LBGit.package/LBGitVoid.class/methodProperties.json delete mode 100644 LBGit.package/LBGitVoid.class/properties.json diff --git a/LBGit.package/LBGitVoid.class/README.md b/LBGit.package/LBGitVoid.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitVoid.class/instance/^equals.st b/LBGit.package/LBGitVoid.class/instance/^equals.st deleted file mode 100644 index 79287ebe4..000000000 --- a/LBGit.package/LBGitVoid.class/instance/^equals.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -= anObject - - ^ anObject class = self class \ No newline at end of file diff --git a/LBGit.package/LBGitVoid.class/instance/content.st b/LBGit.package/LBGitVoid.class/instance/content.st deleted file mode 100644 index 7ad598a35..000000000 --- a/LBGit.package/LBGitVoid.class/instance/content.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -content - - ^ self \ No newline at end of file diff --git a/LBGit.package/LBGitVoid.class/instance/startShadow.st b/LBGit.package/LBGitVoid.class/instance/startShadow.st deleted file mode 100644 index 9711320d5..000000000 --- a/LBGit.package/LBGitVoid.class/instance/startShadow.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -startShadow - - ^ self \ No newline at end of file diff --git a/LBGit.package/LBGitVoid.class/methodProperties.json b/LBGit.package/LBGitVoid.class/methodProperties.json deleted file mode 100644 index 656a27e76..000000000 --- a/LBGit.package/LBGitVoid.class/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "=" : "LB 11/20/2018 14:47", - "content" : "LB 11/20/2018 14:45", - "startShadow" : "LB 11/20/2018 14:45" } } diff --git a/LBGit.package/LBGitVoid.class/properties.json b/LBGit.package/LBGitVoid.class/properties.json deleted file mode 100644 index dbff5f3da..000000000 --- a/LBGit.package/LBGitVoid.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitVoid", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } From b1b7f7a7b244af732852eaca74e91eb31ad37c54 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Mon, 26 Nov 2018 18:06:37 +0100 Subject: [PATCH 088/170] Try to allow copy of images --- .../LBGitFileListDiff.class/instance/createFile..st | 10 ++++++++-- .../LBGitFileListDiff.class/methodProperties.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/LBGit.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit.package/LBGitFileListDiff.class/instance/createFile..st index d85c3e94f..6332aed0d 100644 --- a/LBGit.package/LBGitFileListDiff.class/instance/createFile..st +++ b/LBGit.package/LBGitFileListDiff.class/instance/createFile..st @@ -1,9 +1,15 @@ applying createFile: aPath - | sourceReference targetReference | + | sourceReference targetReference inputStream content | sourceReference := self sourceReferenceOn: aPath. sourceReference exists ifFalse: [^ self]. targetReference := self targetReferenceOn: aPath. self flag: #TODO. "Do ensure the file does NOT exist workingReference ensureFile." - sourceReference copyTo: targetReference. \ No newline at end of file + "sourceReference copyTo: targetReference." + inputStream := sourceReference readStream binary. + content := inputStream contents. + inputStream close. + targetReference writeStream binary nextPutAll: content; close. + "targetReference fileSystem copyFrom: inputStream to: targetReference path. + inputStream close." \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/methodProperties.json b/LBGit.package/LBGitFileListDiff.class/methodProperties.json index df9f859c3..7f040069e 100644 --- a/LBGit.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit.package/LBGitFileListDiff.class/methodProperties.json @@ -8,7 +8,7 @@ "adjustedBy:" : "LB 11/26/2018 16:04", "applyToContainer:" : "LB 11/26/2018 16:06", "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 11/25/2018 16:57", + "createFile:" : "LB 11/26/2018 18:05", "deleteFile:" : "LB 11/25/2018 15:55", "diff:against:" : "LB 11/26/2018 16:06", "diffAdded" : "LB 11/23/2018 18:52", From 0dad65096622d46c8da968183ae0870f9e94e7e0 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 27 Nov 2018 13:36:12 +0100 Subject: [PATCH 089/170] Create README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..70ce578d6 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# SmalltalkGitTesting + +```smalltalk +Metacello new + baseline: 'LBGit'; + repository: 'github://LeonBein/SmalltalkGitTesting'; + load. + ``` From d55cd4ee0a7161e6f7f0e5e54bd95b1472f8cd78 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 27 Nov 2018 13:39:19 +0100 Subject: [PATCH 090/170] Changed readne --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 70ce578d6..9a347cd9a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # SmalltalkGitTesting +You can load it by: ```smalltalk Metacello new baseline: 'LBGit'; From ced89eed9eff55b5de17bb089fb2eb3641d72942 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 14:59:21 +0100 Subject: [PATCH 091/170] Added first few tests --- .../methodProperties.json | 2 +- .../instance/allFiles.st | 1 + .../instance/capture.st | 5 ++++ .../instance/initializeOn..st | 2 +- .../instance/storeWith..st | 7 ++++++ .../methodProperties.json | 10 +++++--- .../instance/collectTrackedFiles.st | 1 + .../methodProperties.json | 2 +- .../LBGitRemoteTests.class/README.md | 0 .../instance/commit..st | 6 +++++ .../instance/commitDummyFileAddition.st | 5 ++++ .../instance/createDummyFile.st | 5 ++++ .../instance/deleteDummyFile.st | 5 ++++ .../instance/dummyContents.st | 4 +++ .../instance/dummyContents2.st | 6 +++++ .../instance/dummyFile.st | 4 +++ .../instance/gitReference.st | 4 +++ .../instance/reference..st | 4 +++ .../instance/reference.st | 4 +++ .../LBGitRemoteTests.class/instance/setUp.st | 12 +++++++++ .../instance/tearDown.st | 5 ++++ .../instance/testCommitAddsFile.st | 7 ++++++ .../instance/testCommitAddsFileContent.st | 9 +++++++ .../instance/testCommitDeletesFile.st | 8 ++++++ .../instance/testCommitUpdatesFile.st | 10 ++++++++ .../testInitialTrackedFilesArtifact.st | 5 ++++ .../instance/testWorking.st | 4 +++ .../instance/workingCopy..st | 4 +++ .../instance/workingCopy.st | 4 +++ .../instance/writeToDummyFile..st | 6 +++++ .../methodProperties.json | 25 +++++++++++++++++++ .../LBGitRemoteTests.class/properties.json | 17 +++++++++++++ LBGit.package/monticello.meta/categories.st | 1 + 33 files changed, 187 insertions(+), 7 deletions(-) create mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st create mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st create mode 100644 LBGit.package/LBGitRemoteTests.class/README.md create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/commit..st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/gitReference.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/reference..st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/reference.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/setUp.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/tearDown.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testWorking.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st create mode 100644 LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st create mode 100644 LBGit.package/LBGitRemoteTests.class/methodProperties.json create mode 100644 LBGit.package/LBGitRemoteTests.class/properties.json diff --git a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json index 1b959baca..36b1a1c9c 100644 --- a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json @@ -16,7 +16,7 @@ "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", - "rootDirectory:" : "LB 11/20/2018 10:17", + "rootDirectory:" : "LB 12/4/2018 14:32", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st index ea128e2a6..f515dee8d 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st +++ b/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st @@ -1,6 +1,7 @@ collecting tracked files allFiles + self flag: #optimize. "Filter out .package and other squot files before" ^ ((self rootDirectory children reject: [:each | each path segments last = '.git']) collect: [:each | each allFiles]) flatten \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st new file mode 100644 index 000000000..d49a74223 --- /dev/null +++ b/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st @@ -0,0 +1,5 @@ +as yet unclassified +capture + + self flag: #TODO "When is this called? what shoudl be done? create all existing files? are there even existing files? + It seems like all work is done in storeWith:" \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st index cda4f4517..11529852a 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st +++ b/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st @@ -1,4 +1,4 @@ as yet unclassified initializeOn: aRecordedFilesArtifact - self rootDirectory: (aRecordedFilesArtifact rootDirectory fileSystem repository repository instVarNamed: #reference). \ No newline at end of file + self rootDirectory: (aRecordedFilesArtifact rootDirectory fileSystem repository repository workingDir). \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st new file mode 100644 index 000000000..1d7225a1f --- /dev/null +++ b/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st @@ -0,0 +1,7 @@ +as yet unclassified +storeWith: anObjectContainer + + "This is called at an artifact creation diff" + | recordedFilesArtifact | + recordedFilesArtifact := anObjectContainer artifacts at: self path. + (recordedFilesArtifact diffAgainst: self) applyToContainer: anObjectContainer. \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json index 3d0a594d7..8119efdcd 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -2,11 +2,13 @@ "class" : { }, "instance" : { - "allFiles" : "LB 11/25/2018 17:19", - "collectTrackedFiles" : "LB 11/26/2018 16:06", + "allFiles" : "LB 12/4/2018 14:53", + "capture" : "LB 12/4/2018 14:58", + "collectTrackedFiles" : "LB 12/4/2018 14:28", "diffAgainst:" : "LB 11/26/2018 17:22", - "initializeOn:" : "LB 11/25/2018 14:43", + "initializeOn:" : "LB 12/4/2018 14:29", "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", - "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06" } } + "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", + "storeWith:" : "LB 12/4/2018 14:58" } } diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st index 32583b8ad..45418fe9d 100644 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -1,6 +1,7 @@ as yet unclassified collectTrackedFiles + self commit ifNil: [^ self trackedFiles: Dictionary new]. self trackedFiles: (self collectFilesOf: self commit tree entries). self trackedFiles keysDo: diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json index 0b56eb9b6..b43f4c16e 100644 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -3,7 +3,7 @@ }, "instance" : { "collectFilesOf:" : "LB 11/25/2018 15:16", - "collectTrackedFiles" : "LB 11/25/2018 17:33", + "collectTrackedFiles" : "LB 12/2/2018 14:23", "commit" : "LB 11/20/2018 16:28", "diffAgainst:" : "LB 11/25/2018 14:06", "printOn:" : "LB 11/25/2018 13:44", diff --git a/LBGit.package/LBGitRemoteTests.class/README.md b/LBGit.package/LBGitRemoteTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commit..st b/LBGit.package/LBGitRemoteTests.class/instance/commit..st new file mode 100644 index 000000000..814ef7bfb --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/commit..st @@ -0,0 +1,6 @@ +as yet unclassified +commit: aString + + self workingCopy + saveNewVersionMessage: aString + interactive: false. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st b/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st new file mode 100644 index 000000000..ede179a5c --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st @@ -0,0 +1,5 @@ +dummy file +commitDummyFileAddition + + self createDummyFile. + self commit: 'Added dummy file'. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st new file mode 100644 index 000000000..e120bbff9 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st @@ -0,0 +1,5 @@ +dummy file +createDummyFile + + self writeToDummyFile: self dummyContents. + \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st new file mode 100644 index 000000000..04c9b1946 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st @@ -0,0 +1,5 @@ +dummy file +deleteDummyFile + + (self reference resolve: self dummyFile) delete. + \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st new file mode 100644 index 000000000..15b675581 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st @@ -0,0 +1,4 @@ +dummy file +dummyContents + + ^ 'Test Data' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st new file mode 100644 index 000000000..dda70a169 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st @@ -0,0 +1,6 @@ +dummy file +dummyContents2 + + ^ 'These are new + contents for the + dummy file' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st new file mode 100644 index 000000000..b16759c6a --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st @@ -0,0 +1,4 @@ +dummy file +dummyFile + + ^ 'dummy.file' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st b/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st new file mode 100644 index 000000000..d038ac7fa --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st @@ -0,0 +1,4 @@ +accessing +gitReference + + ^ self workingCopy repository gitRepository head root \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference..st b/LBGit.package/LBGitRemoteTests.class/instance/reference..st new file mode 100644 index 000000000..8c1e7e098 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/reference..st @@ -0,0 +1,4 @@ +accessing +reference: anObject + + reference := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference.st b/LBGit.package/LBGitRemoteTests.class/instance/reference.st new file mode 100644 index 000000000..50b50b32e --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/reference.st @@ -0,0 +1,4 @@ +accessing +reference + + ^ reference \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/setUp.st b/LBGit.package/LBGitRemoteTests.class/instance/setUp.st new file mode 100644 index 000000000..be64b2012 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/setUp.st @@ -0,0 +1,12 @@ +running +setUp + + super setUp. + self reference: FileSystem memory / 'LBGitTests'. + self reference ensureDirectory. + self workingCopy: SquotWorkingCopy newOnObjectMemory. + self workingCopy + name: 'LBGitTestWorkingCopy'; + store: SquotImageStore new; + repository: (SquitRepository new initializeInDirectory: self reference ); + loadedHistorian: (self workingCopy repository historianNamed: 'master'). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st b/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st new file mode 100644 index 000000000..4c32dac72 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st @@ -0,0 +1,5 @@ +running +tearDown + + super tearDown. + self reference delete. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st new file mode 100644 index 000000000..e79906c93 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st @@ -0,0 +1,7 @@ +tests +testCommitAddsFile + + + self + commitDummyFileAddition; + assert: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st new file mode 100644 index 000000000..d591bb465 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st @@ -0,0 +1,9 @@ +tests +testCommitAddsFileContent + + + self + commitDummyFileAddition. + self + assert: self dummyContents + equals: (self gitReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st new file mode 100644 index 000000000..58eb70f82 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st @@ -0,0 +1,8 @@ +tests +testCommitDeletesFile + + self + commitDummyFileAddition; + deleteDummyFile; + commit: 'Removed dummy file'; + deny: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st new file mode 100644 index 000000000..fa2dc05ee --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st @@ -0,0 +1,10 @@ +tests +testCommitUpdatesFile + + self commitDummyFileAddition. + self writeToDummyFile: self dummyContents2. + self commit: 'Changed dummy file'. + + self + assert: self dummyContents2 + equals: (self gitReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st b/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st new file mode 100644 index 000000000..5420f2323 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st @@ -0,0 +1,5 @@ +tests +testInitialTrackedFilesArtifact + + self assert: + (self workingCopy artifacts anySatisfy: [:each | each isKindOf: LBGitLiveFilesArtifact]). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st b/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st new file mode 100644 index 000000000..725e63cf8 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st @@ -0,0 +1,4 @@ +tests +testWorking + + self assert: true. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st new file mode 100644 index 000000000..240017aef --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st @@ -0,0 +1,4 @@ +accessing +workingCopy: anObject + + workingCopy := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st new file mode 100644 index 000000000..725b545b8 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st @@ -0,0 +1,4 @@ +accessing +workingCopy + + ^ workingCopy \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st b/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st new file mode 100644 index 000000000..81bb1a621 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st @@ -0,0 +1,6 @@ +dummy file +writeToDummyFile: anObject + + (self reference resolve: self dummyFile) writeStream binary + nextPutAll: anObject asByteArray; + close. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/methodProperties.json b/LBGit.package/LBGitRemoteTests.class/methodProperties.json new file mode 100644 index 000000000..754025595 --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/methodProperties.json @@ -0,0 +1,25 @@ +{ + "class" : { + }, + "instance" : { + "commit:" : "LB 12/4/2018 13:43", + "commitDummyFileAddition" : "LB 12/4/2018 13:43", + "createDummyFile" : "LB 12/4/2018 13:49", + "deleteDummyFile" : "LB 12/4/2018 13:38", + "dummyContents" : "LB 12/4/2018 13:47", + "dummyContents2" : "LB 12/4/2018 13:47", + "dummyFile" : "LB 12/2/2018 13:56", + "gitReference" : "LB 12/4/2018 14:10", + "reference" : "LB 12/2/2018 13:40", + "reference:" : "LB 12/2/2018 13:40", + "setUp" : "LB 12/4/2018 14:33", + "tearDown" : "LB 12/2/2018 13:52", + "testCommitAddsFile" : "LB 12/4/2018 13:39", + "testCommitAddsFileContent" : "LB 12/4/2018 14:46", + "testCommitDeletesFile" : "LB 12/4/2018 13:43", + "testCommitUpdatesFile" : "LB 12/4/2018 14:44", + "testInitialTrackedFilesArtifact" : "LB 12/2/2018 13:51", + "testWorking" : "LB 12/2/2018 12:58", + "workingCopy" : "LB 12/2/2018 12:54", + "workingCopy:" : "LB 12/2/2018 12:54", + "writeToDummyFile:" : "LB 12/4/2018 13:49" } } diff --git a/LBGit.package/LBGitRemoteTests.class/properties.json b/LBGit.package/LBGitRemoteTests.class/properties.json new file mode 100644 index 000000000..98f672c7e --- /dev/null +++ b/LBGit.package/LBGitRemoteTests.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "workingCopy", + "reference" ], + "name" : "LBGitRemoteTests", + "pools" : [ + ], + "super" : "TestCase", + "traitcomposition" : "TTestCaseSuppressingProgressDisplay", + "type" : "normal" } diff --git a/LBGit.package/monticello.meta/categories.st b/LBGit.package/monticello.meta/categories.st index 86c88feb7..657baf2c2 100644 --- a/LBGit.package/monticello.meta/categories.st +++ b/LBGit.package/monticello.meta/categories.st @@ -1 +1,2 @@ +SystemOrganization addCategory: #'LBGit-Tests'! SystemOrganization addCategory: #LBGit! From f9219519d1100cca21616d54c74a7608cbd1604a Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 4 Dec 2018 15:04:25 +0100 Subject: [PATCH 092/170] Create .smalltalk.ston --- .smalltalk.ston | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .smalltalk.ston diff --git a/.smalltalk.ston b/.smalltalk.ston new file mode 100644 index 000000000..e05e4f553 --- /dev/null +++ b/.smalltalk.ston @@ -0,0 +1,16 @@ +SmalltalkCISpec { + #loading : [ + SCIMetacelloLoadSpec { + #baseline : 'LBGit', + #platforms : [ #squeak ], + #directory : 'packages', + #load : [ 'tests' ] + } + ], + + #testing: { + #coverage: { + #packages: [ 'LBGit' ] + } + } +} From e1d40b1e01d6b5d95e4a348f055467f220759d85 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:05:56 +0100 Subject: [PATCH 093/170] Added tests to baseline --- .../BaselineOfLBGit.class/instance/baseline..st | 4 +++- .../BaselineOfLBGit.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index c243b26a7..30210adaa 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -4,5 +4,7 @@ baseline: spec spec for: #common do: [ spec package: 'LBGit'; - group: 'default' with: #('LBGit') + package: 'LBGit-Tests' with: [spec requires: #('LBGit')]; + group: 'default' with: #('LBGit'); + group: 'tests' with: #('LBGit-Tests') ]. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index 4e3a347de..bf7d3b2e4 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "baseline:" : "LB 11/26/2018 16:27" } } + "baseline:" : "LB 12/4/2018 15:05" } } From 0fc55c561b34ff380b99276cb94866c2c71e2b2d Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 4 Dec 2018 15:08:09 +0100 Subject: [PATCH 094/170] Create .travis.yml --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..976360f75 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: smalltalk +sudo: false + +os: + - linux + - osx + +smalltalk: + - Squeak-5.0 + - Squeak-5.1 + - Squeak-5.2 + - Squeak-trunk From 9a913bf70f3f748e380bfffd966d4f51f5444c06 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 4 Dec 2018 15:11:53 +0100 Subject: [PATCH 095/170] Update .smalltalk.ston --- .smalltalk.ston | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.smalltalk.ston b/.smalltalk.ston index e05e4f553..8c1b12de9 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -3,7 +3,7 @@ SmalltalkCISpec { SCIMetacelloLoadSpec { #baseline : 'LBGit', #platforms : [ #squeak ], - #directory : 'packages', + #directory : '', #load : [ 'tests' ] } ], From 3a5f511cbeef1465fc1e3cdb7b97c46ab8935ce1 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:20:31 +0100 Subject: [PATCH 096/170] Fixed package structure --- .squot | 3 ++- .../instance/baseline..st | 6 ++--- .../methodProperties.json | 2 +- .../.filetree | 0 .../.squot-contents | 0 .../README.md | 0 .../instance/applyToContainer..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../LBGitFileAddition.class/README.md | 0 .../instance/applyWith..st | 0 .../instance/before.st | 0 .../LBGitFileAddition.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileAddition.class/properties.json | 2 +- .../LBGitFileConflict.class/README.md | 0 .../class/left.right..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../LBGitFileConflict.class/instance/body.st | 0 .../instance/choice.st | 0 .../instance/leftChange..st | 0 .../instance/leftChange.st | 0 .../instance/rightChange..st | 0 .../instance/rightChange.st | 0 .../LBGitFileConflict.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileConflict.class/properties.json | 2 +- .../LBGitFileDiff.class/README.md | 0 .../LBGitFileDiff.class/instance/after.st | 0 .../LBGitFileDiff.class/instance/applyTo..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../LBGitFileDiff.class/instance/before.st | 0 .../LBGitFileDiff.class/instance/body.st | 0 .../instance/mergeWith..st | 0 .../LBGitFileDiff.class/instance/parent..st | 0 .../LBGitFileDiff.class/instance/parent.st | 0 .../LBGitFileDiff.class/instance/path..st | 0 .../LBGitFileDiff.class/instance/path.st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../LBGitFileDiff.class/instance/title.st | 0 .../LBGitFileDiff.class/methodProperties.json | 0 .../LBGitFileDiff.class/properties.json | 2 +- .../LBGitFileListDiff.class/README.md | 0 .../LBGitFileListDiff.class/class/empty.st | 0 .../class/left.right..st | 0 .../instance/added..st | 0 .../LBGitFileListDiff.class/instance/added.st | 0 .../instance/adjustedBy..st | 0 .../instance/applyToContainer..st | 0 .../instance/createDiffs.st | 0 .../instance/createFile..st | 0 .../instance/deleteFile..st | 0 .../instance/diff.against..st | 0 .../instance/diffAdded.st | 0 .../instance/diffAt..st | 0 .../instance/diffModified.st | 0 .../instance/diffPaths.st | 0 .../instance/diffRemoved.st | 0 .../instance/diffs..st | 0 .../LBGitFileListDiff.class/instance/diffs.st | 0 .../instance/gitReferenceOn..st | 0 .../instance/hasChanges.st | 0 .../initializeSquotDiffNodes.with..st | 0 .../instance/isFileModified..st | 0 .../instance/isRemoval.st | 0 .../LBGitFileListDiff.class/instance/left..st | 0 .../LBGitFileListDiff.class/instance/left.st | 0 .../instance/leftReferenceOn..st | 0 .../instance/mergeWith..st | 0 .../instance/mergeWithRemoval..st | 0 .../instance/modified..st | 0 .../instance/modified.st | 0 .../instance/newSquotDiffNodes.st | 0 .../instance/originalOrAddedArtifact.st | 0 .../LBGitFileListDiff.class/instance/path.st | 0 .../instance/removed..st | 0 .../instance/removed.st | 0 .../instance/right..st | 0 .../LBGitFileListDiff.class/instance/right.st | 0 .../instance/rightReferenceOn..st | 0 .../instance/sourceReferenceOn..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../instance/squotHasChanges.st | 0 .../instance/squotHasConflicts.st | 0 .../instance/stayed..st | 0 .../instance/stayed.st | 0 .../instance/target..st | 0 .../instance/target.st | 0 .../instance/targetReferenceOn..st | 0 .../instance/topNodes.st | 0 .../instance/updateFile..st | 0 .../instance/workingDirectory.st | 0 .../instance/workingReferenceOn..st | 0 .../methodProperties.json | 0 .../LBGitFileListDiff.class/properties.json | 2 +- .../LBGitFileMetadata.class/README.md | 0 .../class/onTreeEntry..st | 0 .../instance/contentChangesTo..st | 0 .../instance/contents.st | 0 .../instance/entryHash.st | 0 .../instance/gitChangesTo..st | 0 .../instance/hasChangesTo..st | 0 .../LBGitFileMetadata.class/instance/path..st | 0 .../LBGitFileMetadata.class/instance/path.st | 0 .../instance/treeEntry..st | 0 .../instance/treeEntry.st | 0 .../methodProperties.json | 0 .../LBGitFileMetadata.class/properties.json | 2 +- .../LBGitFileModification.class/README.md | 0 .../instance/applyWith..st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../LBGitFileRemoval.class/README.md | 0 .../LBGitFileRemoval.class/instance/after.st | 0 .../instance/applyWith..st | 0 .../LBGitFileRemoval.class/instance/title.st | 0 .../methodProperties.json | 0 .../LBGitFileRemoval.class/properties.json | 2 +- .../LBGitFilesArtifact.class/README.md | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 0 .../instance/diffContentAgainstThatOf..st | 0 .../instance/displayText.st | 0 .../instance/isLoadable.st | 0 .../instance/isSquotFile..st | 0 .../instance/ownerSnapshot..st | 0 .../instance/ownerSnapshot.st | 0 .../LBGitFilesArtifact.class/instance/path.st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../reverseDiffAgainstUnrecordedFiles..st | 0 .../instance/reverseDiffContentAgainst..st | 0 .../instance/rootDirectory..st | 0 .../instance/rootDirectory.st | 0 .../instance/trackedFiles..st | 0 .../instance/trackedFiles.st | 0 .../instance/wantsToBeInTableOfContents.st | 0 .../methodProperties.json | 0 .../LBGitFilesArtifact.class/properties.json | 2 +- .../LBGitLiveFilesArtifact.class/README.md | 0 .../instance/allFiles.st | 0 .../instance/capture.st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 0 .../instance/initializeOn..st | 0 .../instance/pathAndMetadataFor..st | 0 .../instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../instance/storeWith..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/collectFilesOf..st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/commit.st | 0 .../instance/diffAgainst..st | 0 .../instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../reverseDiffAgainstRecordedFiles..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../properties.json | 0 LBGit-Tests.package/.filetree | 4 ++++ LBGit-Tests.package/.squot-contents | 5 ++++ .../LBGitRemoteTests.class/README.md | 0 .../instance/commit..st | 0 .../instance/commitDummyFileAddition.st | 0 .../instance/createDummyFile.st | 0 .../instance/deleteDummyFile.st | 0 .../instance/dummyContents.st | 0 .../instance/dummyContents2.st | 0 .../instance/dummyFile.st | 0 .../instance/gitReference.st | 0 .../instance/reference..st | 0 .../instance/reference.st | 0 .../LBGitRemoteTests.class/instance/setUp.st | 0 .../instance/tearDown.st | 0 .../instance/testCommitAddsFile.st | 0 .../instance/testCommitAddsFileContent.st | 0 .../instance/testCommitDeletesFile.st | 0 .../instance/testCommitUpdatesFile.st | 0 .../testInitialTrackedFilesArtifact.st | 0 .../instance/testWorking.st | 0 .../instance/workingCopy..st | 0 .../instance/workingCopy.st | 0 .../instance/writeToDummyFile..st | 0 .../methodProperties.json | 0 .../LBGitRemoteTests.class/properties.json | 0 .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 LBGit-Tests.package/properties.json | 2 ++ .../instance/captureLazySnapshot.st | 23 ------------------- .../instance/captureSnapshot.st | 22 ------------------ .../methodProperties.json | 6 ----- .../properties.json | 2 -- .../instance/artifacts.st | 11 --------- .../methodProperties.json | 5 ---- .../SquotImageStore.extension/properties.json | 2 -- 205 files changed, 29 insertions(+), 88 deletions(-) rename {LBGit.package => LBGit-Core.package}/.filetree (100%) rename {LBGit.package => LBGit-Core.package}/.squot-contents (100%) rename {LBGit.package => LBGit-Core.package}/LBGitArtifactReplacementDiff.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitArtifactReplacementDiff.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitArtifactReplacementDiff.class/properties.json (88%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/instance/applyWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/instance/before.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/instance/title.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileAddition.class/properties.json (87%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/class/left.right..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/applyWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/asDiffNode.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/body.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/choice.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/leftChange..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/leftChange.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/rightChange..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/rightChange.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/instance/title.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileConflict.class/properties.json (88%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/after.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/applyTo..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/applyWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/asDiffNode.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/before.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/body.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/mergeWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/parent..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/parent.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/path..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/path.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/instance/title.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileDiff.class/properties.json (87%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/class/empty.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/class/left.right..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/added..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/added.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/adjustedBy..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/applyToContainer..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/createDiffs.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/createFile..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/deleteFile..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diff.against..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffAdded.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffAt..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffModified.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffPaths.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffRemoved.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffs..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/diffs.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/gitReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/hasChanges.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/isFileModified..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/isRemoval.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/left..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/left.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/leftReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/mergeWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/mergeWithRemoval..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/modified..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/modified.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/newSquotDiffNodes.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/path.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/removed..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/removed.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/right..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/right.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/rightReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/sourceReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/squotHasChanges.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/squotHasConflicts.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/stayed..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/stayed.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/target..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/target.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/targetReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/topNodes.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/updateFile..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/workingDirectory.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/instance/workingReferenceOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileListDiff.class/properties.json (92%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/class/onTreeEntry..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/contentChangesTo..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/contents.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/entryHash.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/gitChangesTo..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/hasChangesTo..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/path..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/path.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/treeEntry..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/instance/treeEntry.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileMetadata.class/properties.json (88%) rename {LBGit.package => LBGit-Core.package}/LBGitFileModification.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileModification.class/instance/applyWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileModification.class/instance/title.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileModification.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileModification.class/properties.json (87%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/instance/after.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/instance/applyWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/instance/title.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFileRemoval.class/properties.json (87%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/displayText.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/isLoadable.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/isSquotFile..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/ownerSnapshot..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/ownerSnapshot.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/path.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/rootDirectory..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/rootDirectory.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/trackedFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/trackedFiles.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitFilesArtifact.class/properties.json (89%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/allFiles.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/capture.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/initializeOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/printOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/storeWith..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitLiveFilesArtifact.class/properties.json (87%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/README.md (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/commit.st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/printOn..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Core.package}/LBGitRecordedFilesArtifact.class/properties.json (88%) create mode 100644 LBGit-Core.package/monticello.meta/categories.st rename {LBGit.package => LBGit-Core.package}/monticello.meta/initializers.st (100%) rename {LBGit.package => LBGit-Core.package}/properties.json (100%) create mode 100644 LBGit-Tests.package/.filetree create mode 100644 LBGit-Tests.package/.squot-contents rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/README.md (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/commit..st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/commitDummyFileAddition.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/createDummyFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/deleteDummyFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/dummyContents.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/dummyContents2.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/dummyFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/gitReference.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/reference..st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/reference.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUp.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/tearDown.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testCommitAddsFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testCommitDeletesFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/testWorking.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/workingCopy..st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/workingCopy.st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/instance/writeToDummyFile..st (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/methodProperties.json (100%) rename {LBGit.package => LBGit-Tests.package}/LBGitRemoteTests.class/properties.json (100%) rename {LBGit.package => LBGit-Tests.package}/monticello.meta/categories.st (54%) create mode 100644 LBGit-Tests.package/monticello.meta/initializers.st create mode 100644 LBGit-Tests.package/properties.json delete mode 100644 LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st delete mode 100644 LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st delete mode 100644 LBGit.package/SquotFileSystemStore.extension/methodProperties.json delete mode 100644 LBGit.package/SquotFileSystemStore.extension/properties.json delete mode 100644 LBGit.package/SquotImageStore.extension/instance/artifacts.st delete mode 100644 LBGit.package/SquotImageStore.extension/methodProperties.json delete mode 100644 LBGit.package/SquotImageStore.extension/properties.json diff --git a/.squot b/.squot index f00a3d17f..8eb89a91f 100644 --- a/.squot +++ b/.squot @@ -1,4 +1,5 @@ OrderedDictionary { 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, - 'LBGit.package' : #SquotCypressCodeSerializer + 'LBGit-Core.package' : #SquotCypressCodeSerializer, + 'LBGit-Tests.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index 30210adaa..5207b09e9 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -3,8 +3,8 @@ baseline: spec spec for: #common do: [ spec - package: 'LBGit'; - package: 'LBGit-Tests' with: [spec requires: #('LBGit')]; - group: 'default' with: #('LBGit'); + package: 'LBGit-Core'; + package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; + group: 'default' with: #('LBGit-Core'); group: 'tests' with: #('LBGit-Tests') ]. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index bf7d3b2e4..c90ac2d4c 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,4 +2,4 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:05" } } + "baseline:" : "LB 12/4/2018 15:19" } } diff --git a/LBGit.package/.filetree b/LBGit-Core.package/.filetree similarity index 100% rename from LBGit.package/.filetree rename to LBGit-Core.package/.filetree diff --git a/LBGit.package/.squot-contents b/LBGit-Core.package/.squot-contents similarity index 100% rename from LBGit.package/.squot-contents rename to LBGit-Core.package/.squot-contents diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/README.md b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md similarity index 100% rename from LBGit.package/LBGitArtifactReplacementDiff.class/README.md rename to LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st rename to LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json rename to LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json similarity index 88% rename from LBGit.package/LBGitArtifactReplacementDiff.class/properties.json rename to LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json index b908cfdbe..d66221955 100644 --- a/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json +++ b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileAddition.class/README.md b/LBGit-Core.package/LBGitFileAddition.class/README.md similarity index 100% rename from LBGit.package/LBGitFileAddition.class/README.md rename to LBGit-Core.package/LBGitFileAddition.class/README.md diff --git a/LBGit.package/LBGitFileAddition.class/instance/applyWith..st b/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st similarity index 100% rename from LBGit.package/LBGitFileAddition.class/instance/applyWith..st rename to LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st diff --git a/LBGit.package/LBGitFileAddition.class/instance/before.st b/LBGit-Core.package/LBGitFileAddition.class/instance/before.st similarity index 100% rename from LBGit.package/LBGitFileAddition.class/instance/before.st rename to LBGit-Core.package/LBGitFileAddition.class/instance/before.st diff --git a/LBGit.package/LBGitFileAddition.class/instance/title.st b/LBGit-Core.package/LBGitFileAddition.class/instance/title.st similarity index 100% rename from LBGit.package/LBGitFileAddition.class/instance/title.st rename to LBGit-Core.package/LBGitFileAddition.class/instance/title.st diff --git a/LBGit.package/LBGitFileAddition.class/methodProperties.json b/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileAddition.class/methodProperties.json rename to LBGit-Core.package/LBGitFileAddition.class/methodProperties.json diff --git a/LBGit.package/LBGitFileAddition.class/properties.json b/LBGit-Core.package/LBGitFileAddition.class/properties.json similarity index 87% rename from LBGit.package/LBGitFileAddition.class/properties.json rename to LBGit-Core.package/LBGitFileAddition.class/properties.json index 02b7d511d..52e8b0152 100644 --- a/LBGit.package/LBGitFileAddition.class/properties.json +++ b/LBGit-Core.package/LBGitFileAddition.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileConflict.class/README.md b/LBGit-Core.package/LBGitFileConflict.class/README.md similarity index 100% rename from LBGit.package/LBGitFileConflict.class/README.md rename to LBGit-Core.package/LBGitFileConflict.class/README.md diff --git a/LBGit.package/LBGitFileConflict.class/class/left.right..st b/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/class/left.right..st rename to LBGit-Core.package/LBGitFileConflict.class/class/left.right..st diff --git a/LBGit.package/LBGitFileConflict.class/instance/applyWith..st b/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/applyWith..st rename to LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st diff --git a/LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st b/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st diff --git a/LBGit.package/LBGitFileConflict.class/instance/body.st b/LBGit-Core.package/LBGitFileConflict.class/instance/body.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/body.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/body.st diff --git a/LBGit.package/LBGitFileConflict.class/instance/choice.st b/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/choice.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/choice.st diff --git a/LBGit.package/LBGitFileConflict.class/instance/leftChange..st b/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/leftChange..st rename to LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st diff --git a/LBGit.package/LBGitFileConflict.class/instance/leftChange.st b/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/leftChange.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st diff --git a/LBGit.package/LBGitFileConflict.class/instance/rightChange..st b/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/rightChange..st rename to LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st diff --git a/LBGit.package/LBGitFileConflict.class/instance/rightChange.st b/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/rightChange.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st diff --git a/LBGit.package/LBGitFileConflict.class/instance/title.st b/LBGit-Core.package/LBGitFileConflict.class/instance/title.st similarity index 100% rename from LBGit.package/LBGitFileConflict.class/instance/title.st rename to LBGit-Core.package/LBGitFileConflict.class/instance/title.st diff --git a/LBGit.package/LBGitFileConflict.class/methodProperties.json b/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileConflict.class/methodProperties.json rename to LBGit-Core.package/LBGitFileConflict.class/methodProperties.json diff --git a/LBGit.package/LBGitFileConflict.class/properties.json b/LBGit-Core.package/LBGitFileConflict.class/properties.json similarity index 88% rename from LBGit.package/LBGitFileConflict.class/properties.json rename to LBGit-Core.package/LBGitFileConflict.class/properties.json index 13d600899..b47c3d250 100644 --- a/LBGit.package/LBGitFileConflict.class/properties.json +++ b/LBGit-Core.package/LBGitFileConflict.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileDiff.class/README.md b/LBGit-Core.package/LBGitFileDiff.class/README.md similarity index 100% rename from LBGit.package/LBGitFileDiff.class/README.md rename to LBGit-Core.package/LBGitFileDiff.class/README.md diff --git a/LBGit.package/LBGitFileDiff.class/instance/after.st b/LBGit-Core.package/LBGitFileDiff.class/instance/after.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/after.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/after.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/applyTo..st b/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/applyTo..st rename to LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st diff --git a/LBGit.package/LBGitFileDiff.class/instance/applyWith..st b/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/applyWith..st rename to LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st diff --git a/LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st b/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/before.st b/LBGit-Core.package/LBGitFileDiff.class/instance/before.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/before.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/before.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/body.st b/LBGit-Core.package/LBGitFileDiff.class/instance/body.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/body.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/body.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/mergeWith..st b/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/mergeWith..st rename to LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st diff --git a/LBGit.package/LBGitFileDiff.class/instance/parent..st b/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/parent..st rename to LBGit-Core.package/LBGitFileDiff.class/instance/parent..st diff --git a/LBGit.package/LBGitFileDiff.class/instance/parent.st b/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/parent.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/parent.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/path..st b/LBGit-Core.package/LBGitFileDiff.class/instance/path..st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/path..st rename to LBGit-Core.package/LBGitFileDiff.class/instance/path..st diff --git a/LBGit.package/LBGitFileDiff.class/instance/path.st b/LBGit-Core.package/LBGitFileDiff.class/instance/path.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/path.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/path.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit.package/LBGitFileDiff.class/instance/title.st b/LBGit-Core.package/LBGitFileDiff.class/instance/title.st similarity index 100% rename from LBGit.package/LBGitFileDiff.class/instance/title.st rename to LBGit-Core.package/LBGitFileDiff.class/instance/title.st diff --git a/LBGit.package/LBGitFileDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileDiff.class/methodProperties.json rename to LBGit-Core.package/LBGitFileDiff.class/methodProperties.json diff --git a/LBGit.package/LBGitFileDiff.class/properties.json b/LBGit-Core.package/LBGitFileDiff.class/properties.json similarity index 87% rename from LBGit.package/LBGitFileDiff.class/properties.json rename to LBGit-Core.package/LBGitFileDiff.class/properties.json index 883ee0eb8..92e6cee07 100644 --- a/LBGit.package/LBGitFileDiff.class/properties.json +++ b/LBGit-Core.package/LBGitFileDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileListDiff.class/README.md b/LBGit-Core.package/LBGitFileListDiff.class/README.md similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/README.md rename to LBGit-Core.package/LBGitFileListDiff.class/README.md diff --git a/LBGit.package/LBGitFileListDiff.class/class/empty.st b/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/class/empty.st rename to LBGit-Core.package/LBGitFileListDiff.class/class/empty.st diff --git a/LBGit.package/LBGitFileListDiff.class/class/left.right..st b/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/class/left.right..st rename to LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/added..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/added..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/added..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/added.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/added.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/added.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/createFile..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diff.against..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffAt..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffAt..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffModified.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffModified.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffs..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffs..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffs.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/diffs.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/left..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/left..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/left..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/left.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/left.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/left.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/modified..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/modified..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/modified.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/modified.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/path.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/path.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/path.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/removed..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/removed..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/removed.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/removed.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/right..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/right..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/right..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/right.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/right.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/right.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/stayed..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/stayed..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/stayed.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/stayed.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/target..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/target..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/target..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/target.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/target.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/target.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/topNodes.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/topNodes.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/updateFile..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/updateFile..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st diff --git a/LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st rename to LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st diff --git a/LBGit.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileListDiff.class/methodProperties.json rename to LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json diff --git a/LBGit.package/LBGitFileListDiff.class/properties.json b/LBGit-Core.package/LBGitFileListDiff.class/properties.json similarity index 92% rename from LBGit.package/LBGitFileListDiff.class/properties.json rename to LBGit-Core.package/LBGitFileListDiff.class/properties.json index 02fe87e01..fa91c6ef5 100644 --- a/LBGit.package/LBGitFileListDiff.class/properties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classtraitcomposition" : "TSquotDiff classTrait", diff --git a/LBGit.package/LBGitFileMetadata.class/README.md b/LBGit-Core.package/LBGitFileMetadata.class/README.md similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/README.md rename to LBGit-Core.package/LBGitFileMetadata.class/README.md diff --git a/LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st b/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st rename to LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/contents.st b/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/contents.st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/entryHash.st b/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/entryHash.st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/path..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/path..st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/path..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/path.st b/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/path.st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/path.st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st diff --git a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st b/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st rename to LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st diff --git a/LBGit.package/LBGitFileMetadata.class/methodProperties.json b/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileMetadata.class/methodProperties.json rename to LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json diff --git a/LBGit.package/LBGitFileMetadata.class/properties.json b/LBGit-Core.package/LBGitFileMetadata.class/properties.json similarity index 88% rename from LBGit.package/LBGitFileMetadata.class/properties.json rename to LBGit-Core.package/LBGitFileMetadata.class/properties.json index 2cf47549a..dc6bca314 100644 --- a/LBGit.package/LBGitFileMetadata.class/properties.json +++ b/LBGit-Core.package/LBGitFileMetadata.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileModification.class/README.md b/LBGit-Core.package/LBGitFileModification.class/README.md similarity index 100% rename from LBGit.package/LBGitFileModification.class/README.md rename to LBGit-Core.package/LBGitFileModification.class/README.md diff --git a/LBGit.package/LBGitFileModification.class/instance/applyWith..st b/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st similarity index 100% rename from LBGit.package/LBGitFileModification.class/instance/applyWith..st rename to LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st diff --git a/LBGit.package/LBGitFileModification.class/instance/title.st b/LBGit-Core.package/LBGitFileModification.class/instance/title.st similarity index 100% rename from LBGit.package/LBGitFileModification.class/instance/title.st rename to LBGit-Core.package/LBGitFileModification.class/instance/title.st diff --git a/LBGit.package/LBGitFileModification.class/methodProperties.json b/LBGit-Core.package/LBGitFileModification.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileModification.class/methodProperties.json rename to LBGit-Core.package/LBGitFileModification.class/methodProperties.json diff --git a/LBGit.package/LBGitFileModification.class/properties.json b/LBGit-Core.package/LBGitFileModification.class/properties.json similarity index 87% rename from LBGit.package/LBGitFileModification.class/properties.json rename to LBGit-Core.package/LBGitFileModification.class/properties.json index 5af52f707..cfff3cef3 100644 --- a/LBGit.package/LBGitFileModification.class/properties.json +++ b/LBGit-Core.package/LBGitFileModification.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFileRemoval.class/README.md b/LBGit-Core.package/LBGitFileRemoval.class/README.md similarity index 100% rename from LBGit.package/LBGitFileRemoval.class/README.md rename to LBGit-Core.package/LBGitFileRemoval.class/README.md diff --git a/LBGit.package/LBGitFileRemoval.class/instance/after.st b/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st similarity index 100% rename from LBGit.package/LBGitFileRemoval.class/instance/after.st rename to LBGit-Core.package/LBGitFileRemoval.class/instance/after.st diff --git a/LBGit.package/LBGitFileRemoval.class/instance/applyWith..st b/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st similarity index 100% rename from LBGit.package/LBGitFileRemoval.class/instance/applyWith..st rename to LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st diff --git a/LBGit.package/LBGitFileRemoval.class/instance/title.st b/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st similarity index 100% rename from LBGit.package/LBGitFileRemoval.class/instance/title.st rename to LBGit-Core.package/LBGitFileRemoval.class/instance/title.st diff --git a/LBGit.package/LBGitFileRemoval.class/methodProperties.json b/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFileRemoval.class/methodProperties.json rename to LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json diff --git a/LBGit.package/LBGitFileRemoval.class/properties.json b/LBGit-Core.package/LBGitFileRemoval.class/properties.json similarity index 87% rename from LBGit.package/LBGitFileRemoval.class/properties.json rename to LBGit-Core.package/LBGitFileRemoval.class/properties.json index 1ad09ea66..2134d75c4 100644 --- a/LBGit.package/LBGitFileRemoval.class/properties.json +++ b/LBGit-Core.package/LBGitFileRemoval.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitFilesArtifact.class/README.md b/LBGit-Core.package/LBGitFilesArtifact.class/README.md similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/README.md rename to LBGit-Core.package/LBGitFilesArtifact.class/README.md diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/displayText.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/path.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/path.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st rename to LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st diff --git a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitFilesArtifact.class/methodProperties.json rename to LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json diff --git a/LBGit.package/LBGitFilesArtifact.class/properties.json b/LBGit-Core.package/LBGitFilesArtifact.class/properties.json similarity index 89% rename from LBGit.package/LBGitFilesArtifact.class/properties.json rename to LBGit-Core.package/LBGitFilesArtifact.class/properties.json index ee3953eb9..ad6a96d79 100644 --- a/LBGit.package/LBGitFilesArtifact.class/properties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/README.md b/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/README.md rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/properties.json b/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json similarity index 87% rename from LBGit.package/LBGitLiveFilesArtifact.class/properties.json rename to LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json index ed761b97f..36497e1a2 100644 --- a/LBGit.package/LBGitLiveFilesArtifact.class/properties.json +++ b/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/README.md b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/README.md rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json similarity index 88% rename from LBGit.package/LBGitRecordedFilesArtifact.class/properties.json rename to LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json index 5cf1ae603..87537eba1 100644 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json +++ b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "LBGit", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ diff --git a/LBGit-Core.package/monticello.meta/categories.st b/LBGit-Core.package/monticello.meta/categories.st new file mode 100644 index 000000000..e775e11d9 --- /dev/null +++ b/LBGit-Core.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'LBGit-Core'! diff --git a/LBGit.package/monticello.meta/initializers.st b/LBGit-Core.package/monticello.meta/initializers.st similarity index 100% rename from LBGit.package/monticello.meta/initializers.st rename to LBGit-Core.package/monticello.meta/initializers.st diff --git a/LBGit.package/properties.json b/LBGit-Core.package/properties.json similarity index 100% rename from LBGit.package/properties.json rename to LBGit-Core.package/properties.json diff --git a/LBGit-Tests.package/.filetree b/LBGit-Tests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/LBGit-Tests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/LBGit-Tests.package/.squot-contents b/LBGit-Tests.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/LBGit-Tests.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/README.md b/LBGit-Tests.package/LBGitRemoteTests.class/README.md similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/README.md rename to LBGit-Tests.package/LBGitRemoteTests.class/README.md diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commit..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/commit..st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/commit..st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/commit..st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/createDummyFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/createDummyFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteDummyFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteDummyFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents2.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents2.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/gitReference.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/gitReference.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/gitReference.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/reference..st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/reference..st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/reference..st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/reference.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/reference.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/reference.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/setUp.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/setUp.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/tearDown.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testWorking.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/testWorking.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/testWorking.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy.st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy.st diff --git a/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st rename to LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st diff --git a/LBGit.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/methodProperties.json rename to LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json diff --git a/LBGit.package/LBGitRemoteTests.class/properties.json b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json similarity index 100% rename from LBGit.package/LBGitRemoteTests.class/properties.json rename to LBGit-Tests.package/LBGitRemoteTests.class/properties.json diff --git a/LBGit.package/monticello.meta/categories.st b/LBGit-Tests.package/monticello.meta/categories.st similarity index 54% rename from LBGit.package/monticello.meta/categories.st rename to LBGit-Tests.package/monticello.meta/categories.st index 657baf2c2..267a8c0c2 100644 --- a/LBGit.package/monticello.meta/categories.st +++ b/LBGit-Tests.package/monticello.meta/categories.st @@ -1,2 +1 @@ SystemOrganization addCategory: #'LBGit-Tests'! -SystemOrganization addCategory: #LBGit! diff --git a/LBGit-Tests.package/monticello.meta/initializers.st b/LBGit-Tests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/LBGit-Tests.package/properties.json b/LBGit-Tests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/LBGit-Tests.package/properties.json @@ -0,0 +1,2 @@ +{ + } diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st deleted file mode 100644 index c729a6333..000000000 --- a/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st +++ /dev/null @@ -1,23 +0,0 @@ -*LBGit -captureLazySnapshot - "read the table of contents and create lazy loading artifacts from the entries" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - [self artifactReferencesDo: [:each | | lazyArtifact | - lazyArtifact := self createLazyArtifactForObjectAt: each. - builder add: lazyArtifact. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st deleted file mode 100644 index 07fcafe0e..000000000 --- a/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st +++ /dev/null @@ -1,22 +0,0 @@ -*LBGit -captureSnapshot - "read files from the filesystem and convert them into SquotArtifacts" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - 'Reading objects from files' displaySequentialProgress: - [[self artifactsDo: [:each | builder add: each. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self restorePackageFrom: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGit.package/SquotFileSystemStore.extension/methodProperties.json b/LBGit.package/SquotFileSystemStore.extension/methodProperties.json deleted file mode 100644 index 2d08301a9..000000000 --- a/LBGit.package/SquotFileSystemStore.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "captureLazySnapshot" : "LB 11/26/2018 16:12", - "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGit.package/SquotFileSystemStore.extension/properties.json b/LBGit.package/SquotFileSystemStore.extension/properties.json deleted file mode 100644 index 053072453..000000000 --- a/LBGit.package/SquotFileSystemStore.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotFileSystemStore" } diff --git a/LBGit.package/SquotImageStore.extension/instance/artifacts.st b/LBGit.package/SquotImageStore.extension/instance/artifacts.st deleted file mode 100644 index e0b88b3b4..000000000 --- a/LBGit.package/SquotImageStore.extension/instance/artifacts.st +++ /dev/null @@ -1,11 +0,0 @@ -*LBGit -artifacts - | artifactsDictionary | - artifactsDictionary := Dictionary new. - self objectsWithPathsDo: [:each :path | - artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. - artifactsDictionary at: '' put: - (LBGitLiveFilesArtifact new - ownerSnapshot: self; - yourself). - ^ artifactsDictionary \ No newline at end of file diff --git a/LBGit.package/SquotImageStore.extension/methodProperties.json b/LBGit.package/SquotImageStore.extension/methodProperties.json deleted file mode 100644 index e08277ec7..000000000 --- a/LBGit.package/SquotImageStore.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "artifacts" : "LB 11/25/2018 14:36" } } diff --git a/LBGit.package/SquotImageStore.extension/properties.json b/LBGit.package/SquotImageStore.extension/properties.json deleted file mode 100644 index 76f832df6..000000000 --- a/LBGit.package/SquotImageStore.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotImageStore" } From af565855d15c38a97d8f28bbdd1f1f44567b5804 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:26:33 +0100 Subject: [PATCH 097/170] Added squot installer for 5.2 --- .../BaselineOfLBGit.class/instance/preLoad.st | 4 ++++ .../BaselineOfLBGit.class/methodProperties.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st new file mode 100644 index 000000000..2a562918c --- /dev/null +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st @@ -0,0 +1,4 @@ +as yet unclassified +preLoad + + Installer installGitInfrastructure. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index c90ac2d4c..f0c7a984b 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:19" } } + "baseline:" : "LB 12/4/2018 15:19", + "preLoad" : "LB 12/4/2018 15:26" } } From 97bdd06c1e385c5c0901a41dd14fe93d0a72be6e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:31:10 +0100 Subject: [PATCH 098/170] Added squot as baseline dependency --- .../BaselineOfLBGit.class/instance/baseline..st | 3 ++- .../BaselineOfLBGit.class/instance/preLoad.st | 4 ---- .../BaselineOfLBGit.class/methodProperties.json | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index 5207b09e9..3887243cc 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -3,7 +3,8 @@ baseline: spec spec for: #common do: [ spec - package: 'LBGit-Core'; + baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; + package: 'LBGit-Core' with: [spec requires: #('Squot')]; package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; group: 'default' with: #('LBGit-Core'); group: 'tests' with: #('LBGit-Tests') diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st deleted file mode 100644 index 2a562918c..000000000 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -preLoad - - Installer installGitInfrastructure. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index f0c7a984b..5740819ee 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,5 +2,4 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:19", - "preLoad" : "LB 12/4/2018 15:26" } } + "baseline:" : "LB 12/4/2018 15:30" } } From fd08444109dba8e6fcf17d6673d24f8b54e3b1cc Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:39:52 +0100 Subject: [PATCH 099/170] Setting git stamp on preload --- .../BaselineOfLBGit.class/instance/preLoad.st | 7 +++++++ .../BaselineOfLBGit.class/methodProperties.json | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st new file mode 100644 index 000000000..4927833b6 --- /dev/null +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st @@ -0,0 +1,7 @@ +as yet unclassified +preLoad + + [GitStamp defaultName. + GitStamp defaultEmail] on: GitStampNameRequest do: + [GitStamp defaultName: 'Test User'. + GitStamp defaultEmail: 'test@user.org'.] \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index 5740819ee..e4348dacf 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:30" } } + "baseline:" : "LB 12/4/2018 15:30", + "preLoad" : "LB 12/4/2018 15:39" } } From 1049f061bd396320d4bdc60c149083f2085a0e9b Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:46:08 +0100 Subject: [PATCH 100/170] Added extension and fixed preload --- .squot | 4 +- .../instance/baseline..st | 1 + .../methodProperties.json | 2 +- .../.filetree | 0 .../.squot-contents | 0 .../instance/captureLazySnapshot.st | 2 +- .../instance/captureSnapshot.st | 2 +- .../methodProperties.json | 0 .../properties.json | 0 .../instance/artifacts.st | 2 +- .../methodProperties.json | 0 .../SquotImageStore.extension/properties.json | 0 .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../properties.json | 0 .../README.md | 0 .../instance/applyToContainer..st | 5 -- .../instance/squotChangeAsStringOrText.st | 5 -- .../methodProperties.json | 6 --- .../properties.json | 14 ----- .../LBGitFileAddition.class/README.md | 0 .../instance/applyWith..st | 4 -- .../instance/before.st | 4 -- .../LBGitFileAddition.class/instance/title.st | 4 -- .../methodProperties.json | 7 --- .../LBGitFileAddition.class/properties.json | 14 ----- .../LBGitFileConflict.class/README.md | 0 .../class/left.right..st | 7 --- .../instance/applyWith..st | 4 -- .../instance/asDiffNode.st | 7 --- .../LBGitFileConflict.class/instance/body.st | 11 ---- .../instance/choice.st | 5 -- .../instance/leftChange..st | 4 -- .../instance/leftChange.st | 4 -- .../instance/rightChange..st | 4 -- .../instance/rightChange.st | 4 -- .../LBGitFileConflict.class/instance/title.st | 4 -- .../methodProperties.json | 13 ----- .../LBGitFileConflict.class/properties.json | 15 ------ LBGit.package/LBGitFileDiff.class/README.md | 0 .../LBGitFileDiff.class/instance/after.st | 8 --- .../LBGitFileDiff.class/instance/applyTo..st | 4 -- .../instance/applyWith..st | 4 -- .../instance/asDiffNode.st | 7 --- .../LBGitFileDiff.class/instance/before.st | 8 --- .../LBGitFileDiff.class/instance/body.st | 4 -- .../instance/mergeWith..st | 6 --- .../LBGitFileDiff.class/instance/parent..st | 4 -- .../LBGitFileDiff.class/instance/parent.st | 4 -- .../LBGitFileDiff.class/instance/path..st | 4 -- .../LBGitFileDiff.class/instance/path.st | 4 -- .../instance/squotChangeAsStringOrText.st | 7 --- .../LBGitFileDiff.class/instance/title.st | 4 -- .../LBGitFileDiff.class/methodProperties.json | 17 ------ .../LBGitFileDiff.class/properties.json | 15 ------ .../LBGitFileListDiff.class/README.md | 0 .../LBGitFileListDiff.class/class/empty.st | 5 -- .../class/left.right..st | 6 --- .../instance/added..st | 4 -- .../LBGitFileListDiff.class/instance/added.st | 4 -- .../instance/adjustedBy..st | 5 -- .../instance/applyToContainer..st | 8 --- .../instance/createDiffs.st | 8 --- .../instance/createFile..st | 15 ------ .../instance/deleteFile..st | 7 --- .../instance/diff.against..st | 14 ----- .../instance/diffAdded.st | 9 ---- .../instance/diffAt..st | 6 --- .../instance/diffModified.st | 9 ---- .../instance/diffPaths.st | 4 -- .../instance/diffRemoved.st | 9 ---- .../instance/diffs..st | 4 -- .../LBGitFileListDiff.class/instance/diffs.st | 4 -- .../instance/gitReferenceOn..st | 4 -- .../instance/hasChanges.st | 4 -- .../initializeSquotDiffNodes.with..st | 26 --------- .../instance/isFileModified..st | 4 -- .../instance/isRemoval.st | 4 -- .../LBGitFileListDiff.class/instance/left..st | 4 -- .../LBGitFileListDiff.class/instance/left.st | 4 -- .../instance/leftReferenceOn..st | 4 -- .../instance/mergeWith..st | 13 ----- .../instance/mergeWithRemoval..st | 4 -- .../instance/modified..st | 4 -- .../instance/modified.st | 4 -- .../instance/newSquotDiffNodes.st | 9 ---- .../instance/originalOrAddedArtifact.st | 4 -- .../LBGitFileListDiff.class/instance/path.st | 4 -- .../instance/removed..st | 4 -- .../instance/removed.st | 4 -- .../instance/right..st | 4 -- .../LBGitFileListDiff.class/instance/right.st | 4 -- .../instance/rightReferenceOn..st | 4 -- .../instance/sourceReferenceOn..st | 4 -- .../instance/squotChangeAsStringOrText.st | 5 -- .../instance/squotHasChanges.st | 4 -- .../instance/squotHasConflicts.st | 4 -- .../instance/stayed..st | 4 -- .../instance/stayed.st | 4 -- .../instance/target..st | 4 -- .../instance/target.st | 4 -- .../instance/targetReferenceOn..st | 6 --- .../instance/topNodes.st | 4 -- .../instance/updateFile..st | 7 --- .../instance/workingDirectory.st | 4 -- .../instance/workingReferenceOn..st | 6 --- .../methodProperties.json | 53 ------------------- .../LBGitFileListDiff.class/properties.json | 23 -------- .../LBGitFileMetadata.class/README.md | 0 .../class/onTreeEntry..st | 5 -- .../instance/contentChangesTo..st | 5 -- .../instance/contents.st | 11 ---- .../instance/entryHash.st | 6 --- .../instance/gitChangesTo..st | 5 -- .../instance/hasChangesTo..st | 6 --- .../LBGitFileMetadata.class/instance/path..st | 4 -- .../LBGitFileMetadata.class/instance/path.st | 4 -- .../instance/treeEntry..st | 4 -- .../instance/treeEntry.st | 4 -- .../methodProperties.json | 13 ----- .../LBGitFileMetadata.class/properties.json | 15 ------ .../LBGitFileModification.class/README.md | 0 .../instance/applyWith..st | 4 -- .../instance/title.st | 4 -- .../methodProperties.json | 6 --- .../properties.json | 14 ----- .../LBGitFileRemoval.class/README.md | 0 .../LBGitFileRemoval.class/instance/after.st | 4 -- .../instance/applyWith..st | 4 -- .../LBGitFileRemoval.class/instance/title.st | 4 -- .../methodProperties.json | 7 --- .../LBGitFileRemoval.class/properties.json | 14 ----- .../LBGitFilesArtifact.class/README.md | 0 .../instance/collectTrackedFiles.st | 4 -- .../instance/diffAgainst..st | 4 -- .../instance/diffContentAgainstThatOf..st | 5 -- .../instance/displayText.st | 4 -- .../instance/isLoadable.st | 4 -- .../instance/isSquotFile..st | 6 --- .../instance/ownerSnapshot..st | 4 -- .../instance/ownerSnapshot.st | 4 -- .../LBGitFilesArtifact.class/instance/path.st | 4 -- .../instance/reverseDiffAgainstLiveFiles..st | 4 -- .../reverseDiffAgainstRecordedFiles..st | 4 -- .../reverseDiffAgainstUnrecordedFiles..st | 4 -- .../instance/reverseDiffContentAgainst..st | 11 ---- .../instance/rootDirectory..st | 4 -- .../instance/rootDirectory.st | 4 -- .../instance/trackedFiles..st | 4 -- .../instance/trackedFiles.st | 4 -- .../instance/wantsToBeInTableOfContents.st | 4 -- .../methodProperties.json | 22 -------- .../LBGitFilesArtifact.class/properties.json | 16 ------ .../LBGitLiveFilesArtifact.class/README.md | 0 .../instance/allFiles.st | 7 --- .../instance/capture.st | 5 -- .../instance/collectTrackedFiles.st | 7 --- .../instance/diffAgainst..st | 6 --- .../instance/initializeOn..st | 4 -- .../instance/pathAndMetadataFor..st | 7 --- .../instance/printOn..st | 5 -- .../instance/reverseDiffAgainstLiveFiles..st | 4 -- .../reverseDiffAgainstRecordedFiles..st | 5 -- .../instance/storeWith..st | 7 --- .../methodProperties.json | 14 ----- .../properties.json | 14 ----- .../README.md | 0 .../instance/collectFilesOf..st | 11 ---- .../instance/collectTrackedFiles.st | 8 --- .../instance/commit.st | 4 -- .../instance/diffAgainst..st | 4 -- .../instance/printOn..st | 5 -- .../instance/reverseDiffAgainstLiveFiles..st | 5 -- .../reverseDiffAgainstRecordedFiles..st | 4 -- .../methodProperties.json | 11 ---- .../properties.json | 14 ----- .../LBGitRemoteTests.class/README.md | 0 .../instance/commit..st | 6 --- .../instance/commitDummyFileAddition.st | 5 -- .../instance/createDummyFile.st | 5 -- .../instance/deleteDummyFile.st | 5 -- .../instance/dummyContents.st | 4 -- .../instance/dummyContents2.st | 6 --- .../instance/dummyFile.st | 4 -- .../instance/gitReference.st | 4 -- .../instance/reference..st | 4 -- .../instance/reference.st | 4 -- .../LBGitRemoteTests.class/instance/setUp.st | 12 ----- .../instance/tearDown.st | 5 -- .../instance/testCommitAddsFile.st | 7 --- .../instance/testCommitAddsFileContent.st | 9 ---- .../instance/testCommitDeletesFile.st | 8 --- .../instance/testCommitUpdatesFile.st | 10 ---- .../testInitialTrackedFilesArtifact.st | 5 -- .../instance/testWorking.st | 4 -- .../instance/workingCopy..st | 4 -- .../instance/workingCopy.st | 4 -- .../instance/writeToDummyFile..st | 6 --- .../methodProperties.json | 25 --------- .../LBGitRemoteTests.class/properties.json | 17 ------ LBGit.package/monticello.meta/categories.st | 2 - 201 files changed, 8 insertions(+), 1203 deletions(-) rename {LBGit.package => LBGit-Extensions.package}/.filetree (100%) rename {LBGit.package => LBGit-Extensions.package}/.squot-contents (100%) rename {LBGit.package => LBGit-Extensions.package}/SquotFileSystemStore.extension/instance/captureLazySnapshot.st (97%) rename {LBGit.package => LBGit-Extensions.package}/SquotFileSystemStore.extension/instance/captureSnapshot.st (97%) rename {LBGit.package => LBGit-Extensions.package}/SquotFileSystemStore.extension/methodProperties.json (100%) rename {LBGit.package => LBGit-Extensions.package}/SquotFileSystemStore.extension/properties.json (100%) rename {LBGit.package => LBGit-Extensions.package}/SquotImageStore.extension/instance/artifacts.st (94%) rename {LBGit.package => LBGit-Extensions.package}/SquotImageStore.extension/methodProperties.json (100%) rename {LBGit.package => LBGit-Extensions.package}/SquotImageStore.extension/properties.json (100%) create mode 100644 LBGit-Extensions.package/monticello.meta/categories.st rename {LBGit.package => LBGit-Extensions.package}/monticello.meta/initializers.st (100%) rename {LBGit.package => LBGit-Extensions.package}/properties.json (100%) delete mode 100644 LBGit.package/LBGitArtifactReplacementDiff.class/README.md delete mode 100644 LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st delete mode 100644 LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st delete mode 100644 LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json delete mode 100644 LBGit.package/LBGitArtifactReplacementDiff.class/properties.json delete mode 100644 LBGit.package/LBGitFileAddition.class/README.md delete mode 100644 LBGit.package/LBGitFileAddition.class/instance/applyWith..st delete mode 100644 LBGit.package/LBGitFileAddition.class/instance/before.st delete mode 100644 LBGit.package/LBGitFileAddition.class/instance/title.st delete mode 100644 LBGit.package/LBGitFileAddition.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileAddition.class/properties.json delete mode 100644 LBGit.package/LBGitFileConflict.class/README.md delete mode 100644 LBGit.package/LBGitFileConflict.class/class/left.right..st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/applyWith..st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/body.st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/choice.st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/leftChange..st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/leftChange.st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/rightChange..st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/rightChange.st delete mode 100644 LBGit.package/LBGitFileConflict.class/instance/title.st delete mode 100644 LBGit.package/LBGitFileConflict.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileConflict.class/properties.json delete mode 100644 LBGit.package/LBGitFileDiff.class/README.md delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/after.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/applyTo..st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/applyWith..st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/before.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/body.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/mergeWith..st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/parent..st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/parent.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/path..st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/path.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st delete mode 100644 LBGit.package/LBGitFileDiff.class/instance/title.st delete mode 100644 LBGit.package/LBGitFileDiff.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileDiff.class/properties.json delete mode 100644 LBGit.package/LBGitFileListDiff.class/README.md delete mode 100644 LBGit.package/LBGitFileListDiff.class/class/empty.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/class/left.right..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/added..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/added.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/createFile..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diff.against..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffAt..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffModified.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffs..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/diffs.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/left..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/left.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/modified..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/modified.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/path.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/removed..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/removed.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/right..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/right.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/stayed..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/stayed.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/target..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/target.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/topNodes.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/updateFile..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st delete mode 100644 LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st delete mode 100644 LBGit.package/LBGitFileListDiff.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileListDiff.class/properties.json delete mode 100644 LBGit.package/LBGitFileMetadata.class/README.md delete mode 100644 LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/contents.st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/entryHash.st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/path..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/path.st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st delete mode 100644 LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st delete mode 100644 LBGit.package/LBGitFileMetadata.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileMetadata.class/properties.json delete mode 100644 LBGit.package/LBGitFileModification.class/README.md delete mode 100644 LBGit.package/LBGitFileModification.class/instance/applyWith..st delete mode 100644 LBGit.package/LBGitFileModification.class/instance/title.st delete mode 100644 LBGit.package/LBGitFileModification.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileModification.class/properties.json delete mode 100644 LBGit.package/LBGitFileRemoval.class/README.md delete mode 100644 LBGit.package/LBGitFileRemoval.class/instance/after.st delete mode 100644 LBGit.package/LBGitFileRemoval.class/instance/applyWith..st delete mode 100644 LBGit.package/LBGitFileRemoval.class/instance/title.st delete mode 100644 LBGit.package/LBGitFileRemoval.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFileRemoval.class/properties.json delete mode 100644 LBGit.package/LBGitFilesArtifact.class/README.md delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/displayText.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/path.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st delete mode 100644 LBGit.package/LBGitFilesArtifact.class/methodProperties.json delete mode 100644 LBGit.package/LBGitFilesArtifact.class/properties.json delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/README.md delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json delete mode 100644 LBGit.package/LBGitLiveFilesArtifact.class/properties.json delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/README.md delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json delete mode 100644 LBGit.package/LBGitRecordedFilesArtifact.class/properties.json delete mode 100644 LBGit.package/LBGitRemoteTests.class/README.md delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/commit..st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/gitReference.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/reference..st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/reference.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/setUp.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/tearDown.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/testWorking.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st delete mode 100644 LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st delete mode 100644 LBGit.package/LBGitRemoteTests.class/methodProperties.json delete mode 100644 LBGit.package/LBGitRemoteTests.class/properties.json delete mode 100644 LBGit.package/monticello.meta/categories.st diff --git a/.squot b/.squot index c93a1be54..7853a4487 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,6 @@ OrderedDictionary { 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, 'LBGit-Core.package' : #SquotCypressCodeSerializer, - 'LBGit-Tests.package' : #SquotCypressCodeSerializer, - 'LBGit.package' : #SquotCypressCodeSerializer + 'LBGit-Extensions.package' : #SquotCypressCodeSerializer, + 'LBGit-Tests.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index 3887243cc..41bf2506f 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -3,6 +3,7 @@ baseline: spec spec for: #common do: [ spec + preLoadDoIt: #preLoad; baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; package: 'LBGit-Core' with: [spec requires: #('Squot')]; package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index e4348dacf..3c04cec38 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:30", + "baseline:" : "LB 12/4/2018 15:43", "preLoad" : "LB 12/4/2018 15:39" } } diff --git a/LBGit.package/.filetree b/LBGit-Extensions.package/.filetree similarity index 100% rename from LBGit.package/.filetree rename to LBGit-Extensions.package/.filetree diff --git a/LBGit.package/.squot-contents b/LBGit-Extensions.package/.squot-contents similarity index 100% rename from LBGit.package/.squot-contents rename to LBGit-Extensions.package/.squot-contents diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st similarity index 97% rename from LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st rename to LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st index c729a6333..9c14ae66c 100644 --- a/LBGit.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st +++ b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st @@ -1,4 +1,4 @@ -*LBGit +*LBGit-Extensions captureLazySnapshot "read the table of contents and create lazy loading artifacts from the entries" | builder addedPaths unrecordedFiles | diff --git a/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st similarity index 97% rename from LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st rename to LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st index 07fcafe0e..10fcc86c6 100644 --- a/LBGit.package/SquotFileSystemStore.extension/instance/captureSnapshot.st +++ b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st @@ -1,4 +1,4 @@ -*LBGit +*LBGit-Extensions captureSnapshot "read files from the filesystem and convert them into SquotArtifacts" | builder addedPaths unrecordedFiles | diff --git a/LBGit.package/SquotFileSystemStore.extension/methodProperties.json b/LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json similarity index 100% rename from LBGit.package/SquotFileSystemStore.extension/methodProperties.json rename to LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json diff --git a/LBGit.package/SquotFileSystemStore.extension/properties.json b/LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json similarity index 100% rename from LBGit.package/SquotFileSystemStore.extension/properties.json rename to LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json diff --git a/LBGit.package/SquotImageStore.extension/instance/artifacts.st b/LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st similarity index 94% rename from LBGit.package/SquotImageStore.extension/instance/artifacts.st rename to LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st index e0b88b3b4..83bf347af 100644 --- a/LBGit.package/SquotImageStore.extension/instance/artifacts.st +++ b/LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st @@ -1,4 +1,4 @@ -*LBGit +*LBGit-Extensions artifacts | artifactsDictionary | artifactsDictionary := Dictionary new. diff --git a/LBGit.package/SquotImageStore.extension/methodProperties.json b/LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json similarity index 100% rename from LBGit.package/SquotImageStore.extension/methodProperties.json rename to LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json diff --git a/LBGit.package/SquotImageStore.extension/properties.json b/LBGit-Extensions.package/SquotImageStore.extension/properties.json similarity index 100% rename from LBGit.package/SquotImageStore.extension/properties.json rename to LBGit-Extensions.package/SquotImageStore.extension/properties.json diff --git a/LBGit-Extensions.package/monticello.meta/categories.st b/LBGit-Extensions.package/monticello.meta/categories.st new file mode 100644 index 000000000..36fa4e6e7 --- /dev/null +++ b/LBGit-Extensions.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'LBGit-Extensions'! diff --git a/LBGit.package/monticello.meta/initializers.st b/LBGit-Extensions.package/monticello.meta/initializers.st similarity index 100% rename from LBGit.package/monticello.meta/initializers.st rename to LBGit-Extensions.package/monticello.meta/initializers.st diff --git a/LBGit.package/properties.json b/LBGit-Extensions.package/properties.json similarity index 100% rename from LBGit.package/properties.json rename to LBGit-Extensions.package/properties.json diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/README.md b/LBGit.package/LBGitArtifactReplacementDiff.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st deleted file mode 100644 index a29f3ba94..000000000 --- a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -applyToContainer: anObjectContainer - "right := right capture." - anObjectContainer removeAt: left path. - ^ anObjectContainer add: right \ No newline at end of file diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st deleted file mode 100644 index 6cf1745f8..000000000 --- a/LBGit.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -squotChangeAsStringOrText - - ^ 'Removed: ', right,' - added: ', left. \ No newline at end of file diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json deleted file mode 100644 index ba51bc71f..000000000 --- a/LBGit.package/LBGitArtifactReplacementDiff.class/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "applyToContainer:" : "LB 11/20/2018 15:06", - "squotChangeAsStringOrText" : "LB 11/20/2018 15:04" } } diff --git a/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json b/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json deleted file mode 100644 index d66221955..000000000 --- a/LBGit.package/LBGitArtifactReplacementDiff.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitArtifactReplacementDiff", - "pools" : [ - ], - "super" : "SquotArtifactDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileAddition.class/README.md b/LBGit.package/LBGitFileAddition.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileAddition.class/instance/applyWith..st b/LBGit.package/LBGitFileAddition.class/instance/applyWith..st deleted file mode 100644 index 32f22605a..000000000 --- a/LBGit.package/LBGitFileAddition.class/instance/applyWith..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyWith: aFileListDiff - - aFileListDiff createFile: self path \ No newline at end of file diff --git a/LBGit.package/LBGitFileAddition.class/instance/before.st b/LBGit.package/LBGitFileAddition.class/instance/before.st deleted file mode 100644 index 798927c0e..000000000 --- a/LBGit.package/LBGitFileAddition.class/instance/before.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -before - - ^ String empty \ No newline at end of file diff --git a/LBGit.package/LBGitFileAddition.class/instance/title.st b/LBGit.package/LBGitFileAddition.class/instance/title.st deleted file mode 100644 index 8c14de241..000000000 --- a/LBGit.package/LBGitFileAddition.class/instance/title.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -title - - ^ 'Added: ', self path \ No newline at end of file diff --git a/LBGit.package/LBGitFileAddition.class/methodProperties.json b/LBGit.package/LBGitFileAddition.class/methodProperties.json deleted file mode 100644 index f382b01a4..000000000 --- a/LBGit.package/LBGitFileAddition.class/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "applyWith:" : "LB 11/25/2018 16:39", - "before" : "LB 11/23/2018 18:43", - "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGit.package/LBGitFileAddition.class/properties.json b/LBGit.package/LBGitFileAddition.class/properties.json deleted file mode 100644 index 52e8b0152..000000000 --- a/LBGit.package/LBGitFileAddition.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitFileAddition", - "pools" : [ - ], - "super" : "LBGitFileDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileConflict.class/README.md b/LBGit.package/LBGitFileConflict.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileConflict.class/class/left.right..st b/LBGit.package/LBGitFileConflict.class/class/left.right..st deleted file mode 100644 index 21b179855..000000000 --- a/LBGit.package/LBGitFileConflict.class/class/left.right..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -left: leftFileDiff right: rightFileDiff - - ^ self new - leftChange: leftFileDiff; - rightChange: rightFileDiff; - yourself \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/applyWith..st b/LBGit.package/LBGitFileConflict.class/instance/applyWith..st deleted file mode 100644 index 3b2cd8b73..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/applyWith..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyWith: aFileListDiff - "A conflict cannot be applied" - self choice applyWith: aFileListDiff \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st b/LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st deleted file mode 100644 index 7bdb70de9..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/asDiffNode.st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -asDiffNode - - ^ SquotMergeDiffNode - title: self title - content: self - children: #() \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/body.st b/LBGit.package/LBGitFileConflict.class/instance/body.st deleted file mode 100644 index 4dad0e8d1..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/body.st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -body - - ^ -('Loaded change: ', self leftChange title) asText allBold, ' - -', self leftChange body, ' - -',('Incoming change: ', self rightChange title) asText allBold, ' - -', self rightChange body \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/choice.st b/LBGit.package/LBGitFileConflict.class/instance/choice.st deleted file mode 100644 index 11b5b9b9a..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/choice.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -choice - - self flag: #TODO. - ^ self rightChange \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/leftChange..st b/LBGit.package/LBGitFileConflict.class/instance/leftChange..st deleted file mode 100644 index 7b89be7d5..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/leftChange..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -leftChange: anObject - - leftChange := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/leftChange.st b/LBGit.package/LBGitFileConflict.class/instance/leftChange.st deleted file mode 100644 index e44e107d3..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/leftChange.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -leftChange - - ^ leftChange \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/rightChange..st b/LBGit.package/LBGitFileConflict.class/instance/rightChange..st deleted file mode 100644 index b842b9dee..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/rightChange..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rightChange: anObject - - rightChange := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/rightChange.st b/LBGit.package/LBGitFileConflict.class/instance/rightChange.st deleted file mode 100644 index 4fd62848e..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/rightChange.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rightChange - - ^ rightChange \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/instance/title.st b/LBGit.package/LBGitFileConflict.class/instance/title.st deleted file mode 100644 index ae1128eb8..000000000 --- a/LBGit.package/LBGitFileConflict.class/instance/title.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -title - - ^ 'Conflicting changes for: ', self path \ No newline at end of file diff --git a/LBGit.package/LBGitFileConflict.class/methodProperties.json b/LBGit.package/LBGitFileConflict.class/methodProperties.json deleted file mode 100644 index 47f88cc2c..000000000 --- a/LBGit.package/LBGitFileConflict.class/methodProperties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "class" : { - "left:right:" : "LB 11/25/2018 16:22" }, - "instance" : { - "applyWith:" : "LB 11/25/2018 16:47", - "asDiffNode" : "LB 11/25/2018 16:19", - "body" : "LB 11/25/2018 16:35", - "choice" : "LB 11/25/2018 16:47", - "leftChange" : "LB 11/25/2018 16:22", - "leftChange:" : "LB 11/25/2018 16:22", - "rightChange" : "LB 11/25/2018 16:22", - "rightChange:" : "LB 11/25/2018 16:22", - "title" : "LB 11/25/2018 16:20" } } diff --git a/LBGit.package/LBGitFileConflict.class/properties.json b/LBGit.package/LBGitFileConflict.class/properties.json deleted file mode 100644 index b47c3d250..000000000 --- a/LBGit.package/LBGitFileConflict.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "leftChange", - "rightChange" ], - "name" : "LBGitFileConflict", - "pools" : [ - ], - "super" : "LBGitFileDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileDiff.class/README.md b/LBGit.package/LBGitFileDiff.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileDiff.class/instance/after.st b/LBGit.package/LBGitFileDiff.class/instance/after.st deleted file mode 100644 index 789187889..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/after.st +++ /dev/null @@ -1,8 +0,0 @@ -accessing -after - - | stream content | - stream := (self parent rightReferenceOn: self path) readStream binary. - content := stream contents. - stream close. - ^ content \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/applyTo..st b/LBGit.package/LBGitFileDiff.class/instance/applyTo..st deleted file mode 100644 index 01c58adea..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/applyTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyTo: anObjectContainer - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/applyWith..st b/LBGit.package/LBGitFileDiff.class/instance/applyWith..st deleted file mode 100644 index 67539f7f8..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/applyWith..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyWith: aFileListDiff - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st b/LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st deleted file mode 100644 index 73bc3e36c..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/asDiffNode.st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -asDiffNode - - ^ SquotDiffNode - title: self title - content: self - children: #() \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/before.st b/LBGit.package/LBGitFileDiff.class/instance/before.st deleted file mode 100644 index f5b46c930..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/before.st +++ /dev/null @@ -1,8 +0,0 @@ -accessing -before - - | stream content | - stream := (self parent leftReferenceOn: self path) readStream binary. - content := stream contents. - stream close. - ^ content \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/body.st b/LBGit.package/LBGitFileDiff.class/instance/body.st deleted file mode 100644 index c11e5a467..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/body.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -body - - ^ TextDiffBuilder buildDisplayPatchFrom: self before to: self after \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/mergeWith..st b/LBGit.package/LBGitFileDiff.class/instance/mergeWith..st deleted file mode 100644 index d59ec3e99..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/mergeWith..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -mergeWith: anotherFileDiff - - ^ (LBGitFileConflict left: self right: anotherFileDiff) - path: self path; - yourself \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/parent..st b/LBGit.package/LBGitFileDiff.class/instance/parent..st deleted file mode 100644 index 82076cedf..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/parent..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -parent: aLBGitFileListDiff - - parent := aLBGitFileListDiff. \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/parent.st b/LBGit.package/LBGitFileDiff.class/instance/parent.st deleted file mode 100644 index 5f7789b51..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/parent.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -parent - - ^ parent \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/path..st b/LBGit.package/LBGitFileDiff.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/path.st b/LBGit.package/LBGitFileDiff.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st deleted file mode 100644 index ceb032137..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -squotChangeAsStringOrText - - ^ -self title asText allBold, ' - -', self body \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/instance/title.st b/LBGit.package/LBGitFileDiff.class/instance/title.st deleted file mode 100644 index a05ce996c..000000000 --- a/LBGit.package/LBGitFileDiff.class/instance/title.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -title - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFileDiff.class/methodProperties.json b/LBGit.package/LBGitFileDiff.class/methodProperties.json deleted file mode 100644 index 3db645d3e..000000000 --- a/LBGit.package/LBGitFileDiff.class/methodProperties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "after" : "LB 11/23/2018 18:50", - "applyTo:" : "LB 11/25/2018 16:37", - "applyWith:" : "LB 11/25/2018 16:39", - "asDiffNode" : "LB 11/23/2018 15:14", - "before" : "LB 11/23/2018 18:50", - "body" : "LB 11/23/2018 18:37", - "mergeWith:" : "LB 11/25/2018 16:34", - "parent" : "LB 11/23/2018 18:42", - "parent:" : "LB 11/23/2018 18:42", - "path" : "LB 11/23/2018 18:51", - "path:" : "LB 11/23/2018 18:51", - "squotChangeAsStringOrText" : "LB 11/23/2018 19:03", - "title" : "LB 11/23/2018 18:34" } } diff --git a/LBGit.package/LBGitFileDiff.class/properties.json b/LBGit.package/LBGitFileDiff.class/properties.json deleted file mode 100644 index 92e6cee07..000000000 --- a/LBGit.package/LBGitFileDiff.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "path", - "parent" ], - "name" : "LBGitFileDiff", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileListDiff.class/README.md b/LBGit.package/LBGitFileListDiff.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileListDiff.class/class/empty.st b/LBGit.package/LBGitFileListDiff.class/class/empty.st deleted file mode 100644 index a002b5974..000000000 --- a/LBGit.package/LBGitFileListDiff.class/class/empty.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -empty - - ^ self new - diffs: Array empty. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/class/left.right..st b/LBGit.package/LBGitFileListDiff.class/class/left.right..st deleted file mode 100644 index b665e9b7f..000000000 --- a/LBGit.package/LBGitFileListDiff.class/class/left.right..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -left: leftArtifact right: rightArtifact - - ^ self new - diff: leftArtifact against: rightArtifact; - yourself \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/added..st b/LBGit.package/LBGitFileListDiff.class/instance/added..st deleted file mode 100644 index 4fe99c293..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/added..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -added: anObject - - added := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/added.st b/LBGit.package/LBGitFileListDiff.class/instance/added.st deleted file mode 100644 index d5e63b92d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/added.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -added - - ^ added \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st deleted file mode 100644 index 8c1c5f991..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/adjustedBy..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -adjustedBy: aDiffNode - - self diffs: ((aDiffNode children select: [:each | each isActive]) collect: [:each | each content]). - ^ self \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st b/LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st deleted file mode 100644 index a49c0c5f5..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/applyToContainer..st +++ /dev/null @@ -1,8 +0,0 @@ -applying -applyToContainer: anObjectContainer - - self target: ((anObjectContainer class canUnderstand: #directory) - ifTrue: [anObjectContainer directory] - ifFalse: [self workingDirectory]). - - self diffs do: [:each | each applyWith: self]. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st b/LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st deleted file mode 100644 index 622455218..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/createDiffs.st +++ /dev/null @@ -1,8 +0,0 @@ -diff creation -createDiffs - - self - diffs: OrderedCollection new; - diffAdded; - diffModified; - diffRemoved \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit.package/LBGitFileListDiff.class/instance/createFile..st deleted file mode 100644 index 6332aed0d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/createFile..st +++ /dev/null @@ -1,15 +0,0 @@ -applying -createFile: aPath - - | sourceReference targetReference inputStream content | - sourceReference := self sourceReferenceOn: aPath. - sourceReference exists ifFalse: [^ self]. - targetReference := self targetReferenceOn: aPath. - self flag: #TODO. "Do ensure the file does NOT exist workingReference ensureFile." - "sourceReference copyTo: targetReference." - inputStream := sourceReference readStream binary. - content := inputStream contents. - inputStream close. - targetReference writeStream binary nextPutAll: content; close. - "targetReference fileSystem copyFrom: inputStream to: targetReference path. - inputStream close." \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st b/LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st deleted file mode 100644 index 98e940619..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/deleteFile..st +++ /dev/null @@ -1,7 +0,0 @@ -applying -deleteFile: aPath - - | targetReference | - targetReference := self targetReferenceOn: aPath. - targetReference exists - ifTrue: [targetReference delete] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diff.against..st b/LBGit.package/LBGitFileListDiff.class/instance/diff.against..st deleted file mode 100644 index e57fbd29d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diff.against..st +++ /dev/null @@ -1,14 +0,0 @@ -diff creation -diff: leftArtifact against: rightArtifact - - self - left: leftArtifact; - right: rightArtifact. - self - added: (self right trackedFiles keys difference: self left trackedFiles keys); - stayed: (self right trackedFiles keys intersection: self left trackedFiles keys); - removed: (self left trackedFiles keys difference: self right trackedFiles keys). - self modified: (self stayed select: [:each | self isFileModified: each]). - self stayed: (self stayed difference: self modified). - self - createDiffs. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st b/LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st deleted file mode 100644 index 33d3412cb..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffAdded.st +++ /dev/null @@ -1,9 +0,0 @@ -diff creation -diffAdded - - self diffs addAll: - (self added collect: - [:each | LBGitFileAddition new - parent: self; - path: each; - yourself]) \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffAt..st b/LBGit.package/LBGitFileListDiff.class/instance/diffAt..st deleted file mode 100644 index 9a7bc586d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffAt..st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -diffAt: aPath - - ^ (self diffs select: [:each | each path = aPath]) - ifEmpty: [nil] - ifNotEmpty: [:found | found anyOne] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffModified.st b/LBGit.package/LBGitFileListDiff.class/instance/diffModified.st deleted file mode 100644 index 7b528c812..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffModified.st +++ /dev/null @@ -1,9 +0,0 @@ -diff creation -diffModified - - self diffs addAll: - (self modified collect: - [:each | LBGitFileModification new - parent: self; - path: each; - yourself]) \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st b/LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st deleted file mode 100644 index 5872a1812..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffPaths.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -diffPaths - - ^ self diffs collect: [:each | each path] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st b/LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st deleted file mode 100644 index 51851e012..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffRemoved.st +++ /dev/null @@ -1,9 +0,0 @@ -diff creation -diffRemoved - - self diffs addAll: - (self removed collect: - [:each | LBGitFileRemoval new - parent: self; - path: each; - yourself]) \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffs..st b/LBGit.package/LBGitFileListDiff.class/instance/diffs..st deleted file mode 100644 index db1e5c9ec..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffs..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -diffs: anObject - - diffs := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/diffs.st b/LBGit.package/LBGitFileListDiff.class/instance/diffs.st deleted file mode 100644 index accc270dc..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/diffs.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -diffs - - ^ diffs \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st deleted file mode 100644 index f11352d44..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/gitReferenceOn..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -gitReferenceOn: aPath - - ^ self rightReferenceOn: aPath. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st b/LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st deleted file mode 100644 index bbcb9014d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/hasChanges.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -hasChanges - - ^ self squotHasChanges \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st deleted file mode 100644 index 0d9b43b6b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st +++ /dev/null @@ -1,26 +0,0 @@ -Squot-diff-converting -initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder - "Initialize the previously allocated diff nodes in aCollection, using the builder to convert - the diffs of related objects." - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure and you chose to initialize all nodes upon their allocation already, - you may implement this method to do nothing." - | index | - index := 1. - self deprecated. - self added do: [:each | (aCollection at: index) - title: 'added: ', each - content: self - children: Array empty. - index := index + 1.]. - self removed do: [:each | (aCollection at: index) - title: 'deleted: ', each - content: self - children: Array empty. - index := index + 1.]. - self modified do: [:each | (aCollection at: index) - title: 'modified: ', each - content: self - children: Array empty. - index := index + 1.]. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st b/LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st deleted file mode 100644 index 119fa08c0..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/isFileModified..st +++ /dev/null @@ -1,4 +0,0 @@ -diff creation -isFileModified: aPath - - ^ (self left trackedFiles at: aPath) hasChangesTo: (self right trackedFiles at: aPath) \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st b/LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st deleted file mode 100644 index eef294d7b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/isRemoval.st +++ /dev/null @@ -1,4 +0,0 @@ -applying -isRemoval - - ^ true \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/left..st b/LBGit.package/LBGitFileListDiff.class/instance/left..st deleted file mode 100644 index b701cc139..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/left..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left: anObject - - left := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/left.st b/LBGit.package/LBGitFileListDiff.class/instance/left.st deleted file mode 100644 index 7a159c36d..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/left.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -left - - ^ left \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st deleted file mode 100644 index 4010f4f10..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/leftReferenceOn..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -leftReferenceOn: aPath - - ^ self left rootDirectory resolve: aPath. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st deleted file mode 100644 index 79f8d171b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/mergeWith..st +++ /dev/null @@ -1,13 +0,0 @@ -as yet unclassified -mergeWith: otherFileListDiff - - | commonPaths resultingDiffs | - resultingDiffs := OrderedCollection new. - commonPaths := self diffPaths intersection: otherFileListDiff diffPaths. - resultingDiffs addAll: (self diffs reject: [:each | commonPaths includes: each path]). - resultingDiffs addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]). - resultingDiffs addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). - ^ LBGitFileListDiff new - left: self right; - right: otherFileListDiff right; - diffs: resultingDiffs \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st deleted file mode 100644 index a83ff3ad0..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -mergeWithRemoval: anArtifactDiff - "I shall never be removed!" - ^ self \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/modified..st b/LBGit.package/LBGitFileListDiff.class/instance/modified..st deleted file mode 100644 index f732fdb2a..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/modified..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -modified: anObject - - modified := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/modified.st b/LBGit.package/LBGitFileListDiff.class/instance/modified.st deleted file mode 100644 index ea2e839cb..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/modified.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -modified - - ^ modified \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st deleted file mode 100644 index ad81a9a2b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st +++ /dev/null @@ -1,9 +0,0 @@ -Squot-diff-converting -newSquotDiffNodes - "Answer new, uninitialized SquotDiffNodes that will later be initialized - in #initializeSquotDiffNodes:with:" - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure, you may also fully initialize the nodes here already." - self deprecated. - ^ (1 to: (self added size + self removed size + self modified size)) collect: [:each | SquotDiffNode new] as: Array \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st deleted file mode 100644 index 98b8bb1c6..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -originalOrAddedArtifact - - ^ self left ifNil: [self right] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/path.st b/LBGit.package/LBGitFileListDiff.class/instance/path.st deleted file mode 100644 index a6af6b0fa..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -path - - ^ '' \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/removed..st b/LBGit.package/LBGitFileListDiff.class/instance/removed..st deleted file mode 100644 index 4dc20ce4f..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/removed..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -removed: anObject - - removed := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/removed.st b/LBGit.package/LBGitFileListDiff.class/instance/removed.st deleted file mode 100644 index 85a979d62..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/removed.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -removed - - ^ removed \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/right..st b/LBGit.package/LBGitFileListDiff.class/instance/right..st deleted file mode 100644 index 9e650c91e..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/right..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right: anObject - - right := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/right.st b/LBGit.package/LBGitFileListDiff.class/instance/right.st deleted file mode 100644 index 85787af13..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/right.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -right - - ^ right \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st deleted file mode 100644 index 0137204aa..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/rightReferenceOn..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -rightReferenceOn: aPath - - ^ self right rootDirectory resolve: aPath. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st deleted file mode 100644 index a7f327e4b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st +++ /dev/null @@ -1,4 +0,0 @@ -applying -sourceReferenceOn: aPath - - ^ self rightReferenceOn: aPath \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st deleted file mode 100644 index 10f80705b..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -squotChangeAsStringOrText - - ^ self diffs inject: 'Tracked file changes - ' into: [:total :each | total, Character tab, each title, Character cr] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st deleted file mode 100644 index c00b51531..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/squotHasChanges.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasChanges - "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self diffs notEmpty \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st deleted file mode 100644 index a1da0bce1..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/squotHasConflicts.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasConflicts - "Answer whether a choice must be made before this can be applied to something." - ^ self diffs anySatisfy: [:each | each hasConflicts] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/stayed..st b/LBGit.package/LBGitFileListDiff.class/instance/stayed..st deleted file mode 100644 index ea20aae30..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/stayed..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -stayed: anObject - - stayed := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/stayed.st b/LBGit.package/LBGitFileListDiff.class/instance/stayed.st deleted file mode 100644 index 508bc5ca4..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/stayed.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -stayed - - ^ stayed \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/target..st b/LBGit.package/LBGitFileListDiff.class/instance/target..st deleted file mode 100644 index 08fc09ad3..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/target..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -target: anObject - - target := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/target.st b/LBGit.package/LBGitFileListDiff.class/instance/target.st deleted file mode 100644 index 66264783f..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/target.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -target - - ^ target \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st deleted file mode 100644 index bda1615a6..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/targetReferenceOn..st +++ /dev/null @@ -1,6 +0,0 @@ -applying -targetReferenceOn: aPath - - ^ self target - ifNil: [self left rootDirectory resolve: aPath] - ifNotNil: [self target resolve: aPath] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/topNodes.st b/LBGit.package/LBGitFileListDiff.class/instance/topNodes.st deleted file mode 100644 index 57a90c0ec..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/topNodes.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -topNodes - - ^ self diffs collect: [:each | each asDiffNode] \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/updateFile..st b/LBGit.package/LBGitFileListDiff.class/instance/updateFile..st deleted file mode 100644 index 952591ca3..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/updateFile..st +++ /dev/null @@ -1,7 +0,0 @@ -applying -updateFile: aPath - - self - deleteFile: aPath; - createFile: aPath. - \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st b/LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st deleted file mode 100644 index 00210ea1e..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/workingDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -workingDirectory - - ^ self right rootDirectory fileSystem repository repository instVarNamed: #reference \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st deleted file mode 100644 index cf78fce29..000000000 --- a/LBGit.package/LBGitFileListDiff.class/instance/workingReferenceOn..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -workingReferenceOn: aPath - - | workingReference | - workingReference := self left rootDirectory fileSystem repository repository instVarNamed: #reference. - ^ workingReference resolve: aPath. \ No newline at end of file diff --git a/LBGit.package/LBGitFileListDiff.class/methodProperties.json b/LBGit.package/LBGitFileListDiff.class/methodProperties.json deleted file mode 100644 index 7f040069e..000000000 --- a/LBGit.package/LBGitFileListDiff.class/methodProperties.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "class" : { - "empty" : "LB 11/25/2018 14:13", - "left:right:" : "LB 11/26/2018 16:06" }, - "instance" : { - "added" : "LB 11/22/2018 11:17", - "added:" : "LB 11/22/2018 11:17", - "adjustedBy:" : "LB 11/26/2018 16:04", - "applyToContainer:" : "LB 11/26/2018 16:06", - "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 11/26/2018 18:05", - "deleteFile:" : "LB 11/25/2018 15:55", - "diff:against:" : "LB 11/26/2018 16:06", - "diffAdded" : "LB 11/23/2018 18:52", - "diffAt:" : "LB 11/25/2018 16:14", - "diffModified" : "LB 11/23/2018 18:52", - "diffPaths" : "LB 11/25/2018 16:05", - "diffRemoved" : "LB 11/23/2018 18:52", - "diffs" : "LB 11/23/2018 15:18", - "diffs:" : "LB 11/23/2018 15:18", - "gitReferenceOn:" : "LB 11/23/2018 16:31", - "hasChanges" : "LB 11/22/2018 12:07", - "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", - "isFileModified:" : "LB 11/25/2018 15:20", - "isRemoval" : "LB 11/25/2018 16:00", - "left" : "LB 11/22/2018 11:14", - "left:" : "LB 11/22/2018 11:14", - "leftReferenceOn:" : "LB 11/23/2018 16:31", - "mergeWith:" : "LB 11/26/2018 16:06", - "mergeWithRemoval:" : "LB 11/22/2018 12:19", - "modified" : "LB 11/23/2018 13:28", - "modified:" : "LB 11/23/2018 13:28", - "newSquotDiffNodes" : "LB 11/23/2018 15:24", - "originalOrAddedArtifact" : "LB 11/22/2018 15:53", - "path" : "LB 11/22/2018 16:36", - "removed" : "LB 11/22/2018 11:17", - "removed:" : "LB 11/22/2018 11:17", - "right" : "LB 11/22/2018 11:14", - "right:" : "LB 11/22/2018 11:14", - "rightReferenceOn:" : "LB 11/23/2018 16:31", - "sourceReferenceOn:" : "LB 11/25/2018 15:56", - "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", - "squotHasChanges" : "LB 11/23/2018 15:24", - "squotHasConflicts" : "LB 11/23/2018 15:25", - "stayed" : "LB 11/22/2018 11:17", - "stayed:" : "LB 11/22/2018 11:17", - "target" : "LB 11/25/2018 15:53", - "target:" : "LB 11/25/2018 15:53", - "targetReferenceOn:" : "LB 11/25/2018 16:46", - "topNodes" : "LB 11/23/2018 15:22", - "updateFile:" : "LB 11/23/2018 18:56", - "workingDirectory" : "LB 11/26/2018 15:35", - "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGit.package/LBGitFileListDiff.class/properties.json b/LBGit.package/LBGitFileListDiff.class/properties.json deleted file mode 100644 index fa91c6ef5..000000000 --- a/LBGit.package/LBGitFileListDiff.class/properties.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classtraitcomposition" : "TSquotDiff classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "left", - "right", - "added", - "removed", - "stayed", - "modified", - "diffs", - "target" ], - "name" : "LBGitFileListDiff", - "pools" : [ - ], - "super" : "Object", - "traitcomposition" : "TSquotDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileMetadata.class/README.md b/LBGit.package/LBGitFileMetadata.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st b/LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st deleted file mode 100644 index b91d8447b..000000000 --- a/LBGit.package/LBGitFileMetadata.class/class/onTreeEntry..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -onTreeEntry: aGitTreeEntry - - ^ self new - treeEntry: aGitTreeEntry \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st deleted file mode 100644 index e0ef646ba..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/contentChangesTo..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -contentChangesTo: otherFileMetaData - - (self contents isNil or: [otherFileMetaData contents isNil]) ifTrue: [^nil]. - ^ self contents ~= otherFileMetaData contents \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/contents.st b/LBGit.package/LBGitFileMetadata.class/instance/contents.st deleted file mode 100644 index 12972e65a..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/contents.st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -contents - - | stream content | - ^ (self path notNil and: [self path exists]) - ifFalse: [nil] - ifTrue: - [stream := self path readStream binary. - content := stream contents. - stream close. - content] diff --git a/LBGit.package/LBGitFileMetadata.class/instance/entryHash.st b/LBGit.package/LBGitFileMetadata.class/instance/entryHash.st deleted file mode 100644 index c4fa6a8c5..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/entryHash.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -entryHash - - ^ self treeEntry - ifNil: [nil] - ifNotNil: [self treeEntry entryHash] \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st deleted file mode 100644 index 6ea3049c0..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/gitChangesTo..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -gitChangesTo: otherFileMetaData - - (self entryHash isNil or: [otherFileMetaData entryHash isNil]) ifTrue: [^nil]. - ^ self entryHash ~= otherFileMetaData entryHash \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st deleted file mode 100644 index ea47dbe2e..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/hasChangesTo..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -hasChangesTo: otherFileMetaData - - (self gitChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. - (self contentChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. - ^ false. \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/path..st b/LBGit.package/LBGitFileMetadata.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/path.st b/LBGit.package/LBGitFileMetadata.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st b/LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st deleted file mode 100644 index 2efd7749f..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -treeEntry: anObject - - treeEntry := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st b/LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st deleted file mode 100644 index d6dfefb76..000000000 --- a/LBGit.package/LBGitFileMetadata.class/instance/treeEntry.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -treeEntry - - ^ treeEntry \ No newline at end of file diff --git a/LBGit.package/LBGitFileMetadata.class/methodProperties.json b/LBGit.package/LBGitFileMetadata.class/methodProperties.json deleted file mode 100644 index b9341b462..000000000 --- a/LBGit.package/LBGitFileMetadata.class/methodProperties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "class" : { - "onTreeEntry:" : "LB 11/25/2018 15:17" }, - "instance" : { - "contentChangesTo:" : "LB 11/25/2018 17:26", - "contents" : "LB 11/25/2018 17:29", - "entryHash" : "LB 11/25/2018 15:14", - "gitChangesTo:" : "LB 11/25/2018 17:02", - "hasChangesTo:" : "LB 11/25/2018 17:27", - "path" : "LB 11/25/2018 15:29", - "path:" : "LB 11/25/2018 15:29", - "treeEntry" : "LB 11/25/2018 15:14", - "treeEntry:" : "LB 11/25/2018 15:14" } } diff --git a/LBGit.package/LBGitFileMetadata.class/properties.json b/LBGit.package/LBGitFileMetadata.class/properties.json deleted file mode 100644 index dc6bca314..000000000 --- a/LBGit.package/LBGitFileMetadata.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "path", - "treeEntry" ], - "name" : "LBGitFileMetadata", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileModification.class/README.md b/LBGit.package/LBGitFileModification.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileModification.class/instance/applyWith..st b/LBGit.package/LBGitFileModification.class/instance/applyWith..st deleted file mode 100644 index e3a16c84c..000000000 --- a/LBGit.package/LBGitFileModification.class/instance/applyWith..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyWith: aFileListDiff - - aFileListDiff updateFile: self path. \ No newline at end of file diff --git a/LBGit.package/LBGitFileModification.class/instance/title.st b/LBGit.package/LBGitFileModification.class/instance/title.st deleted file mode 100644 index 21e6e0b14..000000000 --- a/LBGit.package/LBGitFileModification.class/instance/title.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -title - - ^ 'Modified: ', self path \ No newline at end of file diff --git a/LBGit.package/LBGitFileModification.class/methodProperties.json b/LBGit.package/LBGitFileModification.class/methodProperties.json deleted file mode 100644 index 47f7175dc..000000000 --- a/LBGit.package/LBGitFileModification.class/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "applyWith:" : "LB 11/25/2018 16:40", - "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGit.package/LBGitFileModification.class/properties.json b/LBGit.package/LBGitFileModification.class/properties.json deleted file mode 100644 index cfff3cef3..000000000 --- a/LBGit.package/LBGitFileModification.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitFileModification", - "pools" : [ - ], - "super" : "LBGitFileDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFileRemoval.class/README.md b/LBGit.package/LBGitFileRemoval.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFileRemoval.class/instance/after.st b/LBGit.package/LBGitFileRemoval.class/instance/after.st deleted file mode 100644 index bbb1722ec..000000000 --- a/LBGit.package/LBGitFileRemoval.class/instance/after.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -after - - ^ String empty \ No newline at end of file diff --git a/LBGit.package/LBGitFileRemoval.class/instance/applyWith..st b/LBGit.package/LBGitFileRemoval.class/instance/applyWith..st deleted file mode 100644 index 42b0318e3..000000000 --- a/LBGit.package/LBGitFileRemoval.class/instance/applyWith..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyWith: aFileListDiff - - aFileListDiff deleteFile: self path. \ No newline at end of file diff --git a/LBGit.package/LBGitFileRemoval.class/instance/title.st b/LBGit.package/LBGitFileRemoval.class/instance/title.st deleted file mode 100644 index d0fb38629..000000000 --- a/LBGit.package/LBGitFileRemoval.class/instance/title.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -title - - ^ 'Removed: ', self path \ No newline at end of file diff --git a/LBGit.package/LBGitFileRemoval.class/methodProperties.json b/LBGit.package/LBGitFileRemoval.class/methodProperties.json deleted file mode 100644 index 71b972692..000000000 --- a/LBGit.package/LBGitFileRemoval.class/methodProperties.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "after" : "LB 11/23/2018 19:04", - "applyWith:" : "LB 11/25/2018 16:40", - "title" : "LB 11/23/2018 18:52" } } diff --git a/LBGit.package/LBGitFileRemoval.class/properties.json b/LBGit.package/LBGitFileRemoval.class/properties.json deleted file mode 100644 index 2134d75c4..000000000 --- a/LBGit.package/LBGitFileRemoval.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitFileRemoval", - "pools" : [ - ], - "super" : "LBGitFileDiff", - "type" : "normal" } diff --git a/LBGit.package/LBGitFilesArtifact.class/README.md b/LBGit.package/LBGitFilesArtifact.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st deleted file mode 100644 index 1f72266e9..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -collectTrackedFiles - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st deleted file mode 100644 index e0420bc4d..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/diffAgainst..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -diffAgainst: otherFilesArtifact - - ^ LBGitFileListDiff left: self right: otherFilesArtifact \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st deleted file mode 100644 index f849520c8..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -diffContentAgainstThatOf: anArtifact - "Double dispatch with reverseDiffContentAgainst:" - self deprecated. - ^ anArtifact reverseDiffContentAgainst: self content \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st b/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st deleted file mode 100644 index 3361c3e3b..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/displayText.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -displayText - - ^'Recorded files: (', (self trackedFiles keys inject: '' into: [:sum :each | sum, each, ', ']) ,')' \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st b/LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st deleted file mode 100644 index 8b0d22d2c..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/isLoadable.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -isLoadable - "This was needed for commiting" - ^ true \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st deleted file mode 100644 index b12357af4..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/isSquotFile..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -isSquotFile: aPath - - ^ (aPath includesSubString: '.squot') - or: [aPath includesSubString: '.package'] - or: [self ownerSnapshot includesObjectAt: aPath] \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st b/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st deleted file mode 100644 index 3a5748fb4..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ownerSnapshot: anObject - - ownerSnapshot := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st b/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st deleted file mode 100644 index 80780b511..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ownerSnapshot - - ^ ownerSnapshot \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/path.st b/LBGit.package/LBGitFilesArtifact.class/instance/path.st deleted file mode 100644 index 28a7d9952..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -path - - ^ '' \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st deleted file mode 100644 index 91c2c2192..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -reverseDiffAgainstLiveFiles: otherFilesArtifact - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st deleted file mode 100644 index cdc89b8bf..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -reverseDiffAgainstRecordedFiles: otherFilesArtifact - - ^ self subclassResponsibility \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st deleted file mode 100644 index 73b8828fa..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -reverseDiffAgainstUnrecordedFiles: anUnrecordedFilesArtifact - - ^ LBGitArtifactReplacementDiff left: anUnrecordedFilesArtifact right: self \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st deleted file mode 100644 index b49c7611d..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -reverseDiffContentAgainst: otherContent - - "| otherContent added changedOrStayed deleted | - otherContent := aCollection ifNil: [Array empty]. - added := self content difference: otherContent. - changedOrStayed := self content intersection: otherContent. - deleted := otherContent difference: self content. - self halt. - ^ SquotDiffOfEqualObjects instance" - ^ otherContent squotDiffAgainst: self content \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st b/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st deleted file mode 100644 index 87a97cde3..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory: anObject - - rootDirectory := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st b/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st deleted file mode 100644 index 5d66c63e9..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/rootDirectory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rootDirectory - - ^ rootDirectory \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st b/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st deleted file mode 100644 index ee8f804c4..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -trackedFiles: anObject - - trackedFiles := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st b/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st deleted file mode 100644 index 69b050a32..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/trackedFiles.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -trackedFiles - - ^ trackedFiles ifNil: [self collectTrackedFiles. trackedFiles] \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st deleted file mode 100644 index e4a3bb15a..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -wantsToBeInTableOfContents - "I want to be always created" - ^ false \ No newline at end of file diff --git a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitFilesArtifact.class/methodProperties.json deleted file mode 100644 index 36b1a1c9c..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/methodProperties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "collectTrackedFiles" : "LB 11/25/2018 13:34", - "diffAgainst:" : "LB 11/25/2018 13:35", - "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", - "displayText" : "LB 11/26/2018 16:25", - "isLoadable" : "LB 11/25/2018 13:22", - "isSquotFile:" : "LB 11/22/2018 16:43", - "ownerSnapshot" : "LB 11/20/2018 15:14", - "ownerSnapshot:" : "LB 11/20/2018 15:14", - "path" : "LB 11/20/2018 10:19", - "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", - "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", - "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", - "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", - "rootDirectory" : "LB 11/20/2018 10:17", - "rootDirectory:" : "LB 12/4/2018 14:32", - "trackedFiles" : "LB 11/22/2018 15:46", - "trackedFiles:" : "LB 11/20/2018 15:12", - "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGit.package/LBGitFilesArtifact.class/properties.json b/LBGit.package/LBGitFilesArtifact.class/properties.json deleted file mode 100644 index ad6a96d79..000000000 --- a/LBGit.package/LBGitFilesArtifact.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "ownerSnapshot", - "rootDirectory", - "trackedFiles" ], - "name" : "LBGitFilesArtifact", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/README.md b/LBGit.package/LBGitLiveFilesArtifact.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st deleted file mode 100644 index f515dee8d..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/allFiles.st +++ /dev/null @@ -1,7 +0,0 @@ -collecting tracked files -allFiles - - self flag: #optimize. "Filter out .package and other squot files before" - ^ ((self rootDirectory children - reject: [:each | each path segments last = '.git']) - collect: [:each | each allFiles]) flatten \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st deleted file mode 100644 index d49a74223..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/capture.st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -capture - - self flag: #TODO "When is this called? what shoudl be done? create all existing files? are there even existing files? - It seems like all work is done in storeWith:" \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st deleted file mode 100644 index 54636a84d..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st +++ /dev/null @@ -1,7 +0,0 @@ -collecting tracked files -collectTrackedFiles - - self trackedFiles: - ((self allFiles - collect: [:each | self pathAndMetadataFor: each]) - reject: [:each | self isSquotFile: each key]) asDictionary \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st deleted file mode 100644 index 37f456108..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st +++ /dev/null @@ -1,6 +0,0 @@ -diffing -diffAgainst: otherFilesArtifact - - "This can happen when you checkout" - "self isThisEverCalled: 'A live artifact appeared on the right(wrong) side'." - ^ otherFilesArtifact reverseDiffAgainstLiveFiles: self \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st deleted file mode 100644 index 11529852a..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -initializeOn: aRecordedFilesArtifact - - self rootDirectory: (aRecordedFilesArtifact rootDirectory fileSystem repository repository workingDir). \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st deleted file mode 100644 index dc96df514..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st +++ /dev/null @@ -1,7 +0,0 @@ -collecting tracked files -pathAndMetadataFor: aFSReference - - | path | - path := (aFSReference relativeTo: self rootDirectory) - segments fold: [:all :eachSegment | all,'/',eachSegment]. - ^ path -> (LBGitFileMetadata new path: aFSReference) \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st deleted file mode 100644 index 57a9c7f1e..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/printOn..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -printOn: aStream - - super printOn: aStream. - aStream nextPutAll: '(live)'. \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st deleted file mode 100644 index 769bf12b9..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -reverseDiffAgainstLiveFiles: otherFilesArtifact - "There is only one live file system" - ^ self shouldNotImplement \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st deleted file mode 100644 index 3d5ecd637..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ /dev/null @@ -1,5 +0,0 @@ -diffing -reverseDiffAgainstRecordedFiles: otherFilesArtifact - - self initializeOn: otherFilesArtifact. - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st b/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st deleted file mode 100644 index 1d7225a1f..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/instance/storeWith..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -storeWith: anObjectContainer - - "This is called at an artifact creation diff" - | recordedFilesArtifact | - recordedFilesArtifact := anObjectContainer artifacts at: self path. - (recordedFilesArtifact diffAgainst: self) applyToContainer: anObjectContainer. \ No newline at end of file diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json deleted file mode 100644 index 8119efdcd..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "allFiles" : "LB 12/4/2018 14:53", - "capture" : "LB 12/4/2018 14:58", - "collectTrackedFiles" : "LB 12/4/2018 14:28", - "diffAgainst:" : "LB 11/26/2018 17:22", - "initializeOn:" : "LB 12/4/2018 14:29", - "pathAndMetadataFor:" : "LB 11/25/2018 17:21", - "printOn:" : "LB 11/25/2018 13:44", - "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", - "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", - "storeWith:" : "LB 12/4/2018 14:58" } } diff --git a/LBGit.package/LBGitLiveFilesArtifact.class/properties.json b/LBGit.package/LBGitLiveFilesArtifact.class/properties.json deleted file mode 100644 index 36497e1a2..000000000 --- a/LBGit.package/LBGitLiveFilesArtifact.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitLiveFilesArtifact", - "pools" : [ - ], - "super" : "LBGitFilesArtifact", - "type" : "normal" } diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/README.md b/LBGit.package/LBGitRecordedFilesArtifact.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st deleted file mode 100644 index 761a66225..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st +++ /dev/null @@ -1,11 +0,0 @@ -as yet unclassified -collectFilesOf: aGitTreeEntrySet - - | result | - result := Dictionary new. - aGitTreeEntrySet do: [:each | - each isInDirectoryMode - ifTrue: [(self collectFilesOf: each object entries) associationsDo: [:eachSub | result add: (each entryName,'/', eachSub key) -> eachSub value]] - ifFalse: [result at: each entryName put: (LBGitFileMetadata onTreeEntry: each)]]. - result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. - ^ result \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st deleted file mode 100644 index 45418fe9d..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ /dev/null @@ -1,8 +0,0 @@ -as yet unclassified -collectTrackedFiles - - self commit ifNil: [^ self trackedFiles: Dictionary new]. - self trackedFiles: - (self collectFilesOf: self commit tree entries). - self trackedFiles keysDo: - [:key | (self trackedFiles at: key) path: (self rootDirectory resolve: key)] \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st deleted file mode 100644 index fcb3fd965..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/commit.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -commit - - ^ self rootDirectory fileSystem store revision \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st deleted file mode 100644 index 68a9f542d..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -diffAgainst: otherFilesArtifact - - ^ otherFilesArtifact reverseDiffAgainstRecordedFiles: self \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st deleted file mode 100644 index 428689848..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/printOn..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -printOn: aStream - - super printOn: aStream. - aStream nextPutAll: '(On commit: ''', self commit message,''')'. \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st deleted file mode 100644 index ceafad9e2..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ /dev/null @@ -1,5 +0,0 @@ -diffing -reverseDiffAgainstLiveFiles: otherFilesArtifact - - otherFilesArtifact initializeOn: self. - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st deleted file mode 100644 index 08e02cc19..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -reverseDiffAgainstRecordedFiles: otherFilesArtifact - - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json deleted file mode 100644 index b43f4c16e..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "collectFilesOf:" : "LB 11/25/2018 15:16", - "collectTrackedFiles" : "LB 12/2/2018 14:23", - "commit" : "LB 11/20/2018 16:28", - "diffAgainst:" : "LB 11/25/2018 14:06", - "printOn:" : "LB 11/25/2018 13:44", - "reverseDiffAgainstLiveFiles:" : "LB 11/26/2018 16:15", - "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08" } } diff --git a/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json b/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json deleted file mode 100644 index 87537eba1..000000000 --- a/LBGit.package/LBGitRecordedFilesArtifact.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitRecordedFilesArtifact", - "pools" : [ - ], - "super" : "LBGitFilesArtifact", - "type" : "normal" } diff --git a/LBGit.package/LBGitRemoteTests.class/README.md b/LBGit.package/LBGitRemoteTests.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commit..st b/LBGit.package/LBGitRemoteTests.class/instance/commit..st deleted file mode 100644 index 814ef7bfb..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/commit..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -commit: aString - - self workingCopy - saveNewVersionMessage: aString - interactive: false. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st b/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st deleted file mode 100644 index ede179a5c..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st +++ /dev/null @@ -1,5 +0,0 @@ -dummy file -commitDummyFileAddition - - self createDummyFile. - self commit: 'Added dummy file'. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st deleted file mode 100644 index e120bbff9..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/createDummyFile.st +++ /dev/null @@ -1,5 +0,0 @@ -dummy file -createDummyFile - - self writeToDummyFile: self dummyContents. - \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st deleted file mode 100644 index 04c9b1946..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/deleteDummyFile.st +++ /dev/null @@ -1,5 +0,0 @@ -dummy file -deleteDummyFile - - (self reference resolve: self dummyFile) delete. - \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st deleted file mode 100644 index 15b675581..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents.st +++ /dev/null @@ -1,4 +0,0 @@ -dummy file -dummyContents - - ^ 'Test Data' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st deleted file mode 100644 index dda70a169..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/dummyContents2.st +++ /dev/null @@ -1,6 +0,0 @@ -dummy file -dummyContents2 - - ^ 'These are new - contents for the - dummy file' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st b/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st deleted file mode 100644 index b16759c6a..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/dummyFile.st +++ /dev/null @@ -1,4 +0,0 @@ -dummy file -dummyFile - - ^ 'dummy.file' \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st b/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st deleted file mode 100644 index d038ac7fa..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/gitReference.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -gitReference - - ^ self workingCopy repository gitRepository head root \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference..st b/LBGit.package/LBGitRemoteTests.class/instance/reference..st deleted file mode 100644 index 8c1e7e098..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/reference..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -reference: anObject - - reference := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/reference.st b/LBGit.package/LBGitRemoteTests.class/instance/reference.st deleted file mode 100644 index 50b50b32e..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/reference.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -reference - - ^ reference \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/setUp.st b/LBGit.package/LBGitRemoteTests.class/instance/setUp.st deleted file mode 100644 index be64b2012..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/setUp.st +++ /dev/null @@ -1,12 +0,0 @@ -running -setUp - - super setUp. - self reference: FileSystem memory / 'LBGitTests'. - self reference ensureDirectory. - self workingCopy: SquotWorkingCopy newOnObjectMemory. - self workingCopy - name: 'LBGitTestWorkingCopy'; - store: SquotImageStore new; - repository: (SquitRepository new initializeInDirectory: self reference ); - loadedHistorian: (self workingCopy repository historianNamed: 'master'). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st b/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st deleted file mode 100644 index 4c32dac72..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/tearDown.st +++ /dev/null @@ -1,5 +0,0 @@ -running -tearDown - - super tearDown. - self reference delete. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st deleted file mode 100644 index e79906c93..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st +++ /dev/null @@ -1,7 +0,0 @@ -tests -testCommitAddsFile - - - self - commitDummyFileAddition; - assert: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st deleted file mode 100644 index d591bb465..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st +++ /dev/null @@ -1,9 +0,0 @@ -tests -testCommitAddsFileContent - - - self - commitDummyFileAddition. - self - assert: self dummyContents - equals: (self gitReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st deleted file mode 100644 index 58eb70f82..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testCommitDeletesFile - - self - commitDummyFileAddition; - deleteDummyFile; - commit: 'Removed dummy file'; - deny: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st b/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st deleted file mode 100644 index fa2dc05ee..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st +++ /dev/null @@ -1,10 +0,0 @@ -tests -testCommitUpdatesFile - - self commitDummyFileAddition. - self writeToDummyFile: self dummyContents2. - self commit: 'Changed dummy file'. - - self - assert: self dummyContents2 - equals: (self gitReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st b/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st deleted file mode 100644 index 5420f2323..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st +++ /dev/null @@ -1,5 +0,0 @@ -tests -testInitialTrackedFilesArtifact - - self assert: - (self workingCopy artifacts anySatisfy: [:each | each isKindOf: LBGitLiveFilesArtifact]). \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st b/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st deleted file mode 100644 index 725e63cf8..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/testWorking.st +++ /dev/null @@ -1,4 +0,0 @@ -tests -testWorking - - self assert: true. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st deleted file mode 100644 index 240017aef..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -workingCopy: anObject - - workingCopy := anObject. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st b/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st deleted file mode 100644 index 725b545b8..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/workingCopy.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -workingCopy - - ^ workingCopy \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st b/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st deleted file mode 100644 index 81bb1a621..000000000 --- a/LBGit.package/LBGitRemoteTests.class/instance/writeToDummyFile..st +++ /dev/null @@ -1,6 +0,0 @@ -dummy file -writeToDummyFile: anObject - - (self reference resolve: self dummyFile) writeStream binary - nextPutAll: anObject asByteArray; - close. \ No newline at end of file diff --git a/LBGit.package/LBGitRemoteTests.class/methodProperties.json b/LBGit.package/LBGitRemoteTests.class/methodProperties.json deleted file mode 100644 index 754025595..000000000 --- a/LBGit.package/LBGitRemoteTests.class/methodProperties.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "commit:" : "LB 12/4/2018 13:43", - "commitDummyFileAddition" : "LB 12/4/2018 13:43", - "createDummyFile" : "LB 12/4/2018 13:49", - "deleteDummyFile" : "LB 12/4/2018 13:38", - "dummyContents" : "LB 12/4/2018 13:47", - "dummyContents2" : "LB 12/4/2018 13:47", - "dummyFile" : "LB 12/2/2018 13:56", - "gitReference" : "LB 12/4/2018 14:10", - "reference" : "LB 12/2/2018 13:40", - "reference:" : "LB 12/2/2018 13:40", - "setUp" : "LB 12/4/2018 14:33", - "tearDown" : "LB 12/2/2018 13:52", - "testCommitAddsFile" : "LB 12/4/2018 13:39", - "testCommitAddsFileContent" : "LB 12/4/2018 14:46", - "testCommitDeletesFile" : "LB 12/4/2018 13:43", - "testCommitUpdatesFile" : "LB 12/4/2018 14:44", - "testInitialTrackedFilesArtifact" : "LB 12/2/2018 13:51", - "testWorking" : "LB 12/2/2018 12:58", - "workingCopy" : "LB 12/2/2018 12:54", - "workingCopy:" : "LB 12/2/2018 12:54", - "writeToDummyFile:" : "LB 12/4/2018 13:49" } } diff --git a/LBGit.package/LBGitRemoteTests.class/properties.json b/LBGit.package/LBGitRemoteTests.class/properties.json deleted file mode 100644 index 98f672c7e..000000000 --- a/LBGit.package/LBGitRemoteTests.class/properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "category" : "LBGit-Tests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "workingCopy", - "reference" ], - "name" : "LBGitRemoteTests", - "pools" : [ - ], - "super" : "TestCase", - "traitcomposition" : "TTestCaseSuppressingProgressDisplay", - "type" : "normal" } diff --git a/LBGit.package/monticello.meta/categories.st b/LBGit.package/monticello.meta/categories.st deleted file mode 100644 index 266e3ffd4..000000000 --- a/LBGit.package/monticello.meta/categories.st +++ /dev/null @@ -1,2 +0,0 @@ -SystemOrganization addCategory: #'LBGit-Tests'! -SystemOrganization addCategory: #'LBGit-Core'! From 90c87f5bcb1683d1c2a73c861be13fab11ce0e8c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:49:58 +0100 Subject: [PATCH 101/170] Replaced preload by postload --- .../BaselineOfLBGit.class/instance/baseline..st | 4 ++-- .../instance/{preLoad.st => postLoad.st} | 2 +- .../BaselineOfLBGit.class/methodProperties.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename BaselineOfLBGit.package/BaselineOfLBGit.class/instance/{preLoad.st => postLoad.st} (95%) diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index 41bf2506f..ccf592ed1 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -3,10 +3,10 @@ baseline: spec spec for: #common do: [ spec - preLoadDoIt: #preLoad; baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; package: 'LBGit-Core' with: [spec requires: #('Squot')]; package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; group: 'default' with: #('LBGit-Core'); - group: 'tests' with: #('LBGit-Tests') + group: 'tests' with: #('LBGit-Tests'); + postLoadDoIt: #postLoad ]. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st similarity index 95% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st rename to BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st index 4927833b6..3ce4c2b99 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/preLoad.st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st @@ -1,5 +1,5 @@ as yet unclassified -preLoad +postLoad [GitStamp defaultName. GitStamp defaultEmail] on: GitStampNameRequest do: diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index 3c04cec38..98f7999fe 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:43", - "preLoad" : "LB 12/4/2018 15:39" } } + "baseline:" : "LB 12/4/2018 15:49", + "postLoad" : "LB 12/4/2018 15:49" } } From 1bebcf53f9e4bbff0994697f27740bc01d8a09af Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:54:14 +0100 Subject: [PATCH 102/170] Update baseline --- .../BaselineOfLBGit.class/instance/baseline..st | 3 ++- .../BaselineOfLBGit.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index ccf592ed1..60793ccbe 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -5,8 +5,9 @@ baseline: spec spec baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; package: 'LBGit-Core' with: [spec requires: #('Squot')]; + package: 'LBGit-Extensions' with: [spec requires: #('LBGit-Core')]; package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; - group: 'default' with: #('LBGit-Core'); + group: 'default' with: #('LBGit-Core' 'LBGit-Extensions'); group: 'tests' with: #('LBGit-Tests'); postLoadDoIt: #postLoad ]. \ No newline at end of file diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index 98f7999fe..a7295f3d0 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:49", + "baseline:" : "LB 12/4/2018 15:54", "postLoad" : "LB 12/4/2018 15:49" } } From 78c4fce4e0ef5df364432daca7b1e7ea6a02a3cf Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 15:58:20 +0100 Subject: [PATCH 103/170] Update baseline --- .../BaselineOfLBGit.class/instance/baseline..st | 2 +- .../BaselineOfLBGit.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st index 60793ccbe..d6c82d606 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st @@ -6,7 +6,7 @@ baseline: spec baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; package: 'LBGit-Core' with: [spec requires: #('Squot')]; package: 'LBGit-Extensions' with: [spec requires: #('LBGit-Core')]; - package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core')]; + package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core' 'LBGit-Extensions')]; group: 'default' with: #('LBGit-Core' 'LBGit-Extensions'); group: 'tests' with: #('LBGit-Tests'); postLoadDoIt: #postLoad diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json index a7295f3d0..b9e211f49 100644 --- a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ b/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "LB 12/4/2018 15:54", + "baseline:" : "LB 12/4/2018 15:58", "postLoad" : "LB 12/4/2018 15:49" } } From 94dff19adfeaea4cef7ddfd9039ee92f67893ae7 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Tue, 4 Dec 2018 17:08:50 +0100 Subject: [PATCH 104/170] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 976360f75..c99e953e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ os: - osx smalltalk: - - Squeak-5.0 - Squeak-5.1 - Squeak-5.2 - Squeak-trunk From 0443cc272f630c42d99780b1aeaebd2a0efeef70 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Tue, 4 Dec 2018 17:23:42 +0100 Subject: [PATCH 105/170] Travis poke 1 --- .../LBGitRemoteTests.class/instance/testPokeTravis.st | 8 ++++++++ .../LBGitRemoteTests.class/methodProperties.json | 1 + 2 files changed, 9 insertions(+) create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st new file mode 100644 index 000000000..591f39cd9 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st @@ -0,0 +1,8 @@ +tests +testPokeTravis + + self createDummyFile. + self assert: (self reference resolve: self dummyFile) exists. + self commit: 'TestXY'. + self assert: (self gitReference resolve: self dummyFile) exists. + self assert: 'TestXY' equals: self workingCopy loadedVersion commit message. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 754025595..f3a1fd452 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -19,6 +19,7 @@ "testCommitDeletesFile" : "LB 12/4/2018 13:43", "testCommitUpdatesFile" : "LB 12/4/2018 14:44", "testInitialTrackedFilesArtifact" : "LB 12/2/2018 13:51", + "testPokeTravis" : "LB 12/4/2018 17:23", "testWorking" : "LB 12/2/2018 12:58", "workingCopy" : "LB 12/2/2018 12:54", "workingCopy:" : "LB 12/2/2018 12:54", From fc3153a6ad9399fec11684b35f0458338f038c24 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 7 Dec 2018 18:30:04 +0100 Subject: [PATCH 106/170] Added compatibility for newer versions of squot --- .../LBGitFileListDiff.class/instance/isAddition.st | 4 ++++ .../LBGitFileListDiff.class/instance/isRemoval.st | 2 +- .../LBGitFileListDiff.class/instance/storeInfo.st | 4 ++++ .../LBGitFileListDiff.class/methodProperties.json | 4 +++- LBGit-Core.package/LBGitFilesArtifact.class/class/path.st | 4 ++++ .../LBGitFilesArtifact.class/instance/isSquotFile..st | 4 ++-- .../LBGitFilesArtifact.class/instance/path.st | 2 +- .../LBGitFilesArtifact.class/methodProperties.json | 6 +++--- .../SquotWorkingCopy.extension/instance/loadOrder.st | 7 +++++++ .../SquotWorkingCopy.extension/methodProperties.json | 5 +++++ .../SquotWorkingCopy.extension/properties.json | 2 ++ .../LBGitRemoteTests.class/instance/testCommitAddsFile.st | 1 - .../instance/testInitialTrackedFilesArtifact.st | 2 +- .../LBGitRemoteTests.class/methodProperties.json | 4 ++-- 14 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st create mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/class/path.st create mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st create mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json create mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st new file mode 100644 index 000000000..9b36fa9ce --- /dev/null +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st @@ -0,0 +1,4 @@ +applying +isAddition + + ^ false \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st index eef294d7b..257126f3e 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st @@ -1,4 +1,4 @@ applying isRemoval - ^ true \ No newline at end of file + ^ false \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st new file mode 100644 index 000000000..d9e820d3a --- /dev/null +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st @@ -0,0 +1,4 @@ +applying +storeInfo + + ^ SquotTrackedObjectMetadata new \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 7f040069e..527adb97d 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -21,8 +21,9 @@ "gitReferenceOn:" : "LB 11/23/2018 16:31", "hasChanges" : "LB 11/22/2018 12:07", "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", + "isAddition" : "LB 12/7/2018 18:25", "isFileModified:" : "LB 11/25/2018 15:20", - "isRemoval" : "LB 11/25/2018 16:00", + "isRemoval" : "LB 12/7/2018 18:24", "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", "leftReferenceOn:" : "LB 11/23/2018 16:31", @@ -44,6 +45,7 @@ "squotHasConflicts" : "LB 11/23/2018 15:25", "stayed" : "LB 11/22/2018 11:17", "stayed:" : "LB 11/22/2018 11:17", + "storeInfo" : "LB 12/7/2018 18:27", "target" : "LB 11/25/2018 15:53", "target:" : "LB 11/25/2018 15:53", "targetReferenceOn:" : "LB 11/25/2018 16:46", diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st b/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st new file mode 100644 index 000000000..28a7d9952 --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ '' \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st index b12357af4..62a969bd9 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st @@ -1,6 +1,6 @@ as yet unclassified isSquotFile: aPath - ^ (aPath includesSubString: '.squot') - or: [aPath includesSubString: '.package'] + ^ (aPath includesSubstring: '.squot') + or: [aPath includesSubstring: '.package'] or: [self ownerSnapshot includesObjectAt: aPath] \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st index 28a7d9952..fd5e47c0c 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st @@ -1,4 +1,4 @@ as yet unclassified path - ^ '' \ No newline at end of file + ^ self class path \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 36b1a1c9c..044c718e0 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -1,16 +1,16 @@ { "class" : { - }, + "path" : "LB 12/7/2018 18:14" }, "instance" : { "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", "displayText" : "LB 11/26/2018 16:25", "isLoadable" : "LB 11/25/2018 13:22", - "isSquotFile:" : "LB 11/22/2018 16:43", + "isSquotFile:" : "LB 12/7/2018 18:16", "ownerSnapshot" : "LB 11/20/2018 15:14", "ownerSnapshot:" : "LB 11/20/2018 15:14", - "path" : "LB 11/20/2018 10:19", + "path" : "LB 12/7/2018 18:14", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st new file mode 100644 index 000000000..b2fa30281 --- /dev/null +++ b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st @@ -0,0 +1,7 @@ +*LBGit-Extensions +loadOrder + + "This method is for compatibility to newer Squot versions" + ^ store loadOrder + addIfNotPresent: LBGitFilesArtifact path; + yourself \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json b/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json new file mode 100644 index 000000000..d5b0675ed --- /dev/null +++ b/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "loadOrder" : "LB 12/7/2018 18:15" } } diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json b/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json new file mode 100644 index 000000000..b5406e048 --- /dev/null +++ b/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotWorkingCopy" } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st index e79906c93..fe0a748fb 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st @@ -1,7 +1,6 @@ tests testCommitAddsFile - self commitDummyFileAddition; assert: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st index 5420f2323..a36f0366a 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st @@ -2,4 +2,4 @@ tests testInitialTrackedFilesArtifact self assert: - (self workingCopy artifacts anySatisfy: [:each | each isKindOf: LBGitLiveFilesArtifact]). \ No newline at end of file + (self workingCopy currentSnapshot artifacts anySatisfy: [:each | each isKindOf: LBGitLiveFilesArtifact]). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index f3a1fd452..b1dea961a 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -14,11 +14,11 @@ "reference:" : "LB 12/2/2018 13:40", "setUp" : "LB 12/4/2018 14:33", "tearDown" : "LB 12/2/2018 13:52", - "testCommitAddsFile" : "LB 12/4/2018 13:39", + "testCommitAddsFile" : "LB 12/7/2018 17:53", "testCommitAddsFileContent" : "LB 12/4/2018 14:46", "testCommitDeletesFile" : "LB 12/4/2018 13:43", "testCommitUpdatesFile" : "LB 12/4/2018 14:44", - "testInitialTrackedFilesArtifact" : "LB 12/2/2018 13:51", + "testInitialTrackedFilesArtifact" : "LB 12/7/2018 17:53", "testPokeTravis" : "LB 12/4/2018 17:23", "testWorking" : "LB 12/2/2018 12:58", "workingCopy" : "LB 12/2/2018 12:54", From f3466a197a741a7bef2d5113658ca617df4ec199 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Fri, 7 Dec 2018 18:30:51 +0100 Subject: [PATCH 107/170] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c99e953e3..8abdd736d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,5 @@ os: - osx smalltalk: - - Squeak-5.1 - Squeak-5.2 - Squeak-trunk From 91e1fd454c68f0017bea4415eded6d75031108de Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 13 Dec 2018 16:24:31 +0100 Subject: [PATCH 108/170] Added real remote tests moved local test to extra class --- .../instance/isConflict.st | 4 ++ .../methodProperties.json | 1 + .../instance/isConflict.st | 4 ++ .../LBGitFileDiff.class/methodProperties.json | 1 + .../instance/hasChanges.st | 2 +- .../instance/hasConflicts.st | 4 ++ .../methodProperties.json | 3 +- .../LBGitLocalTests.class/README.md | 0 .../instance/testCommitAddsFile.st | 0 .../instance/testCommitAddsFileContent.st | 0 .../instance/testCommitDeletesFile.st | 8 +++ .../instance/testCommitUpdatesFile.st | 2 +- .../testInitialTrackedFilesArtifact.st | 0 .../instance/testSetupSuccess.st} | 2 +- .../methodProperties.json | 10 ++++ .../LBGitLocalTests.class/properties.json | 14 +++++ .../instance/branchName.st | 4 ++ .../instance/browser..st | 4 ++ .../instance/browser.st | 4 ++ .../instance/commitOtherMessaged..st | 6 +++ .../instance/createBranch.st | 7 +++ .../instance/credentials.st | 5 ++ .../instance/deleteBranch.st | 4 ++ .../instance/otherCommit.st | 4 ++ .../instance/otherReference.st | 4 ++ .../instance/otherWorkingCopy..st | 4 ++ .../instance/otherWorkingCopy.st | 4 ++ .../instance/performTest.st | 5 ++ .../instance/pullOther.st | 8 +++ .../LBGitRemoteTests.class/instance/push.st | 8 +++ .../instance/remoteURL.st | 4 ++ .../LBGitRemoteTests.class/instance/setUp.st | 21 ++++---- .../instance/setUpAdditionalWorkingCopy.st | 4 ++ .../instance/setUpRemote.st | 12 +++++ .../instance/setUpRemoteFor..st | 15 ++++++ .../instance/tearDown.st | 11 ++-- .../instance/testCommitDeletesFile.st | 8 --- .../instance/testMergeGenerated.st | 18 +++++++ .../instance/testNoCheckoutNeeded.st | 5 ++ .../instance/testOnOwnBranch.st | 7 +++ .../instance/testPokeTravis.st | 8 --- .../instance/testPushAddsFile.st | 8 +++ .../instance/testPushAddsFileContent.st | 10 ++++ .../instance/testPushAddsFileToTree.st | 8 +++ .../instance/testPushDeletedFile.st | 10 ++++ .../instance/testPushUpdatesFile.st | 12 +++++ .../instance/testReadmeExists.st | 5 ++ .../instance/testSetupSuccess.st | 5 ++ .../instance/transferMessaged..st | 7 +++ .../instance/workingCopy..st | 4 -- .../instance/writeToDummyFile..st | 6 --- .../methodProperties.json | 53 +++++++++++-------- .../LBGitRemoteTests.class/properties.json | 8 ++- .../LBGitSquitBrowserForTests.class/README.md | 0 .../instance/projectSelection..st | 4 ++ .../instance/projectSelection.st | 4 ++ .../methodProperties.json | 6 +++ .../properties.json | 14 +++++ .../LBGitTestCase.class/README.md | 0 .../LBGitTestCase.class/instance/commit.st | 4 ++ .../instance/commitDummyFileAddition.st | 2 +- .../instance/commitMessaged..st} | 4 +- .../instance/createDummyFile.st | 0 .../instance/deleteDummyFile.st | 0 .../instance/dummyContents.st | 3 +- .../instance/dummyContents2.st | 0 .../instance/dummyFile.st | 0 .../instance/dummyFile2.st | 4 ++ .../instance/gitReference.st | 0 .../instance/makeWorkingCopyAt..st | 10 ++++ .../instance/performTest.st | 3 ++ .../instance/reference..st | 0 .../instance/reference.st | 0 .../LBGitTestCase.class/instance/setUp.st | 7 +++ .../suppressProgressDisplayDuring..st | 9 ++++ .../LBGitTestCase.class/instance/tearDown.st | 5 ++ .../instance/workingCopy..st | 4 ++ .../instance/workingCopy.st | 0 .../instance/write.to.in..st | 6 +++ .../instance/writeToDummyFile..st | 7 +++ .../LBGitTestCase.class/methodProperties.json | 25 +++++++++ .../LBGitTestCase.class/properties.json | 17 ++++++ 82 files changed, 438 insertions(+), 75 deletions(-) create mode 100644 LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st create mode 100644 LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st create mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st create mode 100644 LBGit-Tests.package/LBGitLocalTests.class/README.md rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitLocalTests.class}/instance/testCommitAddsFile.st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitLocalTests.class}/instance/testCommitAddsFileContent.st (100%) create mode 100644 LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitLocalTests.class}/instance/testCommitUpdatesFile.st (84%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitLocalTests.class}/instance/testInitialTrackedFilesArtifact.st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class/instance/testWorking.st => LBGitLocalTests.class/instance/testSetupSuccess.st} (61%) create mode 100644 LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json create mode 100644 LBGit-Tests.package/LBGitLocalTests.class/properties.json create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st delete mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st delete mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st delete mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st delete mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st create mode 100644 LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md create mode 100644 LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st create mode 100644 LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st create mode 100644 LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json create mode 100644 LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json create mode 100644 LBGit-Tests.package/LBGitTestCase.class/README.md create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/commit.st rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/commitDummyFileAddition.st (59%) rename LBGit-Tests.package/{LBGitRemoteTests.class/instance/commit..st => LBGitTestCase.class/instance/commitMessaged..st} (67%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/createDummyFile.st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/deleteDummyFile.st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/dummyContents.st (61%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/dummyContents2.st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/dummyFile.st (100%) create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/gitReference.st (100%) create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/reference..st (100%) rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/reference.st (100%) create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st rename LBGit-Tests.package/{LBGitRemoteTests.class => LBGitTestCase.class}/instance/workingCopy.st (100%) create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/methodProperties.json create mode 100644 LBGit-Tests.package/LBGitTestCase.class/properties.json diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st b/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st new file mode 100644 index 000000000..492420ec8 --- /dev/null +++ b/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st @@ -0,0 +1,4 @@ +as yet unclassified +isConflict + + ^ true \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json b/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json index 47f88cc2c..1b640e14e 100644 --- a/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json @@ -6,6 +6,7 @@ "asDiffNode" : "LB 11/25/2018 16:19", "body" : "LB 11/25/2018 16:35", "choice" : "LB 11/25/2018 16:47", + "isConflict" : "LB 12/8/2018 14:17", "leftChange" : "LB 11/25/2018 16:22", "leftChange:" : "LB 11/25/2018 16:22", "rightChange" : "LB 11/25/2018 16:22", diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st b/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st new file mode 100644 index 000000000..205d2940d --- /dev/null +++ b/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st @@ -0,0 +1,4 @@ +as yet unclassified +isConflict + + ^ false \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json index 3db645d3e..2e1b46b19 100644 --- a/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json @@ -8,6 +8,7 @@ "asDiffNode" : "LB 11/23/2018 15:14", "before" : "LB 11/23/2018 18:50", "body" : "LB 11/23/2018 18:37", + "isConflict" : "LB 12/8/2018 14:17", "mergeWith:" : "LB 11/25/2018 16:34", "parent" : "LB 11/23/2018 18:42", "parent:" : "LB 11/23/2018 18:42", diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st index bbcb9014d..e94fa2c3b 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st @@ -1,4 +1,4 @@ as yet unclassified hasChanges - ^ self squotHasChanges \ No newline at end of file + ^ self diffs notEmpty \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st new file mode 100644 index 000000000..2379258f2 --- /dev/null +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st @@ -0,0 +1,4 @@ +as yet unclassified +hasConflicts + + ^ self diffs anySatisfy: [:each | each isConflict] \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 527adb97d..318f6d7af 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -19,7 +19,8 @@ "diffs" : "LB 11/23/2018 15:18", "diffs:" : "LB 11/23/2018 15:18", "gitReferenceOn:" : "LB 11/23/2018 16:31", - "hasChanges" : "LB 11/22/2018 12:07", + "hasChanges" : "LB 12/8/2018 14:18", + "hasConflicts" : "LB 12/8/2018 14:18", "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", "isAddition" : "LB 12/7/2018 18:25", "isFileModified:" : "LB 11/25/2018 15:20", diff --git a/LBGit-Tests.package/LBGitLocalTests.class/README.md b/LBGit-Tests.package/LBGitLocalTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFile.st rename to LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitAddsFileContent.st rename to LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st new file mode 100644 index 000000000..830505a54 --- /dev/null +++ b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st @@ -0,0 +1,8 @@ +tests +testCommitDeletesFile + + self + commitDummyFileAddition; + deleteDummyFile; + commitMessaged: 'Removed dummy file'; + deny: (self commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st similarity index 84% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st rename to LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st index fa2dc05ee..04f9c7b4a 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitUpdatesFile.st +++ b/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st @@ -3,7 +3,7 @@ testCommitUpdatesFile self commitDummyFileAddition. self writeToDummyFile: self dummyContents2. - self commit: 'Changed dummy file'. + self commitMessaged: 'Changed dummy file'. self assert: self dummyContents2 diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testInitialTrackedFilesArtifact.st rename to LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testWorking.st b/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st similarity index 61% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testWorking.st rename to LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st index 725e63cf8..bbb1b7a9b 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testWorking.st +++ b/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st @@ -1,4 +1,4 @@ tests -testWorking +testSetupSuccess self assert: true. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json b/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json new file mode 100644 index 000000000..ae10f392f --- /dev/null +++ b/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + }, + "instance" : { + "testCommitAddsFile" : "LB 12/7/2018 17:53", + "testCommitAddsFileContent" : "LB 12/4/2018 14:46", + "testCommitDeletesFile" : "LB 12/8/2018 13:13", + "testCommitUpdatesFile" : "LB 12/8/2018 13:06", + "testInitialTrackedFilesArtifact" : "LB 12/7/2018 17:53", + "testSetupSuccess" : "LB 12/8/2018 15:40" } } diff --git a/LBGit-Tests.package/LBGitLocalTests.class/properties.json b/LBGit-Tests.package/LBGitLocalTests.class/properties.json new file mode 100644 index 000000000..b172ae7a7 --- /dev/null +++ b/LBGit-Tests.package/LBGitLocalTests.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "LBGitLocalTests", + "pools" : [ + ], + "super" : "LBGitTestCase", + "type" : "normal" } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st new file mode 100644 index 000000000..eeaf5b96e --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st @@ -0,0 +1,4 @@ +accessing +branchName + + ^ self class name , '_' , testSelector \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st new file mode 100644 index 000000000..27dc9bfe6 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st @@ -0,0 +1,4 @@ +accessing +browser: anObject + + browser := anObject. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st new file mode 100644 index 000000000..8a644b817 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st @@ -0,0 +1,4 @@ +accessing +browser + + ^ browser \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st new file mode 100644 index 000000000..428c96d54 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st @@ -0,0 +1,6 @@ +actions +commitOtherMessaged: aString + + self otherWorkingCopy + saveNewVersionMessage: aString + interactive: false. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st new file mode 100644 index 000000000..20df2ae4c --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st @@ -0,0 +1,7 @@ +running +createBranch + + [self workingCopy repository gitRepository + pushToUpstreamBranchOf: self branchName + ifNone: [self fail]] + on: NeedGitCredentials do: [:e | e resume: self credentials]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st new file mode 100644 index 000000000..6ac1bee2d --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st @@ -0,0 +1,5 @@ +accessing +credentials + + ^ {SmalltalkCI getEnv: 'GITUSERNAME'. + SmalltalkCI getEnv: 'GITPASSWORD'} \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st new file mode 100644 index 000000000..df8eef11d --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st @@ -0,0 +1,4 @@ +running +deleteBranch + + [self workingCopy repository gitRepository pushToRemote: 'origin' deleteRemoteBranches: {self branchName}] on: NeedGitCredentials do: [:e | e resume: self credentials]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st new file mode 100644 index 000000000..3de28e1a3 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st @@ -0,0 +1,4 @@ +accessing +otherCommit + + ^ self otherWorkingCopy loadedVersion commit \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st new file mode 100644 index 000000000..d429dc2bf --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st @@ -0,0 +1,4 @@ +accessing +otherReference + + ^ self reference , 'other' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st new file mode 100644 index 000000000..ec508a7d2 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st @@ -0,0 +1,4 @@ +accessing +otherWorkingCopy: aSquotWorkingCopy + + otherWorkingCopy := aSquotWorkingCopy. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st new file mode 100644 index 000000000..3e8a26865 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st @@ -0,0 +1,4 @@ +accessing +otherWorkingCopy + + ^ otherWorkingCopy \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st new file mode 100644 index 000000000..03f58aaee --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st @@ -0,0 +1,5 @@ +running +performTest + + [super performTest] + on: NeedGitCredentials do: [:e | e resume: self credentials]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st new file mode 100644 index 000000000..4cb49f8f5 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st @@ -0,0 +1,8 @@ +actions +pullOther + + "self otherWorkingCopy repository importFromUpstream: 'origin'." + [self browser + projectSelection: self otherWorkingCopy; + branchSelection: self branchName; + actionPull.] on: SquotSelectionOfChangesRequested do: [:e | e resume: e patch "select all"] \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st new file mode 100644 index 000000000..a34cb0fef --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st @@ -0,0 +1,8 @@ +actions +push + + "self workingCopy repository gitRepository push: {self branchName} toRemote: 'origin'." + self browser + projectSelection: self workingCopy; + branchSelection: self branchName; + actionPush. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st new file mode 100644 index 000000000..71482a808 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st @@ -0,0 +1,4 @@ +accessing +remoteURL + + ^ 'https://github.com/LeonBein/DummyRepository.git' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st index be64b2012..cc5e7f11e 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st @@ -1,12 +1,13 @@ running -setUp - +setUp + super setUp. - self reference: FileSystem memory / 'LBGitTests'. - self reference ensureDirectory. - self workingCopy: SquotWorkingCopy newOnObjectMemory. - self workingCopy - name: 'LBGitTestWorkingCopy'; - store: SquotImageStore new; - repository: (SquitRepository new initializeInDirectory: self reference ); - loadedHistorian: (self workingCopy repository historianNamed: 'master'). \ No newline at end of file + self + setUpAdditionalWorkingCopy; + suppressProgressDisplayDuring: [self + setUpRemoteFor: self workingCopy; + setUpRemoteFor: self otherWorkingCopy; + createBranch]. + self workingCopy register. + self otherWorkingCopy register. + self browser: LBGitSquitBrowserForTests new. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st new file mode 100644 index 000000000..57fb633e1 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st @@ -0,0 +1,4 @@ +running +setUpAdditionalWorkingCopy + + self otherWorkingCopy: (self makeWorkingCopyAt: self otherReference) \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st new file mode 100644 index 000000000..a5a8a8a0d --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st @@ -0,0 +1,12 @@ +running +setUpRemote + + | testsBranch newBranch gitRepository | + gitRepository := self workingCopy repository gitRepository. + self workingCopy repository cloneFrom: self remoteURL. + newBranch := self workingCopy repository historianNamed: self branchName. + testsBranch := self workingCopy repository historianNamed: 'tests'. + newBranch version: testsBranch version. + self workingCopy switchTo: newBranch. + gitRepository repository setUpstreamRemoteOfBranchNamed: self branchName to: 'origin'. + gitRepository repository setUpstreamRefOfBranchNamed: self branchName to: (gitRepository expandRemoteRef: self branchName). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st new file mode 100644 index 000000000..c30138772 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st @@ -0,0 +1,15 @@ +running +setUpRemoteFor: aWorkingCopy + + | testsBranch newBranch squitRepository actualRepository | + squitRepository := aWorkingCopy repository. + actualRepository := squitRepository gitRepository repository. + + squitRepository cloneFrom: self remoteURL. + squitRepository addCredentialsFor: self remoteURL user: self credentials first password: self credentials second. + newBranch := squitRepository historianNamed: self branchName. + testsBranch := squitRepository historianNamed: 'tests'. + newBranch version: testsBranch version. + aWorkingCopy switchTo: newBranch. + actualRepository setUpstreamRemoteOfBranchNamed: self branchName to: 'origin'. + actualRepository setUpstreamRefOfBranchNamed: self branchName to: (squitRepository gitRepository expandRemoteRef: self branchName). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st index 4c32dac72..b59c8945a 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st @@ -1,5 +1,8 @@ running -tearDown - - super tearDown. - self reference delete. \ No newline at end of file +tearDown + + self suppressProgressDisplayDuring: [self deleteBranch]. + self otherReference delete. + self workingCopy unregister. + self otherWorkingCopy unregister. + super tearDown. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st deleted file mode 100644 index 58eb70f82..000000000 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testCommitDeletesFile.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testCommitDeletesFile - - self - commitDummyFileAddition; - deleteDummyFile; - commit: 'Removed dummy file'; - deny: (self workingCopy loadedVersion commit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st new file mode 100644 index 000000000..f582b59bb --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st @@ -0,0 +1,18 @@ +tests +testMergeGenerated + + self flag: #TODO "To be readded". + self assert: true. +" + self + write: self dummyContents2 + to: self dummyFile2 + in: self otherReference. + self + commitOtherMessaged: 'Added dummy2'; + createDummyFile. + [self transferMessaged: 'Added dummy1'] on: Exception do: [:e | self halt: e. e resume.]. + + self + assert: (self otherCommit tree entries includesKey: self dummyFile); + assert: (self otherCommit tree entries includesKey: self dummyFile2)." \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st new file mode 100644 index 000000000..52e8cd5b7 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st @@ -0,0 +1,5 @@ +tests +testNoCheckoutNeeded + + + self assert: (self reference resolve: 'README.md') exists. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st new file mode 100644 index 000000000..afdc26b80 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st @@ -0,0 +1,7 @@ +tests +testOnOwnBranch + + + self + assert: self branchName + equals: self workingCopy loadedHistorian shortName \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st deleted file mode 100644 index 591f39cd9..000000000 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPokeTravis.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testPokeTravis - - self createDummyFile. - self assert: (self reference resolve: self dummyFile) exists. - self commit: 'TestXY'. - self assert: (self gitReference resolve: self dummyFile) exists. - self assert: 'TestXY' equals: self workingCopy loadedVersion commit message. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st new file mode 100644 index 000000000..aecd8e2b3 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st @@ -0,0 +1,8 @@ +tests +testPushAddsFile + + + self + createDummyFile; + transferMessaged: 'Created dummy file'. + self assert: (self otherReference resolve: self dummyFile) exists. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st new file mode 100644 index 000000000..1c229eb5a --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st @@ -0,0 +1,10 @@ +tests +testPushAddsFileContent + + + self + createDummyFile; + transferMessaged: 'Created dummy file'. + self + assert: self dummyContents + equals: (self otherReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st new file mode 100644 index 000000000..d33a7bf60 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st @@ -0,0 +1,8 @@ +tests +testPushAddsFileToTree + + + self + createDummyFile; + transferMessaged: 'Created dummy file'. + self assert: (self otherCommit tree entries includesKey: self dummyFile). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st new file mode 100644 index 000000000..611b9cc7d --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st @@ -0,0 +1,10 @@ +tests +testPushDeletedFile + + + self + createDummyFile; + transferMessaged: 'Created dummy file'; + deleteDummyFile; + transferMessaged: 'Deleted dummy file'. + self deny: (self otherReference resolve: self dummyFile) exists. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st new file mode 100644 index 000000000..1d46431b0 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st @@ -0,0 +1,12 @@ +tests +testPushUpdatesFile + + + self + createDummyFile; + transferMessaged: 'Created dummy file'; + writeToDummyFile: self dummyContents2; + transferMessaged: 'Updated dummy file'. + self + assert: self dummyContents2 + equals: (self otherReference resolve: self dummyFile) readStream ascii contents withSqueakLineEndings. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st new file mode 100644 index 000000000..f1c91b31c --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st @@ -0,0 +1,5 @@ +tests +testReadmeExists + + + self assert: (self commit tree entries includesKey: 'README.md'). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st new file mode 100644 index 000000000..54e3a418e --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st @@ -0,0 +1,5 @@ +tests +testSetupSuccess + + + self assert: true. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st new file mode 100644 index 000000000..67aee57f1 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st @@ -0,0 +1,7 @@ +actions +transferMessaged: aString + + self + commitMessaged: aString; + push; + pullOther. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st deleted file mode 100644 index 240017aef..000000000 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -workingCopy: anObject - - workingCopy := anObject. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st deleted file mode 100644 index 81bb1a621..000000000 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/writeToDummyFile..st +++ /dev/null @@ -1,6 +0,0 @@ -dummy file -writeToDummyFile: anObject - - (self reference resolve: self dummyFile) writeStream binary - nextPutAll: anObject asByteArray; - close. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index b1dea961a..3e5b48034 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -2,25 +2,34 @@ "class" : { }, "instance" : { - "commit:" : "LB 12/4/2018 13:43", - "commitDummyFileAddition" : "LB 12/4/2018 13:43", - "createDummyFile" : "LB 12/4/2018 13:49", - "deleteDummyFile" : "LB 12/4/2018 13:38", - "dummyContents" : "LB 12/4/2018 13:47", - "dummyContents2" : "LB 12/4/2018 13:47", - "dummyFile" : "LB 12/2/2018 13:56", - "gitReference" : "LB 12/4/2018 14:10", - "reference" : "LB 12/2/2018 13:40", - "reference:" : "LB 12/2/2018 13:40", - "setUp" : "LB 12/4/2018 14:33", - "tearDown" : "LB 12/2/2018 13:52", - "testCommitAddsFile" : "LB 12/7/2018 17:53", - "testCommitAddsFileContent" : "LB 12/4/2018 14:46", - "testCommitDeletesFile" : "LB 12/4/2018 13:43", - "testCommitUpdatesFile" : "LB 12/4/2018 14:44", - "testInitialTrackedFilesArtifact" : "LB 12/7/2018 17:53", - "testPokeTravis" : "LB 12/4/2018 17:23", - "testWorking" : "LB 12/2/2018 12:58", - "workingCopy" : "LB 12/2/2018 12:54", - "workingCopy:" : "LB 12/2/2018 12:54", - "writeToDummyFile:" : "LB 12/4/2018 13:49" } } + "branchName" : "LB 12/8/2018 13:32", + "browser" : "LB 12/8/2018 16:12", + "browser:" : "LB 12/8/2018 16:12", + "commitOtherMessaged:" : "LB 12/10/2018 09:50", + "createBranch" : "LB 12/8/2018 15:28", + "credentials" : "LB 12/13/2018 16:20", + "deleteBranch" : "LB 12/8/2018 14:42", + "otherCommit" : "LB 12/10/2018 09:48", + "otherReference" : "LB 12/8/2018 15:23", + "otherWorkingCopy" : "LB 12/8/2018 15:18", + "otherWorkingCopy:" : "LB 12/8/2018 15:18", + "performTest" : "LB 12/8/2018 15:52", + "pullOther" : "LB 12/13/2018 15:28", + "push" : "LB 12/8/2018 16:57", + "remoteURL" : "LB 12/8/2018 13:16", + "setUp" : "LB 12/8/2018 16:12", + "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", + "setUpRemote" : "LB 12/8/2018 15:31", + "setUpRemoteFor:" : "LB 12/8/2018 16:56", + "tearDown" : "LB 12/8/2018 17:35", + "testMergeGenerated" : "LB 12/13/2018 16:10", + "testNoCheckoutNeeded" : "LB 12/8/2018 17:20", + "testOnOwnBranch" : "LB 12/8/2018 15:53", + "testPushAddsFile" : "LB 12/8/2018 17:01", + "testPushAddsFileContent" : "LB 12/8/2018 17:04", + "testPushAddsFileToTree" : "LB 12/10/2018 09:48", + "testPushDeletedFile" : "LB 12/8/2018 17:02", + "testPushUpdatesFile" : "LB 12/8/2018 17:05", + "testReadmeExists" : "LB 12/8/2018 15:53", + "testSetupSuccess" : "LB 12/8/2018 16:59", + "transferMessaged:" : "LB 12/8/2018 15:46" } } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json index 98f672c7e..38a23ece6 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json @@ -2,16 +2,14 @@ "category" : "LBGit-Tests", "classinstvars" : [ ], - "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", "classvars" : [ ], "commentStamp" : "", "instvars" : [ - "workingCopy", - "reference" ], + "otherWorkingCopy", + "browser" ], "name" : "LBGitRemoteTests", "pools" : [ ], - "super" : "TestCase", - "traitcomposition" : "TTestCaseSuppressingProgressDisplay", + "super" : "LBGitTestCase", "type" : "normal" } diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st new file mode 100644 index 000000000..97c956617 --- /dev/null +++ b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st @@ -0,0 +1,4 @@ +accessing +projectSelection: anObject + + projectSelection := anObject. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st new file mode 100644 index 000000000..d70ee01b9 --- /dev/null +++ b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st @@ -0,0 +1,4 @@ +accessing +projectSelection + + ^ projectSelection \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json new file mode 100644 index 000000000..7525613e4 --- /dev/null +++ b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "projectSelection" : "LB 12/8/2018 16:11", + "projectSelection:" : "LB 12/8/2018 16:10" } } diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json new file mode 100644 index 000000000..f9393acff --- /dev/null +++ b/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "projectSelection" ], + "name" : "LBGitSquitBrowserForTests", + "pools" : [ + ], + "super" : "SquitBrowser", + "type" : "normal" } diff --git a/LBGit-Tests.package/LBGitTestCase.class/README.md b/LBGit-Tests.package/LBGitTestCase.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st b/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st new file mode 100644 index 000000000..e5babb67b --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st @@ -0,0 +1,4 @@ +accessing +commit + + ^ self workingCopy loadedVersion commit \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st b/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st similarity index 59% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st index ede179a5c..d01e92ba0 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitDummyFileAddition.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st @@ -2,4 +2,4 @@ dummy file commitDummyFileAddition self createDummyFile. - self commit: 'Added dummy file'. \ No newline at end of file + self commitMessaged: 'Added dummy file'. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commit..st b/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st similarity index 67% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/commit..st rename to LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st index 814ef7bfb..4b96930d5 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commit..st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st @@ -1,5 +1,5 @@ -as yet unclassified -commit: aString +actions +commitMessaged: aString self workingCopy saveNewVersionMessage: aString diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/createDummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/createDummyFile.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteDummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteDummyFile.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st similarity index 61% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st index 15b675581..cb684efe6 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st @@ -1,4 +1,5 @@ dummy file dummyContents - ^ 'Test Data' \ No newline at end of file + ^ 'Test + Data' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents2.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyContents2.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/dummyFile.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st new file mode 100644 index 000000000..fa9b60ce2 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st @@ -0,0 +1,4 @@ +dummy file +dummyFile2 + + ^ 'dummy2.file' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/gitReference.st b/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/gitReference.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st b/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st new file mode 100644 index 000000000..a2378eb9d --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st @@ -0,0 +1,10 @@ +running +makeWorkingCopyAt: aReference + + | repository | + repository := SquitRepository new initializeInDirectory: aReference. + ^ SquotWorkingCopy newOnObjectMemory + name: 'LBGitTestWorkingCopy'; + store: SquotImageStore new; + repository: repository; + loadedHistorian: (repository historianNamed: 'master'). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st b/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st new file mode 100644 index 000000000..d2befabb6 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st @@ -0,0 +1,3 @@ +running +performTest + self suppressProgressDisplayDuring: [^ super performTest] \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/reference..st b/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/reference..st rename to LBGit-Tests.package/LBGitTestCase.class/instance/reference..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/reference.st b/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/reference.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/reference.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st b/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st new file mode 100644 index 000000000..4d34a8e88 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st @@ -0,0 +1,7 @@ +running +setUp + + super setUp. + self reference: FileSystem memory / self class name. + self reference ensureDirectory. + self workingCopy: (self makeWorkingCopyAt: self reference). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st b/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st new file mode 100644 index 000000000..6cb64b927 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st @@ -0,0 +1,9 @@ +progress suppressing +suppressProgressDisplayDuring: aBlock + ^ aBlock + on: ProgressInitiationException do: [:e | + e isNested + ifTrue: [e pass] + ifFalse: [e rearmHandlerDuring: + [[e sendNotificationsTo: [:min :max :current | "silence"]] + on: ProgressNotification do: [:notification | notification resume]]]] \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st b/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st new file mode 100644 index 000000000..1b17db211 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st @@ -0,0 +1,5 @@ +running +tearDown + + self reference delete. + super tearDown. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st b/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st new file mode 100644 index 000000000..175b4409a --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st @@ -0,0 +1,4 @@ +accessing +workingCopy: aSquotWorkingCopy + + workingCopy := aSquotWorkingCopy. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy.st b/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/workingCopy.st rename to LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st b/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st new file mode 100644 index 000000000..a91a53a79 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st @@ -0,0 +1,6 @@ +actions +write: anObject to: aString in: aReference + + (aReference resolve: aString) writeStream binary + nextPutAll: anObject asByteArray; + close. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st b/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st new file mode 100644 index 000000000..a7bf3196a --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st @@ -0,0 +1,7 @@ +dummy file +writeToDummyFile: anObject + + self + write: anObject + to: self dummyFile + in: self reference. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json new file mode 100644 index 000000000..f0621e38e --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json @@ -0,0 +1,25 @@ +{ + "class" : { + }, + "instance" : { + "commit" : "LB 12/8/2018 13:13", + "commitDummyFileAddition" : "LB 12/8/2018 13:05", + "commitMessaged:" : "LB 12/8/2018 13:05", + "createDummyFile" : "LB 12/4/2018 13:49", + "deleteDummyFile" : "LB 12/4/2018 13:38", + "dummyContents" : "LB 12/8/2018 13:03", + "dummyContents2" : "LB 12/4/2018 13:47", + "dummyFile" : "LB 12/2/2018 13:56", + "dummyFile2" : "LB 12/10/2018 09:47", + "gitReference" : "LB 12/4/2018 14:10", + "makeWorkingCopyAt:" : "LB 12/8/2018 15:15", + "performTest" : "", + "reference" : "LB 12/2/2018 13:40", + "reference:" : "LB 12/2/2018 13:40", + "setUp" : "LB 12/8/2018 15:15", + "suppressProgressDisplayDuring:" : "", + "tearDown" : "LB 12/8/2018 14:37", + "workingCopy" : "LB 12/2/2018 12:54", + "workingCopy:" : "LB 12/8/2018 13:45", + "write:to:in:" : "LB 12/10/2018 09:44", + "writeToDummyFile:" : "LB 12/10/2018 09:45" } } diff --git a/LBGit-Tests.package/LBGitTestCase.class/properties.json b/LBGit-Tests.package/LBGitTestCase.class/properties.json new file mode 100644 index 000000000..c4689ac80 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "workingCopy", + "reference" ], + "name" : "LBGitTestCase", + "pools" : [ + ], + "super" : "TestCase", + "traitcomposition" : "TTestCaseSuppressingProgressDisplay", + "type" : "normal" } From ff7a7fcd1f61438337ccbd4a83139a24631fed2c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 13 Dec 2018 16:36:07 +0100 Subject: [PATCH 109/170] Git credentials --- .../LBGitFilesArtifact.class/instance/storeInfo.st | 4 ++++ .../LBGitFilesArtifact.class/methodProperties.json | 1 + .../LBGitRemoteTests.class/instance/credentials.st | 4 ++-- .../LBGitRemoteTests.class/methodProperties.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st new file mode 100644 index 000000000..38c4b7093 --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st @@ -0,0 +1,4 @@ +as yet unclassified +storeInfo + + ^ Dictionary new \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 044c718e0..c316f4db1 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -17,6 +17,7 @@ "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 12/4/2018 14:32", + "storeInfo" : "LB 12/13/2018 16:25", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st index 6ac1bee2d..ff725743f 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st @@ -1,5 +1,5 @@ accessing credentials - ^ {SmalltalkCI getEnv: 'GITUSERNAME'. - SmalltalkCI getEnv: 'GITPASSWORD'} \ No newline at end of file + ^ {(SmalltalkCI getEnv: 'GITUSERNAME') ifNil: [NeedGitCredentials new signal]. + (SmalltalkCI getEnv: 'GITPASSWORD') ifNil: [NeedGitCredentials new signal]} \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 3e5b48034..7353e7a35 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -7,7 +7,7 @@ "browser:" : "LB 12/8/2018 16:12", "commitOtherMessaged:" : "LB 12/10/2018 09:50", "createBranch" : "LB 12/8/2018 15:28", - "credentials" : "LB 12/13/2018 16:20", + "credentials" : "LB 12/13/2018 16:35", "deleteBranch" : "LB 12/8/2018 14:42", "otherCommit" : "LB 12/10/2018 09:48", "otherReference" : "LB 12/8/2018 15:23", From c9c9f366645464e1985bc08d3b143c33ba1a8d28 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 13 Dec 2018 17:02:11 +0100 Subject: [PATCH 110/170] Allowing backsaving ... probably --- .../LBGitFileListDiff.class/instance/workingDirectory.st | 2 +- .../LBGitFileListDiff.class/methodProperties.json | 2 +- .../LBGitFilesArtifact.class/instance/workingDirectory.st | 4 ++++ .../LBGitFilesArtifact.class/methodProperties.json | 3 ++- .../LBGitLiveFilesArtifact.class/instance/workingDirectory.st | 4 ++++ .../LBGitLiveFilesArtifact.class/methodProperties.json | 3 ++- .../instance/workingDirectory.st | 4 ++++ .../LBGitRecordedFilesArtifact.class/methodProperties.json | 3 ++- 8 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st create mode 100644 LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st create mode 100644 LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st index 00210ea1e..cc92ecd6c 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st @@ -1,4 +1,4 @@ as yet unclassified workingDirectory - ^ self right rootDirectory fileSystem repository repository instVarNamed: #reference \ No newline at end of file + ^ self right workingDirectory \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 318f6d7af..51247fd22 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -52,5 +52,5 @@ "targetReferenceOn:" : "LB 11/25/2018 16:46", "topNodes" : "LB 11/23/2018 15:22", "updateFile:" : "LB 11/23/2018 18:56", - "workingDirectory" : "LB 11/26/2018 15:35", + "workingDirectory" : "LB 12/13/2018 17:01", "workingReferenceOn:" : "LB 11/22/2018 15:29" } } diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..2115cda3e --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self shouldBeImplemented \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index c316f4db1..aa267f977 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -20,4 +20,5 @@ "storeInfo" : "LB 12/13/2018 16:25", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", - "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11" } } + "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11", + "workingDirectory" : "LB 12/13/2018 17:00" } } diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..bf8a7e4ad --- /dev/null +++ b/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self rootDirectory \ No newline at end of file diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index 8119efdcd..22075b43c 100644 --- a/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -11,4 +11,5 @@ "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", - "storeWith:" : "LB 12/4/2018 14:58" } } + "storeWith:" : "LB 12/4/2018 14:58", + "workingDirectory" : "LB 12/13/2018 17:01" } } diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..74c9d3f68 --- /dev/null +++ b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self rootDirectory fileSystem repository repository workingDir \ No newline at end of file diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json index b43f4c16e..baceea878 100644 --- a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -8,4 +8,5 @@ "diffAgainst:" : "LB 11/25/2018 14:06", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/26/2018 16:15", - "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08" } } + "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08", + "workingDirectory" : "LB 12/13/2018 17:01" } } From 7792999fdc475d29c8fa961d867908815c004042 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 13 Dec 2018 17:53:09 +0100 Subject: [PATCH 111/170] Added token and small fix --- .../LBGitFileListDiff.class/instance/asDiffTree.st | 7 +++++++ .../LBGitFileListDiff.class/methodProperties.json | 1 + .../LBGitRemoteTests.class/instance/branchName.st | 2 +- .../LBGitRemoteTests.class/instance/generateToken.st | 5 +++++ .../LBGitRemoteTests.class/instance/initialize.st | 5 +++++ .../LBGitRemoteTests.class/instance/token..st | 4 ++++ .../LBGitRemoteTests.class/instance/token.st | 4 ++++ .../LBGitRemoteTests.class/methodProperties.json | 6 +++++- LBGit-Tests.package/LBGitRemoteTests.class/properties.json | 3 ++- 9 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st new file mode 100644 index 000000000..bd1736237 --- /dev/null +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st @@ -0,0 +1,7 @@ +as yet unclassified +asDiffTree + + ^ SquotDiffNode + title: LBGitFilesArtifact path + content: self + children: self topNodes \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 51247fd22..a932c9910 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -7,6 +7,7 @@ "added:" : "LB 11/22/2018 11:17", "adjustedBy:" : "LB 11/26/2018 16:04", "applyToContainer:" : "LB 11/26/2018 16:06", + "asDiffTree" : "LB 12/13/2018 17:42", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 11/26/2018 18:05", "deleteFile:" : "LB 11/25/2018 15:55", diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st index eeaf5b96e..2db9b0b59 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st @@ -1,4 +1,4 @@ accessing branchName - ^ self class name , '_' , testSelector \ No newline at end of file + ^ self class name , '_' , testSelector , '_' , self token \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st new file mode 100644 index 000000000..915c05b75 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st @@ -0,0 +1,5 @@ +as yet unclassified +generateToken + + + self token: (String new asAlphaNumeric: 10 extraChars: {} mergeUID: 0). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st new file mode 100644 index 000000000..a4bfa2997 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st @@ -0,0 +1,5 @@ +as yet unclassified +initialize + + super initialize. + self generateToken. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st new file mode 100644 index 000000000..b4f9d1349 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st @@ -0,0 +1,4 @@ +accessing +token: anObject + + token := anObject. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st new file mode 100644 index 000000000..3b43bb263 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st @@ -0,0 +1,4 @@ +accessing +token + + ^ token \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 7353e7a35..043f73c8c 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -2,13 +2,15 @@ "class" : { }, "instance" : { - "branchName" : "LB 12/8/2018 13:32", + "branchName" : "LB 12/13/2018 17:42", "browser" : "LB 12/8/2018 16:12", "browser:" : "LB 12/8/2018 16:12", "commitOtherMessaged:" : "LB 12/10/2018 09:50", "createBranch" : "LB 12/8/2018 15:28", "credentials" : "LB 12/13/2018 16:35", "deleteBranch" : "LB 12/8/2018 14:42", + "generateToken" : "LB 12/13/2018 17:50", + "initialize" : "LB 12/13/2018 17:36", "otherCommit" : "LB 12/10/2018 09:48", "otherReference" : "LB 12/8/2018 15:23", "otherWorkingCopy" : "LB 12/8/2018 15:18", @@ -32,4 +34,6 @@ "testPushUpdatesFile" : "LB 12/8/2018 17:05", "testReadmeExists" : "LB 12/8/2018 15:53", "testSetupSuccess" : "LB 12/8/2018 16:59", + "token" : "LB 12/13/2018 17:34", + "token:" : "LB 12/13/2018 17:34", "transferMessaged:" : "LB 12/8/2018 15:46" } } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json index 38a23ece6..0d9eaf05c 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json @@ -7,7 +7,8 @@ "commentStamp" : "", "instvars" : [ "otherWorkingCopy", - "browser" ], + "browser", + "token" ], "name" : "LBGitRemoteTests", "pools" : [ ], From 441cecbc1ca2d56b72d1aac8e75ed75f903bf76d Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 24 Jan 2019 10:28:33 +0100 Subject: [PATCH 112/170] Replaced method for the merging of two replacement diffs, it caused an error when trying to merge two FileLists with a base --- .../instance/mergeWithDiff..st | 5 +++++ .../LBGitArtifactReplacementDiff.class/methodProperties.json | 1 + 2 files changed, 6 insertions(+) create mode 100644 LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st new file mode 100644 index 000000000..bc360d4ed --- /dev/null +++ b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st @@ -0,0 +1,5 @@ +as yet unclassified +mergeWithDiff: anArtifactDiff + + self assert: (anArtifactDiff isKindOf: self class). + ^ anArtifactDiff right diffAgainst: self right \ No newline at end of file diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json index ba51bc71f..1f279a081 100644 --- a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json @@ -3,4 +3,5 @@ }, "instance" : { "applyToContainer:" : "LB 11/20/2018 15:06", + "mergeWithDiff:" : "LB 1/24/2019 10:24", "squotChangeAsStringOrText" : "LB 11/20/2018 15:04" } } From d09aeb409815d9f5b584d6dc8ebb3640c48f5005 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Thu, 24 Jan 2019 10:48:24 +0100 Subject: [PATCH 113/170] This should fix the error of #22 --- .../LBGitFileListDiff.class/instance/createFile..st | 1 + .../LBGitFileListDiff.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st index 6332aed0d..e4d6aec13 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st @@ -10,6 +10,7 @@ createFile: aPath inputStream := sourceReference readStream binary. content := inputStream contents. inputStream close. + targetReference parent ensureDirectory. targetReference writeStream binary nextPutAll: content; close. "targetReference fileSystem copyFrom: inputStream to: targetReference path. inputStream close." \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index a932c9910..c7c3e39cd 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -9,7 +9,7 @@ "applyToContainer:" : "LB 11/26/2018 16:06", "asDiffTree" : "LB 12/13/2018 17:42", "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 11/26/2018 18:05", + "createFile:" : "LB 1/24/2019 10:47", "deleteFile:" : "LB 11/25/2018 15:55", "diff:against:" : "LB 11/26/2018 16:06", "diffAdded" : "LB 11/23/2018 18:52", From 0c7fa7c174997724be833a716d61010798736d70 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 13 Feb 2019 13:49:07 +0100 Subject: [PATCH 114/170] Added merge test; modified commit dialog by adding a signal. This is done i.O. to answer the request before opening a dialog. --- .../saveNewVersionFromPatch.ifCanceled..st | 36 +++++++++++++++++++ .../methodProperties.json | 3 +- .../instance/testMergeGenerated.st | 9 ++--- .../methodProperties.json | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st new file mode 100644 index 000000000..1afceef82 --- /dev/null +++ b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st @@ -0,0 +1,36 @@ +*LBGit-Extensions +saveNewVersionFromPatch: aPatch ifCanceled: cancelBlock + | selectedPatch message newVersion capturedArtifacts | + self flag: #TODO. "Create new signal for this?" + (SquotSelectionOfChangesRequested new + patch: aPatch; + title: ''; + signal) + ifNotNil: [:signalSelectedPatch | + selectedPatch := signalSelectedPatch. + message := SquotInitialLogMessageRequested new signal ifNil: 'Empty commit message'.] + ifNil: [| tool | + tool := SquotSaveVersionDialog new + parentVersions: self parentVersions; + patch: aPatch; + controllerForIgnores: self; + yourself. + tool requestSelectedChangesWithTitle: 'Select changes and message for the new version'. + tool accepted ifFalse: [^ cancelBlock value]. + selectedPatch := tool selectedPatch. + message := tool message.]. + [self handlePathChangesDuring: + [newVersion := loadedHistorian createNewVersionFromPatch: selectedPatch + with: [:version | version + message: message asString; + author: self defaultAuthor. + version parents: self parentVersions. + self shouldNotStoreMetadata ifTrue: [version doNotStoreMetadata]]]] + on: SquotArtifactsWereCaptured + doAndResume: [:captured | capturedArtifacts := captured artifacts]. + self loadedVersion: newVersion. + self cacheSavedArtifacts: (capturedArtifacts ifNil: [Dictionary new]). + self resetAdditionalParents. + previousSnapshot := nil. + previousVersionId := newVersion internalId. + self cacheNewMonticelloVersions: selectedPatch message: message. \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json b/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json index d5b0675ed..be552c79d 100644 --- a/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json +++ b/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json @@ -2,4 +2,5 @@ "class" : { }, "instance" : { - "loadOrder" : "LB 12/7/2018 18:15" } } + "loadOrder" : "LB 12/7/2018 18:15", + "saveNewVersionFromPatch:ifCanceled:" : "LB 2/13/2019 13:43" } } diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st index f582b59bb..261786baa 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st @@ -1,9 +1,7 @@ tests testMergeGenerated - self flag: #TODO "To be readded". - self assert: true. -" + self write: self dummyContents2 to: self dummyFile2 @@ -11,8 +9,7 @@ testMergeGenerated self commitOtherMessaged: 'Added dummy2'; createDummyFile. - [self transferMessaged: 'Added dummy1'] on: Exception do: [:e | self halt: e. e resume.]. - + self transferMessaged: 'Added dummy1'. self assert: (self otherCommit tree entries includesKey: self dummyFile); - assert: (self otherCommit tree entries includesKey: self dummyFile2)." \ No newline at end of file + assert: (self otherCommit tree entries includesKey: self dummyFile2). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 043f73c8c..8a5f707d2 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -24,7 +24,7 @@ "setUpRemote" : "LB 12/8/2018 15:31", "setUpRemoteFor:" : "LB 12/8/2018 16:56", "tearDown" : "LB 12/8/2018 17:35", - "testMergeGenerated" : "LB 12/13/2018 16:10", + "testMergeGenerated" : "LB 2/13/2019 13:38", "testNoCheckoutNeeded" : "LB 12/8/2018 17:20", "testOnOwnBranch" : "LB 12/8/2018 15:53", "testPushAddsFile" : "LB 12/8/2018 17:01", From 9ab536d41cf606d0bd51f5ae8e5bfe6dcc315f50 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 13 Feb 2019 14:10:05 +0100 Subject: [PATCH 115/170] Update README.md Trigger new build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a347cd9a..9222e711b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SmalltalkGitTesting +# SmalltalkGitTesting You can load it by: ```smalltalk From 15402761f8ee37b7c0fe53606025640b0ede9be2 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 13 Feb 2019 14:21:20 +0100 Subject: [PATCH 116/170] Try again to trigger build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9222e711b..9a347cd9a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SmalltalkGitTesting +# SmalltalkGitTesting You can load it by: ```smalltalk From 200b9081ece32f023b08e981fb3c25c044e403e9 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 13 Feb 2019 15:20:26 +0100 Subject: [PATCH 117/170] Closes #22 * Removed some dots after returns --- .../instance/squotChangeAsStringOrText.st | 2 +- .../methodProperties.json | 2 +- .../LBGitFileListDiff.class/class/empty.st | 2 +- .../instance/gitReferenceOn..st | 2 +- .../instance/leftReferenceOn..st | 2 +- .../LBGitFileListDiff.class/instance/mergeWith..st | 10 ++++++---- .../instance/rightReferenceOn..st | 2 +- .../instance/workingReferenceOn..st | 2 +- .../LBGitFileListDiff.class/methodProperties.json | 12 ++++++------ .../instance/hasChangesTo..st | 2 +- .../LBGitFileMetadata.class/methodProperties.json | 2 +- .../instance/testMergeGenerated.st | 4 ++-- .../instance/testPushAddsFileInNewFolder.st | 12 ++++++++++++ .../LBGitRemoteTests.class/methodProperties.json | 3 ++- .../LBGitTestCase.class/instance/write.to.in..st | 5 ++++- .../LBGitTestCase.class/methodProperties.json | 2 +- 16 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st index 6cf1745f8..e70f7ecad 100644 --- a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st +++ b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st @@ -2,4 +2,4 @@ as yet unclassified squotChangeAsStringOrText ^ 'Removed: ', right,' - added: ', left. \ No newline at end of file + added: ', left \ No newline at end of file diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json index 1f279a081..3b3603a63 100644 --- a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json @@ -4,4 +4,4 @@ "instance" : { "applyToContainer:" : "LB 11/20/2018 15:06", "mergeWithDiff:" : "LB 1/24/2019 10:24", - "squotChangeAsStringOrText" : "LB 11/20/2018 15:04" } } + "squotChangeAsStringOrText" : "LB 2/13/2019 14:04" } } diff --git a/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st b/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st index a002b5974..a650626ce 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st +++ b/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st @@ -2,4 +2,4 @@ as yet unclassified empty ^ self new - diffs: Array empty. \ No newline at end of file + diffs: Array empty \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st index f11352d44..3f1b3e127 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st @@ -1,4 +1,4 @@ as yet unclassified gitReferenceOn: aPath - ^ self rightReferenceOn: aPath. \ No newline at end of file + ^ self rightReferenceOn: aPath \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st index 4010f4f10..8f039e089 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st @@ -1,4 +1,4 @@ as yet unclassified leftReferenceOn: aPath - ^ self left rootDirectory resolve: aPath. \ No newline at end of file + ^ self left rootDirectory resolve: aPath \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st index 79f8d171b..6a1198c0a 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st @@ -4,10 +4,12 @@ mergeWith: otherFileListDiff | commonPaths resultingDiffs | resultingDiffs := OrderedCollection new. commonPaths := self diffPaths intersection: otherFileListDiff diffPaths. - resultingDiffs addAll: (self diffs reject: [:each | commonPaths includes: each path]). - resultingDiffs addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]). - resultingDiffs addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). + resultingDiffs + addAll: (self diffs reject: [:each | commonPaths includes: each path]); + addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]); + addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). ^ LBGitFileListDiff new left: self right; right: otherFileListDiff right; - diffs: resultingDiffs \ No newline at end of file + diffs: resultingDiffs; + yourself \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st index 0137204aa..b9b821fc2 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st @@ -1,4 +1,4 @@ as yet unclassified rightReferenceOn: aPath - ^ self right rootDirectory resolve: aPath. \ No newline at end of file + ^ self right rootDirectory resolve: aPath \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st index cf78fce29..b60611903 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st @@ -3,4 +3,4 @@ workingReferenceOn: aPath | workingReference | workingReference := self left rootDirectory fileSystem repository repository instVarNamed: #reference. - ^ workingReference resolve: aPath. \ No newline at end of file + ^ workingReference resolve: aPath \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index c7c3e39cd..23e7b2b1d 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "empty" : "LB 11/25/2018 14:13", + "empty" : "LB 2/13/2019 14:04", "left:right:" : "LB 11/26/2018 16:06" }, "instance" : { "added" : "LB 11/22/2018 11:17", @@ -19,7 +19,7 @@ "diffRemoved" : "LB 11/23/2018 18:52", "diffs" : "LB 11/23/2018 15:18", "diffs:" : "LB 11/23/2018 15:18", - "gitReferenceOn:" : "LB 11/23/2018 16:31", + "gitReferenceOn:" : "LB 2/13/2019 14:04", "hasChanges" : "LB 12/8/2018 14:18", "hasConflicts" : "LB 12/8/2018 14:18", "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", @@ -28,8 +28,8 @@ "isRemoval" : "LB 12/7/2018 18:24", "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", - "leftReferenceOn:" : "LB 11/23/2018 16:31", - "mergeWith:" : "LB 11/26/2018 16:06", + "leftReferenceOn:" : "LB 2/13/2019 14:04", + "mergeWith:" : "LB 2/13/2019 14:05", "mergeWithRemoval:" : "LB 11/22/2018 12:19", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", @@ -40,7 +40,7 @@ "removed:" : "LB 11/22/2018 11:17", "right" : "LB 11/22/2018 11:14", "right:" : "LB 11/22/2018 11:14", - "rightReferenceOn:" : "LB 11/23/2018 16:31", + "rightReferenceOn:" : "LB 2/13/2019 14:04", "sourceReferenceOn:" : "LB 11/25/2018 15:56", "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", "squotHasChanges" : "LB 11/23/2018 15:24", @@ -54,4 +54,4 @@ "topNodes" : "LB 11/23/2018 15:22", "updateFile:" : "LB 11/23/2018 18:56", "workingDirectory" : "LB 12/13/2018 17:01", - "workingReferenceOn:" : "LB 11/22/2018 15:29" } } + "workingReferenceOn:" : "LB 2/13/2019 14:04" } } diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st index ea47dbe2e..d26c3c250 100644 --- a/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st +++ b/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st @@ -3,4 +3,4 @@ hasChangesTo: otherFileMetaData (self gitChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. (self contentChangesTo: otherFileMetaData) ifNotNil: [:result | ^ result]. - ^ false. \ No newline at end of file + ^ false \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json b/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json index b9341b462..9dd4270cf 100644 --- a/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json @@ -6,7 +6,7 @@ "contents" : "LB 11/25/2018 17:29", "entryHash" : "LB 11/25/2018 15:14", "gitChangesTo:" : "LB 11/25/2018 17:02", - "hasChangesTo:" : "LB 11/25/2018 17:27", + "hasChangesTo:" : "LB 2/13/2019 14:04", "path" : "LB 11/25/2018 15:29", "path:" : "LB 11/25/2018 15:29", "treeEntry" : "LB 11/25/2018 15:14", diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st index 261786baa..f3273f26b 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st @@ -11,5 +11,5 @@ testMergeGenerated createDummyFile. self transferMessaged: 'Added dummy1'. self - assert: (self otherCommit tree entries includesKey: self dummyFile); - assert: (self otherCommit tree entries includesKey: self dummyFile2). \ No newline at end of file + assert: (self otherCommit tree includesEntryNamed: self dummyFile); + assert: (self otherCommit tree includesEntryNamed: self dummyFile2). \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st new file mode 100644 index 000000000..ff0a05d20 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st @@ -0,0 +1,12 @@ +tests +testPushAddsFileInNewFolder + + + | folder | + folder := 'subfolder/'. + self + write: self dummyContents2 + to: folder, self dummyFile2 + in: self otherReference; + transferMessaged: 'Created dummy file in subfolder'. + self assert: (self otherReference resolve: folder, self dummyFile2) exists. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 8a5f707d2..bfc323065 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -24,11 +24,12 @@ "setUpRemote" : "LB 12/8/2018 15:31", "setUpRemoteFor:" : "LB 12/8/2018 16:56", "tearDown" : "LB 12/8/2018 17:35", - "testMergeGenerated" : "LB 2/13/2019 13:38", + "testMergeGenerated" : "LB 2/13/2019 15:10", "testNoCheckoutNeeded" : "LB 12/8/2018 17:20", "testOnOwnBranch" : "LB 12/8/2018 15:53", "testPushAddsFile" : "LB 12/8/2018 17:01", "testPushAddsFileContent" : "LB 12/8/2018 17:04", + "testPushAddsFileInNewFolder" : "LB 2/13/2019 15:10", "testPushAddsFileToTree" : "LB 12/10/2018 09:48", "testPushDeletedFile" : "LB 12/8/2018 17:02", "testPushUpdatesFile" : "LB 12/8/2018 17:05", diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st b/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st index a91a53a79..557ed46f9 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st @@ -1,6 +1,9 @@ actions write: anObject to: aString in: aReference - (aReference resolve: aString) writeStream binary + | file | + file := (aReference resolve: aString). + file parent ensureDirectory. + file writeStream binary nextPutAll: anObject asByteArray; close. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json index f0621e38e..e703115ea 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json @@ -21,5 +21,5 @@ "tearDown" : "LB 12/8/2018 14:37", "workingCopy" : "LB 12/2/2018 12:54", "workingCopy:" : "LB 12/8/2018 13:45", - "write:to:in:" : "LB 12/10/2018 09:44", + "write:to:in:" : "LB 2/13/2019 15:02", "writeToDummyFile:" : "LB 12/10/2018 09:45" } } From afba177978d88a335c596c101c74f0296a183a34 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 13 Feb 2019 16:34:21 +0100 Subject: [PATCH 118/170] Starting attempt to minimize travis flaky tests --- .../LBGitRemoteTests.class/instance/performTest.st | 3 ++- .../LBGitRemoteTests.class/instance/retryTest.st | 4 ++++ .../LBGitRemoteTests.class/methodProperties.json | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st index 03f58aaee..e8c2bcd46 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st @@ -2,4 +2,5 @@ running performTest [super performTest] - on: NeedGitCredentials do: [:e | e resume: self credentials]. \ No newline at end of file + on: NeedGitCredentials do: [:e | e resume: self credentials] + on: ConnectionTimedOut do: [:e | self fail: e]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st new file mode 100644 index 000000000..f4e23ebc4 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st @@ -0,0 +1,4 @@ +running +retryTest + + self flag: #TODO. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index bfc323065..069e5d7c1 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -15,10 +15,11 @@ "otherReference" : "LB 12/8/2018 15:23", "otherWorkingCopy" : "LB 12/8/2018 15:18", "otherWorkingCopy:" : "LB 12/8/2018 15:18", - "performTest" : "LB 12/8/2018 15:52", + "performTest" : "LB 2/13/2019 16:29", "pullOther" : "LB 12/13/2018 15:28", "push" : "LB 12/8/2018 16:57", "remoteURL" : "LB 12/8/2018 13:16", + "retryTest" : "LB 2/13/2019 16:28", "setUp" : "LB 12/8/2018 16:12", "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", "setUpRemote" : "LB 12/8/2018 15:31", From f3cb7ebf61026105674429a6f1766bd9641cb64c Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 13 Feb 2019 16:55:30 +0100 Subject: [PATCH 119/170] Adding retry mechanism in order to dampen travis flaky tests on connection timeout --- .../LBGitRemoteTests.class/instance/initialize.st | 3 ++- .../LBGitRemoteTests.class/instance/performTest.st | 5 ++++- .../LBGitRemoteTests.class/instance/remainingAttempts..st | 4 ++++ .../LBGitRemoteTests.class/instance/remainingAttempts.st | 4 ++++ .../LBGitRemoteTests.class/instance/retryTest.st | 5 ++++- .../LBGitRemoteTests.class/methodProperties.json | 8 +++++--- .../LBGitRemoteTests.class/properties.json | 3 ++- 7 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st index a4bfa2997..9933e848a 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st @@ -2,4 +2,5 @@ as yet unclassified initialize super initialize. - self generateToken. \ No newline at end of file + self generateToken. + self remainingAttempts: 2. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st index e8c2bcd46..525a3c20e 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st @@ -3,4 +3,7 @@ performTest [super performTest] on: NeedGitCredentials do: [:e | e resume: self credentials] - on: ConnectionTimedOut do: [:e | self fail: e]. \ No newline at end of file + on: ConnectionTimedOut do: [:e | + self remainingAttempts strictlyPositive + ifTrue: [self fail: e] + ifFalse: [self retryTest]]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st new file mode 100644 index 000000000..be5bd8c60 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st @@ -0,0 +1,4 @@ +accessing +remainingAttempts: anObject + + remainingAttempts := anObject. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st new file mode 100644 index 000000000..7910dbf67 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st @@ -0,0 +1,4 @@ +accessing +remainingAttempts + + ^ remainingAttempts \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st index f4e23ebc4..f756a9806 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st @@ -1,4 +1,7 @@ running retryTest - self flag: #TODO. \ No newline at end of file + self remainingAttempts: self remainingAttempts - 1. + 5 seconds wait a Delay. + Transcript show: 'Retrying test ', self class name, testSelector. + self performTest. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 069e5d7c1..ef0e84f5e 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -10,16 +10,18 @@ "credentials" : "LB 12/13/2018 16:35", "deleteBranch" : "LB 12/8/2018 14:42", "generateToken" : "LB 12/13/2018 17:50", - "initialize" : "LB 12/13/2018 17:36", + "initialize" : "LB 2/13/2019 16:51", "otherCommit" : "LB 12/10/2018 09:48", "otherReference" : "LB 12/8/2018 15:23", "otherWorkingCopy" : "LB 12/8/2018 15:18", "otherWorkingCopy:" : "LB 12/8/2018 15:18", - "performTest" : "LB 2/13/2019 16:29", + "performTest" : "LB 2/13/2019 16:45", "pullOther" : "LB 12/13/2018 15:28", "push" : "LB 12/8/2018 16:57", + "remainingAttempts" : "LB 2/13/2019 16:44", + "remainingAttempts:" : "LB 2/13/2019 16:44", "remoteURL" : "LB 12/8/2018 13:16", - "retryTest" : "LB 2/13/2019 16:28", + "retryTest" : "LB 2/13/2019 16:48", "setUp" : "LB 12/8/2018 16:12", "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", "setUpRemote" : "LB 12/8/2018 15:31", diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json index 0d9eaf05c..5ad46cad2 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/properties.json @@ -8,7 +8,8 @@ "instvars" : [ "otherWorkingCopy", "browser", - "token" ], + "token", + "remainingAttempts" ], "name" : "LBGitRemoteTests", "pools" : [ ], From 931bbce4854af841de1baf7ecfe87724a1f00757 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Wed, 13 Feb 2019 17:02:17 +0100 Subject: [PATCH 120/170] Trying different error type --- .../LBGitRemoteTests.class/instance/performTest.st | 2 +- .../LBGitRemoteTests.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st index 525a3c20e..604086b1c 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st @@ -3,7 +3,7 @@ performTest [super performTest] on: NeedGitCredentials do: [:e | e resume: self credentials] - on: ConnectionTimedOut do: [:e | + on: ConnectionClosed do: [:e | self remainingAttempts strictlyPositive ifTrue: [self fail: e] ifFalse: [self retryTest]]. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index ef0e84f5e..4e8ee3c27 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -15,7 +15,7 @@ "otherReference" : "LB 12/8/2018 15:23", "otherWorkingCopy" : "LB 12/8/2018 15:18", "otherWorkingCopy:" : "LB 12/8/2018 15:18", - "performTest" : "LB 2/13/2019 16:45", + "performTest" : "LB 2/13/2019 17:02", "pullOther" : "LB 12/13/2018 15:28", "push" : "LB 12/8/2018 16:57", "remainingAttempts" : "LB 2/13/2019 16:44", From 7879eecbf3ea631fde08b5f936cea23dcbf95a65 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 24 Feb 2019 14:50:29 +0100 Subject: [PATCH 121/170] (Re-)added lbgit packages to .squot --- .squot | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.squot b/.squot index a65546990..e1ff9b1fc 100644 --- a/.squot +++ b/.squot @@ -14,5 +14,9 @@ OrderedDictionary { 'src\/FS-Tests-Memory.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-AnsiStreams.package' : #SquotCypressCodeSerializer, - 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer -} \ No newline at end of file + 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer, + 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, + 'LBGit-Core.package' : #SquotCypressCodeSerializer, + 'LBGit-Extensions.package' : #SquotCypressCodeSerializer, + 'LBGit-Tests.package' : #SquotCypressCodeSerializer +} From d1cc9ae72277f20f77aaf4b80da850a8595f579f Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 24 Feb 2019 16:10:06 +0100 Subject: [PATCH 122/170] Code merge + Added files artifact summary text method --- .squot | 2 +- .../LBGitFilesArtifact.class/instance/squotSummaryText.st | 4 ++++ .../LBGitFilesArtifact.class/methodProperties.json | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st diff --git a/.squot b/.squot index e1ff9b1fc..82b6c8673 100644 --- a/.squot +++ b/.squot @@ -19,4 +19,4 @@ OrderedDictionary { 'LBGit-Core.package' : #SquotCypressCodeSerializer, 'LBGit-Extensions.package' : #SquotCypressCodeSerializer, 'LBGit-Tests.package' : #SquotCypressCodeSerializer -} +} \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st new file mode 100644 index 000000000..584f75668 --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st @@ -0,0 +1,4 @@ +as yet unclassified +squotSummaryText + + ^ 'Files managed by squot' \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index aa267f977..90c5baa15 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -17,6 +17,7 @@ "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 12/4/2018 14:32", + "squotSummaryText" : "LB 2/24/2019 16:03", "storeInfo" : "LB 12/13/2018 16:25", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", From 4d5444d345e7430aef39d8c084c8b18f84658915 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 24 Feb 2019 16:39:23 +0100 Subject: [PATCH 123/170] Moved lbgit extension code into squot main code --- .../instance/captureLazySnapshot.st | 23 ---------- .../instance/captureSnapshot.st | 22 --------- .../methodProperties.json | 6 --- .../properties.json | 2 - .../instance/artifacts.st | 11 ----- .../methodProperties.json | 5 -- .../SquotImageStore.extension/properties.json | 2 - .../instance/loadOrder.st | 7 --- .../saveNewVersionFromPatch.ifCanceled..st | 36 --------------- .../methodProperties.json | 6 --- .../properties.json | 2 - .../instance/captureLazySnapshot.st | 11 +++-- .../instance/captureSnapshot.st | 11 +++-- .../methodProperties.json | 4 +- .../instance/artifacts.st | 4 ++ .../methodProperties.json | 2 +- .../instance/loadOrder.st | 6 ++- .../saveNewVersionFromPatch.ifCanceled..st | 46 ++++++++++++++----- .../methodProperties.json | 4 +- 19 files changed, 60 insertions(+), 150 deletions(-) delete mode 100644 LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st delete mode 100644 LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st delete mode 100644 LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json delete mode 100644 LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json delete mode 100644 LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st delete mode 100644 LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json delete mode 100644 LBGit-Extensions.package/SquotImageStore.extension/properties.json delete mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st delete mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st delete mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json delete mode 100644 LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json diff --git a/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st deleted file mode 100644 index 9c14ae66c..000000000 --- a/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureLazySnapshot.st +++ /dev/null @@ -1,23 +0,0 @@ -*LBGit-Extensions -captureLazySnapshot - "read the table of contents and create lazy loading artifacts from the entries" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - [self artifactReferencesDo: [:each | | lazyArtifact | - lazyArtifact := self createLazyArtifactForObjectAt: each. - builder add: lazyArtifact. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self createLazyArtifactForObjectAt: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st b/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st deleted file mode 100644 index 10fcc86c6..000000000 --- a/LBGit-Extensions.package/SquotFileSystemStore.extension/instance/captureSnapshot.st +++ /dev/null @@ -1,22 +0,0 @@ -*LBGit-Extensions -captureSnapshot - "read files from the filesystem and convert them into SquotArtifacts" - | builder addedPaths unrecordedFiles | - builder := SquotSnapshot builder. - addedPaths := Set new. - 'Reading objects from files' displaySequentialProgress: - [[self artifactsDo: [:each | builder add: each. - addedPaths add: each path]] - on: SquotNoTableOfContentsFound doAndPass: [:e | - (self packageDirectoriesIn: directory) - collect: [:eachDirectory | self restorePackageFrom: eachDirectory] - thenDo: [:eachArtifact | builder add: eachArtifact. - addedPaths add: eachArtifact path. - e add: eachArtifact]]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new - rootDirectory: directory; - yourself). - builder buildSnapshot - in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot]. \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json b/LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json deleted file mode 100644 index 2d08301a9..000000000 --- a/LBGit-Extensions.package/SquotFileSystemStore.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "captureLazySnapshot" : "LB 11/26/2018 16:12", - "captureSnapshot" : "LB 11/20/2018 10:16" } } diff --git a/LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json b/LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json deleted file mode 100644 index 053072453..000000000 --- a/LBGit-Extensions.package/SquotFileSystemStore.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotFileSystemStore" } diff --git a/LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st b/LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st deleted file mode 100644 index 83bf347af..000000000 --- a/LBGit-Extensions.package/SquotImageStore.extension/instance/artifacts.st +++ /dev/null @@ -1,11 +0,0 @@ -*LBGit-Extensions -artifacts - | artifactsDictionary | - artifactsDictionary := Dictionary new. - self objectsWithPathsDo: [:each :path | - artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. - artifactsDictionary at: '' put: - (LBGitLiveFilesArtifact new - ownerSnapshot: self; - yourself). - ^ artifactsDictionary \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json b/LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json deleted file mode 100644 index e08277ec7..000000000 --- a/LBGit-Extensions.package/SquotImageStore.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "artifacts" : "LB 11/25/2018 14:36" } } diff --git a/LBGit-Extensions.package/SquotImageStore.extension/properties.json b/LBGit-Extensions.package/SquotImageStore.extension/properties.json deleted file mode 100644 index 76f832df6..000000000 --- a/LBGit-Extensions.package/SquotImageStore.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotImageStore" } diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st deleted file mode 100644 index b2fa30281..000000000 --- a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/loadOrder.st +++ /dev/null @@ -1,7 +0,0 @@ -*LBGit-Extensions -loadOrder - - "This method is for compatibility to newer Squot versions" - ^ store loadOrder - addIfNotPresent: LBGitFilesArtifact path; - yourself \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st b/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st deleted file mode 100644 index 1afceef82..000000000 --- a/LBGit-Extensions.package/SquotWorkingCopy.extension/instance/saveNewVersionFromPatch.ifCanceled..st +++ /dev/null @@ -1,36 +0,0 @@ -*LBGit-Extensions -saveNewVersionFromPatch: aPatch ifCanceled: cancelBlock - | selectedPatch message newVersion capturedArtifacts | - self flag: #TODO. "Create new signal for this?" - (SquotSelectionOfChangesRequested new - patch: aPatch; - title: ''; - signal) - ifNotNil: [:signalSelectedPatch | - selectedPatch := signalSelectedPatch. - message := SquotInitialLogMessageRequested new signal ifNil: 'Empty commit message'.] - ifNil: [| tool | - tool := SquotSaveVersionDialog new - parentVersions: self parentVersions; - patch: aPatch; - controllerForIgnores: self; - yourself. - tool requestSelectedChangesWithTitle: 'Select changes and message for the new version'. - tool accepted ifFalse: [^ cancelBlock value]. - selectedPatch := tool selectedPatch. - message := tool message.]. - [self handlePathChangesDuring: - [newVersion := loadedHistorian createNewVersionFromPatch: selectedPatch - with: [:version | version - message: message asString; - author: self defaultAuthor. - version parents: self parentVersions. - self shouldNotStoreMetadata ifTrue: [version doNotStoreMetadata]]]] - on: SquotArtifactsWereCaptured - doAndResume: [:captured | capturedArtifacts := captured artifacts]. - self loadedVersion: newVersion. - self cacheSavedArtifacts: (capturedArtifacts ifNil: [Dictionary new]). - self resetAdditionalParents. - previousSnapshot := nil. - previousVersionId := newVersion internalId. - self cacheNewMonticelloVersions: selectedPatch message: message. \ No newline at end of file diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json b/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json deleted file mode 100644 index be552c79d..000000000 --- a/LBGit-Extensions.package/SquotWorkingCopy.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "loadOrder" : "LB 12/7/2018 18:15", - "saveNewVersionFromPatch:ifCanceled:" : "LB 2/13/2019 13:43" } } diff --git a/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json b/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json deleted file mode 100644 index b5406e048..000000000 --- a/LBGit-Extensions.package/SquotWorkingCopy.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotWorkingCopy" } diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st index 2827e9016..be60148f1 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st @@ -1,7 +1,7 @@ Pur store captureLazySnapshot "read the table of contents and create lazy loading artifacts from the entries" - | builder addedPaths unrecordedFiles snapshot | + | builder addedPaths unrecordedFiles | builder := SquotSnapshot builder. addedPaths := Set new. [self artifactReferencesDo: [:each | | lazyArtifact | @@ -14,9 +14,10 @@ captureLazySnapshot thenDo: [:eachArtifact | builder add: eachArtifact. addedPaths add: eachArtifact path. e add: eachArtifact]]. - builder add: (unrecordedFiles := SquotUnrecordedFilesArtifact new + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new rootDirectory: directory; yourself). - snapshot := builder buildSnapshot. - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot \ No newline at end of file + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st index 4d58e60f1..a69f82ec8 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st @@ -1,7 +1,7 @@ Pur store captureSnapshot "read files from the filesystem and convert them into SquotArtifacts" - | builder addedPaths unrecordedFiles snapshot | + | builder addedPaths unrecordedFiles | builder := SquotSnapshot builder. addedPaths := Set new. 'Reading objects from files' displaySequentialProgress: @@ -13,9 +13,10 @@ captureSnapshot thenDo: [:eachArtifact | builder add: eachArtifact. addedPaths add: eachArtifact path. e add: eachArtifact]]]. - builder add: (unrecordedFiles := SquotUnrecordedFilesArtifact new + builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new rootDirectory: directory; yourself). - snapshot := builder buildSnapshot. - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot \ No newline at end of file + builder buildSnapshot + in: [:snapshot | + unrecordedFiles ownerSnapshot: snapshot. + ^ snapshot]. \ No newline at end of file diff --git a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json index 9ab07ed4a..b9bb3f831 100644 --- a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json +++ b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json @@ -13,8 +13,8 @@ "artifactReferencesDo:" : "jr 9/23/2018 22:08", "artifacts" : "jr 7/16/2017 02:34", "artifactsDo:" : "jr 5/9/2017 18:00", - "captureLazySnapshot" : "jr 9/23/2018 22:09", - "captureSnapshot" : "jr 9/23/2018 22:10", + "captureLazySnapshot" : "LB 11/26/2018 16:12", + "captureSnapshot" : "LB 11/20/2018 10:16", "capturedArtifacts" : "jr 5/31/2017 17:25", "createLazyArtifactForObjectAt:" : "jr 5/28/2017 14:31", "deserializers" : "jr 1/27/2017 14:33", diff --git a/src/Squot.package/SquotImageStore.class/instance/artifacts.st b/src/Squot.package/SquotImageStore.class/instance/artifacts.st index 3f08eebce..7640d10b2 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifacts.st +++ b/src/Squot.package/SquotImageStore.class/instance/artifacts.st @@ -4,4 +4,8 @@ artifacts artifactsDictionary := Dictionary new. self objectsWithPathsDo: [:each :path | artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. + artifactsDictionary at: '' put: + (LBGitLiveFilesArtifact new + ownerSnapshot: self; + yourself). ^ artifactsDictionary \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 24198e4ea..72beaed3b 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -13,7 +13,7 @@ "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", "artifactAt:" : "jr 4/7/2018 15:53", - "artifacts" : "jr 4/7/2018 15:53", + "artifacts" : "LB 11/25/2018 14:36", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", "capture:at:" : "jr 9/23/2018 22:31", diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st index ef300c999..775b17a61 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st @@ -1,3 +1,7 @@ accessing loadOrder - ^ store loadOrder \ No newline at end of file + + "This method is for compatibility to newer Squot versions" + ^ store loadOrder + addIfNotPresent: LBGitFilesArtifact path; + yourself \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st index 1a3a58326..8ec1abedf 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st @@ -1,14 +1,36 @@ creating new versions saveNewVersionFromPatch: aPatch ifCanceled: cancelBlock - "Interactively create a new version. Let the user pick changes from aPatch." - | selectedPatch newVersion message | - selectedPatch := self selectFromPatch: aPatch - forSaveWithTitle: 'Select changes and message for the new version' - ifCanceled: [^ cancelBlock value]. - message := self newVersionMessage. - newVersion := self - saveNewVersionFromPatch: selectedPatch - message: message. - self cacheNewMonticelloVersions: selectedPatch message: message. - self resetNewVersionMessage. - ^ newVersion \ No newline at end of file + | selectedPatch message newVersion capturedArtifacts | + self flag: #TODO. "Create new signal for this?" + (SquotSelectionOfChangesRequested new + patch: aPatch; + title: ''; + signal) + ifNotNil: [:signalSelectedPatch | + selectedPatch := signalSelectedPatch. + message := SquotInitialLogMessageRequested new signal ifNil: 'Empty commit message'.] + ifNil: [| tool | + tool := SquotSaveVersionDialog new + parentVersions: self parentVersions; + patch: aPatch; + controllerForIgnores: self; + yourself. + tool requestSelectedChangesWithTitle: 'Select changes and message for the new version'. + tool accepted ifFalse: [^ cancelBlock value]. + selectedPatch := tool selectedPatch. + message := tool message.]. + [self handlePathChangesDuring: + [newVersion := loadedHistorian createNewVersionFromPatch: selectedPatch + with: [:version | version + message: message asString; + author: self defaultAuthor. + version parents: self parentVersions. + self shouldNotStoreMetadata ifTrue: [version doNotStoreMetadata]]]] + on: SquotArtifactsWereCaptured + doAndResume: [:captured | capturedArtifacts := captured artifacts]. + self loadedVersion: newVersion. + self cacheSavedArtifacts: (capturedArtifacts ifNil: [Dictionary new]). + self resetAdditionalParents. + previousSnapshot := nil. + previousVersionId := newVersion internalId. + self cacheNewMonticelloVersions: selectedPatch message: message. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index 1c276b638..b20f746c2 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -38,7 +38,7 @@ "loadArtifact:" : "jr 9/23/2018 18:06", "loadArtifactInteractively:ifCanceled:" : "jr 9/23/2018 18:09", "loadCurrentVersionInteractively" : "jr 5/28/2017 16:18", - "loadOrder" : "jr 8/18/2018 17:00", + "loadOrder" : "LB 12/7/2018 18:15", "loadOrder:" : "jr 8/18/2018 17:00", "loadPatchInteractively:ifCanceled:" : "jr 4/28/2018 18:26", "loadSnapshot:" : "jr 6/29/2017 16:40", @@ -76,7 +76,7 @@ "resetNewVersionMessage" : "jr 10/13/2018 23:41", "restoreCurrentAncestryAfter:" : "jr 4/29/2018 18:46", "saveChanges:on:message:" : "jr 5/10/2018 17:06", - "saveNewVersionFromPatch:ifCanceled:" : "jr 10/13/2018 23:43", + "saveNewVersionFromPatch:ifCanceled:" : "LB 2/13/2019 13:43", "saveNewVersionFromPatch:message:" : "jr 5/21/2018 21:50", "saveNewVersionInteractivelyIfCanceled:" : "jr 5/10/2018 16:26", "saveNewVersionMessage:interactive:" : "jr 5/10/2018 16:24", From 19bdff587df1a011041425d2528ba2ed788cb0b1 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 24 Feb 2019 17:28:23 +0100 Subject: [PATCH 124/170] trying to remove empty extension package --- .squot | 1 - LBGit-Extensions.package/.filetree | 4 ---- LBGit-Extensions.package/.squot-contents | 5 ----- LBGit-Extensions.package/monticello.meta/categories.st | 1 - LBGit-Extensions.package/monticello.meta/initializers.st | 0 LBGit-Extensions.package/properties.json | 2 -- 6 files changed, 13 deletions(-) delete mode 100644 LBGit-Extensions.package/.filetree delete mode 100644 LBGit-Extensions.package/.squot-contents delete mode 100644 LBGit-Extensions.package/monticello.meta/categories.st delete mode 100644 LBGit-Extensions.package/monticello.meta/initializers.st delete mode 100644 LBGit-Extensions.package/properties.json diff --git a/.squot b/.squot index 82b6c8673..d6b09363f 100644 --- a/.squot +++ b/.squot @@ -17,6 +17,5 @@ OrderedDictionary { 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer, 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, 'LBGit-Core.package' : #SquotCypressCodeSerializer, - 'LBGit-Extensions.package' : #SquotCypressCodeSerializer, 'LBGit-Tests.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/LBGit-Extensions.package/.filetree b/LBGit-Extensions.package/.filetree deleted file mode 100644 index 8998102c2..000000000 --- a/LBGit-Extensions.package/.filetree +++ /dev/null @@ -1,4 +0,0 @@ -{ - "noMethodMetaData" : true, - "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } diff --git a/LBGit-Extensions.package/.squot-contents b/LBGit-Extensions.package/.squot-contents deleted file mode 100644 index 239ddebb0..000000000 --- a/LBGit-Extensions.package/.squot-contents +++ /dev/null @@ -1,5 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #PackageInfo, - #objectsReplacedByNames : true, - #serializer : #SquotCypressCodeSerializer -} \ No newline at end of file diff --git a/LBGit-Extensions.package/monticello.meta/categories.st b/LBGit-Extensions.package/monticello.meta/categories.st deleted file mode 100644 index 36fa4e6e7..000000000 --- a/LBGit-Extensions.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'LBGit-Extensions'! diff --git a/LBGit-Extensions.package/monticello.meta/initializers.st b/LBGit-Extensions.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29bb..000000000 diff --git a/LBGit-Extensions.package/properties.json b/LBGit-Extensions.package/properties.json deleted file mode 100644 index f037444a7..000000000 --- a/LBGit-Extensions.package/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - } From ebfa30d8bcd62c737f29d95808b85c897685d072 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Fri, 1 Mar 2019 16:06:55 +0100 Subject: [PATCH 125/170] Working on #14; need to merge fixes into this fork --- .../instance/createFile..st | 12 +---- .../methodProperties.json | 2 +- .../instance/testPushImageRegression.st | 10 ++++ .../methodProperties.json | 1 + .../instance/commitDummyFileAddition.st | 2 +- .../instance/createDummyFile.st | 2 +- .../instance/createDummyImage.st | 7 +++ .../instance/deleteDummyFile.st | 2 +- .../instance/dummyContents.st | 2 +- .../instance/dummyContents2.st | 2 +- .../LBGitTestCase.class/instance/dummyFile.st | 2 +- .../instance/dummyFile2.st | 2 +- .../instance/dummyImage.st | 4 ++ .../instance/dummyImageContents.st | 47 +++++++++++++++++++ .../instance/writeToDummyFile..st | 2 +- .../LBGitTestCase.class/methodProperties.json | 3 ++ 16 files changed, 83 insertions(+), 19 deletions(-) create mode 100644 LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st create mode 100644 LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st index e4d6aec13..324f11d4b 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st @@ -1,16 +1,8 @@ applying createFile: aPath - | sourceReference targetReference inputStream content | + | sourceReference targetReference | sourceReference := self sourceReferenceOn: aPath. sourceReference exists ifFalse: [^ self]. targetReference := self targetReferenceOn: aPath. - self flag: #TODO. "Do ensure the file does NOT exist workingReference ensureFile." - "sourceReference copyTo: targetReference." - inputStream := sourceReference readStream binary. - content := inputStream contents. - inputStream close. - targetReference parent ensureDirectory. - targetReference writeStream binary nextPutAll: content; close. - "targetReference fileSystem copyFrom: inputStream to: targetReference path. - inputStream close." \ No newline at end of file + sourceReference copyTo: targetReference. \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 23e7b2b1d..10fedeb71 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -9,7 +9,7 @@ "applyToContainer:" : "LB 11/26/2018 16:06", "asDiffTree" : "LB 12/13/2018 17:42", "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 1/24/2019 10:47", + "createFile:" : "LB 3/1/2019 15:57", "deleteFile:" : "LB 11/25/2018 15:55", "diff:against:" : "LB 11/26/2018 16:06", "diffAdded" : "LB 11/23/2018 18:52", diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st new file mode 100644 index 000000000..2551bf643 --- /dev/null +++ b/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st @@ -0,0 +1,10 @@ +tests +testPushImageRegression +"Pushing an image used to throw an error due to a wrong file stream format" + + self + createDummyImage; + transferMessaged: 'Created dummy image'. + self + assert: self dummyImageContents asByteArray + equals: (self otherReference resolve: self dummyImage) readStream binary contents. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 4e8ee3c27..4b462cd0b 100644 --- a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -35,6 +35,7 @@ "testPushAddsFileInNewFolder" : "LB 2/13/2019 15:10", "testPushAddsFileToTree" : "LB 12/10/2018 09:48", "testPushDeletedFile" : "LB 12/8/2018 17:02", + "testPushImageRegression" : "LB 3/1/2019 15:49", "testPushUpdatesFile" : "LB 12/8/2018 17:05", "testReadmeExists" : "LB 12/8/2018 15:53", "testSetupSuccess" : "LB 12/8/2018 16:59", diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st b/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st index d01e92ba0..2a248077e 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st @@ -1,4 +1,4 @@ -dummy file +dummy files commitDummyFileAddition self createDummyFile. diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st index e120bbff9..9f3dc71eb 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st @@ -1,4 +1,4 @@ -dummy file +dummy files createDummyFile self writeToDummyFile: self dummyContents. diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st b/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st new file mode 100644 index 000000000..179e15a5b --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st @@ -0,0 +1,7 @@ +dummy files +createDummyImage + + self + write: self dummyImageContents + to: self dummyImage + in: self reference. \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st index 04c9b1946..aed7ed8ce 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st @@ -1,4 +1,4 @@ -dummy file +dummy files deleteDummyFile (self reference resolve: self dummyFile) delete. diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st index cb684efe6..81c6308fa 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st @@ -1,4 +1,4 @@ -dummy file +dummy files dummyContents ^ 'Test diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st index dda70a169..a2a587b2e 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st @@ -1,4 +1,4 @@ -dummy file +dummy files dummyContents2 ^ 'These are new diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st index b16759c6a..b9df60d71 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st @@ -1,4 +1,4 @@ -dummy file +dummy files dummyFile ^ 'dummy.file' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st index fa9b60ce2..449ba4275 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st @@ -1,4 +1,4 @@ -dummy file +dummy files dummyFile2 ^ 'dummy2.file' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st new file mode 100644 index 000000000..cfd083c29 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st @@ -0,0 +1,4 @@ +dummy files +dummyImage + + ^ 'dummyImage.png' \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st new file mode 100644 index 000000000..ff4d1b104 --- /dev/null +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st @@ -0,0 +1,47 @@ +dummy files +dummyImageContents + + ^ 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1B +AACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjBSURBVEhLrZZ5VNNXFsfZXBjLtLXa +qbUee8apU0etjkvn2E7FqXUpWESLCopoFRFwYRUURAVB2UEwrAECWUhYQlaSQCALCEQ0gbCG +LYR9F0RDfuub2HLOOMfR6bH9nN9fv9/7ft/9vXvPvc/kf2JqamZubrFw0aL3ly7/YNmyM26H +eWICV3zPJ/DY/v023h6x3h6Jmzfusliw0LjO+Jiams4rfw1G2Xf7D99JJEuUo/Udc1WNkyLF +aH5pE0ssUXfzVC0cqVAnYI3SK3v8CCkecTEOgQFrtm0zX7x4Xv8GzMxMl733nqe7r5wrbeKL +lYziBkpedwG1LT9XSadJqIUZSRkB1728fYLCU9LzyvmCOpn4oZinFFNaFWejQld+/KG5mdm8 +16tYLlrkuGcPLyFhSih6WlH2RFrWI2J2VRb11TLb5flKeZ5MRiyREDLYjHhiAjEymH2HoCCW +PKJyuwXiISm3mZdSnHnN03nPp58sm3d8mSWWljdOn54VCOekktEKXq+spPcRS6+TTrULtG1c +VSe7qp9dOcnjdUp4jyck6hbNQEmHLK81h9pFlvbktyuzOtQUlZYvHJGThZmXD+3ZbGFhPm9t +ZIGFxUV7ez2fP8wq6K9ijTYL9LpKTFepU5eo2lgyHbdGX1FjEPF7hKXKwco2wFO0Dj6VDcxy +OhX5MxzWcEFhZxavNaNFQ3rSQmrWsjgtJSH//Puq/yT+AyurzuTkgSLysIqrH5CjgxKDhtOs +pCn6+IpZaT0ke2AQCUZYnPo2SQssbELo0o6eCekMVtE3XdRYkWbgCvTMYm16XkuqvI+i78me +aSfKCf5HLRf9nA9jhe347LPx3MxhJRPSCaEe7lx7sbqJXjssfDRXpZirrIHKKp6zix5Jq9pg +SSvEb0RI5d3d4/IniHgC5mknc5uZ6UBUDrFKRnLy1AkVuozng0RYk9a2duXan+M3MdmwetV0 +AxfuFaBdxVgLqfERsXZMpIQf1ELiKqhUBNPzO2mSptlqDSJugXiNWHaZtneqZhqpnIQF4xCz +vSd9iEqDuTyouGgwOUUdJR/IgsayAeOcyNTE1MTM1PSk/U7Qx0V7OEBD7nmYIu8tVCLVDyFJ +DSoqhwv4EK2gWlndgVe2QgI1zFDACazuzgnZJFQ2YRCMGVj9s5n1vAhQwkWLihAatTM6QR2i +1oVDI3fAgQ1HTIzpLknxBZpMWJUwrYira8mpMpTJDXwJwirV01hIVraKVNcFZO2wuBXhqBBy +LR7H0naMS6fxsgmYP4kyh+Hsrv7YPmIWYLEQBgPQyIqg1K5b44PhOM+tzlhC5oqC66AtDX8c +3lN7t1xHr8PKxVhRKUyhYom5cEx2uVLSisg1mDF8tgolPcDiSox/IJ3GyqdQ0TjMHIUpuidJ +TfkRgEqHqVSURNIG+zcGqHS3YP6JehMLczNahANouDv34IbqcYzoGUeGckQonYlmUPC4+MYY +kRqUNsL8BoitRPLroOQK7CatuX2MNwFxp4FwDGaOwXTt0/ha9gWQkoWlpqJJSSD2boVzouan +WcZe+Yv24HP8H6AhaLzyArchjIvTODCJjWaTkOhsEEGoEAmb8NImjPkYIdegiWXITTa4xVB3 +TpYYfScwxrAhdwTJ6J4LbnjoNRNzH2RkYCkpIDG+9ryv9szz0O2EF1W0ee2fgCJgUHqZ0R5Z +CNJzsEgCHBKH+94cPpdVPmIMX9CEFdYjuQ/Q+DLUuEFMSX3XVNEUXjSB0ccx0gia2o+GajR+ +3ddCAYGAJiaCmKj6s5dqvu9cs+RvLzZ4x3KBNNl+SHo+uzmIDBJz0Mgk9Foc8A5UXMmtwWi1 +cHE9TKtDiHI4WoD4FoA4tkg7kzuBMiaxgnGUPIql6ZBw9WMPnacPFhaGBAcDf98aG5cjK5xe +uBsx9vNT+9fOVLtlKt0TwbV4xDcccQsFLn6i2JxqJEOGESqge+VoGAf2K0COpoJUUb7uWcIg +lDKGZQwaUobxmLZZbyn3qOHKDTwkBPX3B95eaTt2LTZ/qbP++eM/VqXYM+vORQGf25hrEH78 +Kjh0sYiYXK7PrsZjhehtHuZFR8+RcZvIMeZj8jh+bwiLHUKj+uBQHeavnjxRHn8AXL4C+/ig +Hh6Io+PuD5f/1wwyNzM9u/cv1XLnwJFTt5AzV2HHq+DgBQrlNg+JKoVvc+EwLnKRCp8g4j/c +VZa1x46D+AE4ZgSP7kOv9wEfdf8xmbMdOO+BuLiAI0furVv3jvlL3fQXPnp3caDv9mitYyDm +6IPZeYM9rjm5t9hIYBHiTsFciLD9fXR3HHBL4z/sD+jHrmsR3z40qHPOvU1/spC8Q+/ihru6 +Aicn3vbtq1833VYtX+KRv/s6cPbF7LzAd6dImQEFc/6FiGsuejQNtU3Cvgx5cpeV3g9f6ccC +tKhnN3yuAzuonPhW+KM1cDqB29lxN216rfsvfGr90blWGz/U3hvsc6FGXqIhp7P0zpmYbeLc +rhjc+uYjen3gEPDtnPPsxS9oYMc2g23mjU24w3HIxoa6bt37FhbzRm/g69B1HjN73YG1Q7Hr +RcqcMxE7eB/5JgrdGoa4pherhn/SYu49+Il2yEFtsM5OWz9hc3h83774NWvm9f8Xi8XmuzO+ +cJ3ddbju6zPEJ8fSYNt7yI5I/MvgjgRu8Cjw7EZPdWHHGp/9i563UfWVtXzLll1WVvPiX89G +r08ONn/+fRz5wD3MOhradMPgEFPwcOCIFpzoAoclvTvjbn+et36j94oV84K3YPX+5Yepdt+G +dnxxQ299nUWpddaCH2W9u9O467/ZY7Xd0srSOE9+CxYmCymCbAK7xo88lMy4lsawPu650tp2 +6btLX6nxt2PxogUh3l4KuaRW1cTikLZu2Tb/4ffC+Ye9u/66sjbKixnh6+7kYPUWmXwztjs2 +k4I963MTbrs5ES6dXGj+2078VZx2bq2L8CwLOsXwsDu0YdX8298X/wNfPfA7lHpo6x8sXn+r +fQMmJv8GgfxKXSDkSi8AAAAASUVORK5CYII=' base64Decoded \ No newline at end of file diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st b/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st index a7bf3196a..184d4d680 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st +++ b/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st @@ -1,4 +1,4 @@ -dummy file +dummy files writeToDummyFile: anObject self diff --git a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json index e703115ea..cc6866e7e 100644 --- a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json +++ b/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json @@ -6,11 +6,14 @@ "commitDummyFileAddition" : "LB 12/8/2018 13:05", "commitMessaged:" : "LB 12/8/2018 13:05", "createDummyFile" : "LB 12/4/2018 13:49", + "createDummyImage" : "LB 3/1/2019 15:35", "deleteDummyFile" : "LB 12/4/2018 13:38", "dummyContents" : "LB 12/8/2018 13:03", "dummyContents2" : "LB 12/4/2018 13:47", "dummyFile" : "LB 12/2/2018 13:56", "dummyFile2" : "LB 12/10/2018 09:47", + "dummyImage" : "LB 3/1/2019 15:33", + "dummyImageContents" : "LB 3/1/2019 15:34", "gitReference" : "LB 12/4/2018 14:10", "makeWorkingCopyAt:" : "LB 12/8/2018 15:15", "performTest" : "", From 902ef89d2fcb9b27e4091b4a01f0636a1a5f1b00 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 10 Mar 2019 17:05:42 +0100 Subject: [PATCH 126/170] Adapted to merged pull request #215 --- .../instance/asDiffNode.st | 5 +++- .../methodProperties.json | 2 +- .../instance/asDiffNode.st | 6 +++-- .../LBGitFileDiff.class/methodProperties.json | 2 +- .../instance/adjustedBy..st | 5 ---- .../instance/asDiffTree.st | 4 ++- .../initializeSquotDiffNodes.with..st | 26 ------------------- .../methodProperties.json | 4 +-- 8 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st delete mode 100644 LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st b/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st index 7bdb70de9..bd88eec92 100644 --- a/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st +++ b/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st @@ -4,4 +4,7 @@ asDiffNode ^ SquotMergeDiffNode title: self title content: self - children: #() \ No newline at end of file + children: #() + onInclude: [] + onExclude: [] + onReset: [] \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json b/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json index 1b640e14e..6a281308a 100644 --- a/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json @@ -3,7 +3,7 @@ "left:right:" : "LB 11/25/2018 16:22" }, "instance" : { "applyWith:" : "LB 11/25/2018 16:47", - "asDiffNode" : "LB 11/25/2018 16:19", + "asDiffNode" : "LB 3/10/2019 17:01", "body" : "LB 11/25/2018 16:35", "choice" : "LB 11/25/2018 16:47", "isConflict" : "LB 12/8/2018 14:17", diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st b/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st index 73bc3e36c..58ede69d3 100644 --- a/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st +++ b/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st @@ -1,7 +1,9 @@ as yet unclassified asDiffNode - ^ SquotDiffNode + ^ SquotDiffNode title: self title content: self - children: #() \ No newline at end of file + children: #() + onInclude: [] + onExclude: [] \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json index 2e1b46b19..cf244b61e 100644 --- a/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json @@ -5,7 +5,7 @@ "after" : "LB 11/23/2018 18:50", "applyTo:" : "LB 11/25/2018 16:37", "applyWith:" : "LB 11/25/2018 16:39", - "asDiffNode" : "LB 11/23/2018 15:14", + "asDiffNode" : "LB 3/10/2019 17:01", "before" : "LB 11/23/2018 18:50", "body" : "LB 11/23/2018 18:37", "isConflict" : "LB 12/8/2018 14:17", diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st deleted file mode 100644 index 8c1c5f991..000000000 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/adjustedBy..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -adjustedBy: aDiffNode - - self diffs: ((aDiffNode children select: [:each | each isActive]) collect: [:each | each content]). - ^ self \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st b/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st index bd1736237..7110c9d0d 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st +++ b/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st @@ -4,4 +4,6 @@ asDiffTree ^ SquotDiffNode title: LBGitFilesArtifact path content: self - children: self topNodes \ No newline at end of file + children: self topNodes + onInclude: [] + onExclude: [] \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st b/LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st deleted file mode 100644 index 0d9b43b6b..000000000 --- a/LBGit-Core.package/LBGitFileListDiff.class/instance/initializeSquotDiffNodes.with..st +++ /dev/null @@ -1,26 +0,0 @@ -Squot-diff-converting -initializeSquotDiffNodes: aCollection with: aSquotDiffNodesBuilder - "Initialize the previously allocated diff nodes in aCollection, using the builder to convert - the diffs of related objects." - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure and you chose to initialize all nodes upon their allocation already, - you may implement this method to do nothing." - | index | - index := 1. - self deprecated. - self added do: [:each | (aCollection at: index) - title: 'added: ', each - content: self - children: Array empty. - index := index + 1.]. - self removed do: [:each | (aCollection at: index) - title: 'deleted: ', each - content: self - children: Array empty. - index := index + 1.]. - self modified do: [:each | (aCollection at: index) - title: 'modified: ', each - content: self - children: Array empty. - index := index + 1.]. \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 10fedeb71..b7a8c6b8b 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -5,9 +5,8 @@ "instance" : { "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", - "adjustedBy:" : "LB 11/26/2018 16:04", "applyToContainer:" : "LB 11/26/2018 16:06", - "asDiffTree" : "LB 12/13/2018 17:42", + "asDiffTree" : "LB 3/10/2019 16:57", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 3/1/2019 15:57", "deleteFile:" : "LB 11/25/2018 15:55", @@ -22,7 +21,6 @@ "gitReferenceOn:" : "LB 2/13/2019 14:04", "hasChanges" : "LB 12/8/2018 14:18", "hasConflicts" : "LB 12/8/2018 14:18", - "initializeSquotDiffNodes:with:" : "LB 11/23/2018 15:24", "isAddition" : "LB 12/7/2018 18:25", "isFileModified:" : "LB 11/25/2018 15:20", "isRemoval" : "LB 12/7/2018 18:24", From 7e1acb5403dea03a9b76a24d35923438b184d0b0 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Wed, 27 Mar 2019 19:14:07 +0100 Subject: [PATCH 127/170] Fix most test errors --- .../LBGitFileListDiff.class/methodProperties.json | 2 +- .../LBGitFilesArtifact.class/instance/capture.st | 4 ++++ .../instance/materializeWith.replacing..st | 5 +++++ .../LBGitFilesArtifact.class/instance/storeInfo.st | 2 +- .../LBGitFilesArtifact.class/methodProperties.json | 4 +++- .../SquotPatch.class/instance/applyTo.displayingProgress..st | 2 +- .../SquotPatch.class/instance/loadOrderDiff..st | 1 + src/Squot.package/SquotPatch.class/methodProperties.json | 4 ++-- .../instance/saveNewVersionFromPatch.ifCanceled..st | 3 +-- .../SquotWorkingCopy.class/methodProperties.json | 2 +- 10 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st create mode 100644 LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index b7a8c6b8b..05a0cb8af 100644 --- a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -6,7 +6,7 @@ "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", "applyToContainer:" : "LB 11/26/2018 16:06", - "asDiffTree" : "LB 3/10/2019 16:57", + "asDiffTree" : "LB 3/27/2019 18:50", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 3/1/2019 15:57", "deleteFile:" : "LB 11/25/2018 15:55", diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st new file mode 100644 index 000000000..bdc88e938 --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st @@ -0,0 +1,4 @@ +as yet unclassified +capture + + ^ self "hopefully already captured?" \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st new file mode 100644 index 000000000..b98508a89 --- /dev/null +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st @@ -0,0 +1,5 @@ +as yet unclassified +materializeWith: anArtifact replacing: anObject + + self flag: #TODO "what does it do?". + ^ self \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st index 38c4b7093..e0a00807b 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st +++ b/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st @@ -1,4 +1,4 @@ as yet unclassified storeInfo - ^ Dictionary new \ No newline at end of file + ^ SquotTrackedObjectMetadata new \ No newline at end of file diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 90c5baa15..f08fb9d54 100644 --- a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -2,12 +2,14 @@ "class" : { "path" : "LB 12/7/2018 18:14" }, "instance" : { + "capture" : "LB 3/27/2019 18:25", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", "displayText" : "LB 11/26/2018 16:25", "isLoadable" : "LB 11/25/2018 13:22", "isSquotFile:" : "LB 12/7/2018 18:16", + "materializeWith:replacing:" : "LB 3/27/2019 18:27", "ownerSnapshot" : "LB 11/20/2018 15:14", "ownerSnapshot:" : "LB 11/20/2018 15:14", "path" : "LB 12/7/2018 18:14", @@ -18,7 +20,7 @@ "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 12/4/2018 14:32", "squotSummaryText" : "LB 2/24/2019 16:03", - "storeInfo" : "LB 12/13/2018 16:25", + "storeInfo" : "LB 3/27/2019 18:28", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11", diff --git a/src/Squot.package/SquotPatch.class/instance/applyTo.displayingProgress..st b/src/Squot.package/SquotPatch.class/instance/applyTo.displayingProgress..st index 8bd67414c..4e77fd530 100644 --- a/src/Squot.package/SquotPatch.class/instance/applyTo.displayingProgress..st +++ b/src/Squot.package/SquotPatch.class/instance/applyTo.displayingProgress..st @@ -5,5 +5,5 @@ applyTo: anObjectContainer displayingProgress: progressText order := self applyToLoadOrder: order. relevant := order select: [:each | diffs includesKey: each]. removed := diffs keys copyWithoutAll: order. - relevant, removed do: [:each | anObjectContainer applyDiff: (diffs at: each)] displayingProgress: progressText. + (relevant, removed) asSet do: [:each | anObjectContainer applyDiff: (diffs at: each)] displayingProgress: progressText. anObjectContainer loadOrder: order. \ No newline at end of file diff --git a/src/Squot.package/SquotPatch.class/instance/loadOrderDiff..st b/src/Squot.package/SquotPatch.class/instance/loadOrderDiff..st index 59948244c..ae86eb3cf 100644 --- a/src/Squot.package/SquotPatch.class/instance/loadOrderDiff..st +++ b/src/Squot.package/SquotPatch.class/instance/loadOrderDiff..st @@ -1,3 +1,4 @@ accessing loadOrderDiff: aDiffPatch + loadOrderDiff := aDiffPatch \ No newline at end of file diff --git a/src/Squot.package/SquotPatch.class/methodProperties.json b/src/Squot.package/SquotPatch.class/methodProperties.json index 629fc240c..44822038c 100644 --- a/src/Squot.package/SquotPatch.class/methodProperties.json +++ b/src/Squot.package/SquotPatch.class/methodProperties.json @@ -5,7 +5,7 @@ "with:" : "jr 9/23/2018 17:43" }, "instance" : { "applyTo:" : "jr 8/18/2018 23:41", - "applyTo:displayingProgress:" : "jr 8/18/2018 23:39", + "applyTo:displayingProgress:" : "LB 3/27/2019 18:55", "applyToLoadOrder:" : "jr 8/18/2018 23:35", "artifacts" : "jr 10/2/2017 23:45", "browse" : "jr 10/31/2017 18:22", @@ -21,5 +21,5 @@ "initialize" : "jr 5/1/2017 19:47", "initializeWith:" : "jr 5/1/2017 20:52", "loadOrderDiff" : "jr 8/18/2018 21:51", - "loadOrderDiff:" : "jr 8/18/2018 21:51", + "loadOrderDiff:" : "LB 3/27/2019 18:22", "paths" : "jr 5/28/2017 22:57" } } diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st index 8ec1abedf..91d8c8978 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st @@ -10,9 +10,8 @@ saveNewVersionFromPatch: aPatch ifCanceled: cancelBlock selectedPatch := signalSelectedPatch. message := SquotInitialLogMessageRequested new signal ifNil: 'Empty commit message'.] ifNil: [| tool | - tool := SquotSaveVersionDialog new + tool := (SquotSaveVersionDialog on: aPatch) parentVersions: self parentVersions; - patch: aPatch; controllerForIgnores: self; yourself. tool requestSelectedChangesWithTitle: 'Select changes and message for the new version'. diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index 03b940d57..e516bcc58 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -76,7 +76,7 @@ "resetNewVersionMessage" : "jr 10/13/2018 23:41", "restoreCurrentAncestryAfter:" : "jr 4/29/2018 18:46", "saveChanges:on:message:" : "jr 5/10/2018 17:06", - "saveNewVersionFromPatch:ifCanceled:" : "LB 2/13/2019 13:43", + "saveNewVersionFromPatch:ifCanceled:" : "LB 3/10/2019 17:04", "saveNewVersionFromPatch:message:" : "jr 5/21/2018 21:50", "saveNewVersionInteractivelyIfCanceled:" : "jr 5/10/2018 16:26", "saveNewVersionMessage:interactive:" : "jr 5/10/2018 16:24", From 2900d69cc52735ec81d9493a71d2b5d3d3a55686 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 11 Apr 2019 11:32:36 +0200 Subject: [PATCH 128/170] Added lbgit to baseline --- .../BaselineOfSquot.class/instance/baseline..st | 9 ++++++--- .../BaselineOfSquot.class/methodProperties.json | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st b/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st index 80fea1de7..739511b59 100644 --- a/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st +++ b/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st @@ -51,9 +51,12 @@ baseline: spec package: 'FileSystem-Git' with: [ spec requires: #('FS-Core' 'FS-Disk' 'FS-Memory' 'FS-AnsiStreams' 'FS-Tests-Core' 'Pharo-compatibility' 'INIFile' 'VersionControl' ). ]; package: 'Squit' with: [ - spec requires: #('FileSystem-Git' 'Squot' 'FS-FileDirectory-Adapters' ). ]. + spec requires: #('FileSystem-Git' 'Squot' 'FS-FileDirectory-Adapters' ). ]; + package: 'LBGit-Core'; + package: 'LBGit-Tests' with: [ + spec requires: #('LBGit-Core'). ]. spec group: 'FileSystemGit' with: #('FileSystem-Git' ); group: 'FileSystem' with: #('FS-Core' 'FS-Disk' 'FS-Memory' 'FS-AnsiStreams' 'FS-FileDirectory-Adapters' ); - group: 'tests' with: #('Squit' 'FS-Tests-Core' 'FS-Tests-Disk' 'FS-Tests-Memory' 'FS-Tests-AnsiStreams'); - group: 'default' with: #('Squit' 'Squot'). ]. + group: 'tests' with: #('Squit' 'FS-Tests-Core' 'FS-Tests-Disk' 'FS-Tests-Memory' 'FS-Tests-AnsiStreams' 'LBGit-Tests'); + group: 'default' with: #('Squit' 'Squot' 'LBGit-Core'). ]. diff --git a/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json b/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json index 9f20305d1..881ed4079 100644 --- a/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json +++ b/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json @@ -2,5 +2,5 @@ "class" : { }, "instance" : { - "baseline:" : "jr 1/2/2019 00:52", + "baseline:" : "LB 4/11/2019 11:30", "projectClass" : "jr 5/4/2017 17:25" } } From 6cb2827b37405ca7cfd0f231039be7b408946f7c Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 11 Apr 2019 11:58:39 +0200 Subject: [PATCH 129/170] Moved lbgit to src --- .../BaselineOfLBGit.package}/.filetree | 0 .../BaselineOfLBGit.package}/.squot-contents | 0 .../BaselineOfLBGit.package}/BaselineOfLBGit.class/README.md | 0 .../BaselineOfLBGit.class/instance/baseline..st | 0 .../BaselineOfLBGit.class/instance/postLoad.st | 0 .../BaselineOfLBGit.class/methodProperties.json | 0 .../BaselineOfLBGit.class/properties.json | 0 .../BaselineOfLBGit.package}/monticello.meta/categories.st | 0 .../BaselineOfLBGit.package}/monticello.meta/initializers.st | 0 .../BaselineOfLBGit.package}/properties.json | 0 {LBGit-Core.package => src/LBGit-Core.package}/.filetree | 0 {LBGit-Core.package => src/LBGit-Core.package}/.squot-contents | 0 .../LBGitArtifactReplacementDiff.class/README.md | 0 .../instance/applyToContainer..st | 0 .../LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../LBGitArtifactReplacementDiff.class/methodProperties.json | 0 .../LBGitArtifactReplacementDiff.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileAddition.class/README.md | 0 .../LBGitFileAddition.class/instance/applyWith..st | 0 .../LBGitFileAddition.class/instance/before.st | 0 .../LBGit-Core.package}/LBGitFileAddition.class/instance/title.st | 0 .../LBGitFileAddition.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileAddition.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileConflict.class/README.md | 0 .../LBGitFileConflict.class/class/left.right..st | 0 .../LBGitFileConflict.class/instance/applyWith..st | 0 .../LBGitFileConflict.class/instance/asDiffNode.st | 0 .../LBGit-Core.package}/LBGitFileConflict.class/instance/body.st | 0 .../LBGitFileConflict.class/instance/choice.st | 0 .../LBGitFileConflict.class/instance/isConflict.st | 0 .../LBGitFileConflict.class/instance/leftChange..st | 0 .../LBGitFileConflict.class/instance/leftChange.st | 0 .../LBGitFileConflict.class/instance/rightChange..st | 0 .../LBGitFileConflict.class/instance/rightChange.st | 0 .../LBGit-Core.package}/LBGitFileConflict.class/instance/title.st | 0 .../LBGitFileConflict.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileConflict.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileDiff.class/README.md | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/after.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/applyTo..st | 0 .../LBGitFileDiff.class/instance/applyWith..st | 0 .../LBGitFileDiff.class/instance/asDiffNode.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/before.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/body.st | 0 .../LBGitFileDiff.class/instance/isConflict.st | 0 .../LBGitFileDiff.class/instance/mergeWith..st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/parent..st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/parent.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/path..st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/path.st | 0 .../LBGitFileDiff.class/instance/squotChangeAsStringOrText.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/instance/title.st | 0 .../LBGit-Core.package}/LBGitFileDiff.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileDiff.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/README.md | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/class/empty.st | 0 .../LBGitFileListDiff.class/class/left.right..st | 0 .../LBGitFileListDiff.class/instance/added..st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/added.st | 0 .../LBGitFileListDiff.class/instance/applyToContainer..st | 0 .../LBGitFileListDiff.class/instance/asDiffTree.st | 0 .../LBGitFileListDiff.class/instance/createDiffs.st | 0 .../LBGitFileListDiff.class/instance/createFile..st | 0 .../LBGitFileListDiff.class/instance/deleteFile..st | 0 .../LBGitFileListDiff.class/instance/diff.against..st | 0 .../LBGitFileListDiff.class/instance/diffAdded.st | 0 .../LBGitFileListDiff.class/instance/diffAt..st | 0 .../LBGitFileListDiff.class/instance/diffModified.st | 0 .../LBGitFileListDiff.class/instance/diffPaths.st | 0 .../LBGitFileListDiff.class/instance/diffRemoved.st | 0 .../LBGitFileListDiff.class/instance/diffs..st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/diffs.st | 0 .../LBGitFileListDiff.class/instance/gitReferenceOn..st | 0 .../LBGitFileListDiff.class/instance/hasChanges.st | 0 .../LBGitFileListDiff.class/instance/hasConflicts.st | 0 .../LBGitFileListDiff.class/instance/isAddition.st | 0 .../LBGitFileListDiff.class/instance/isFileModified..st | 0 .../LBGitFileListDiff.class/instance/isRemoval.st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/left..st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/left.st | 0 .../LBGitFileListDiff.class/instance/leftReferenceOn..st | 0 .../LBGitFileListDiff.class/instance/mergeWith..st | 0 .../LBGitFileListDiff.class/instance/mergeWithRemoval..st | 0 .../LBGitFileListDiff.class/instance/modified..st | 0 .../LBGitFileListDiff.class/instance/modified.st | 0 .../LBGitFileListDiff.class/instance/newSquotDiffNodes.st | 0 .../LBGitFileListDiff.class/instance/originalOrAddedArtifact.st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/path.st | 0 .../LBGitFileListDiff.class/instance/removed..st | 0 .../LBGitFileListDiff.class/instance/removed.st | 0 .../LBGitFileListDiff.class/instance/right..st | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/instance/right.st | 0 .../LBGitFileListDiff.class/instance/rightReferenceOn..st | 0 .../LBGitFileListDiff.class/instance/sourceReferenceOn..st | 0 .../LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st | 0 .../LBGitFileListDiff.class/instance/squotHasChanges.st | 0 .../LBGitFileListDiff.class/instance/squotHasConflicts.st | 0 .../LBGitFileListDiff.class/instance/stayed..st | 0 .../LBGitFileListDiff.class/instance/stayed.st | 0 .../LBGitFileListDiff.class/instance/storeInfo.st | 0 .../LBGitFileListDiff.class/instance/target..st | 0 .../LBGitFileListDiff.class/instance/target.st | 0 .../LBGitFileListDiff.class/instance/targetReferenceOn..st | 0 .../LBGitFileListDiff.class/instance/topNodes.st | 0 .../LBGitFileListDiff.class/instance/updateFile..st | 0 .../LBGitFileListDiff.class/instance/workingDirectory.st | 0 .../LBGitFileListDiff.class/instance/workingReferenceOn..st | 0 .../LBGitFileListDiff.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileListDiff.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileMetadata.class/README.md | 0 .../LBGitFileMetadata.class/class/onTreeEntry..st | 0 .../LBGitFileMetadata.class/instance/contentChangesTo..st | 0 .../LBGitFileMetadata.class/instance/contents.st | 0 .../LBGitFileMetadata.class/instance/entryHash.st | 0 .../LBGitFileMetadata.class/instance/gitChangesTo..st | 0 .../LBGitFileMetadata.class/instance/hasChangesTo..st | 0 .../LBGit-Core.package}/LBGitFileMetadata.class/instance/path..st | 0 .../LBGit-Core.package}/LBGitFileMetadata.class/instance/path.st | 0 .../LBGitFileMetadata.class/instance/treeEntry..st | 0 .../LBGitFileMetadata.class/instance/treeEntry.st | 0 .../LBGitFileMetadata.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileMetadata.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileModification.class/README.md | 0 .../LBGitFileModification.class/instance/applyWith..st | 0 .../LBGitFileModification.class/instance/title.st | 0 .../LBGitFileModification.class/methodProperties.json | 0 .../LBGitFileModification.class/properties.json | 0 .../LBGit-Core.package}/LBGitFileRemoval.class/README.md | 0 .../LBGit-Core.package}/LBGitFileRemoval.class/instance/after.st | 0 .../LBGitFileRemoval.class/instance/applyWith..st | 0 .../LBGit-Core.package}/LBGitFileRemoval.class/instance/title.st | 0 .../LBGitFileRemoval.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFileRemoval.class/properties.json | 0 .../LBGit-Core.package}/LBGitFilesArtifact.class/README.md | 0 .../LBGit-Core.package}/LBGitFilesArtifact.class/class/path.st | 0 .../LBGitFilesArtifact.class/instance/capture.st | 0 .../LBGitFilesArtifact.class/instance/collectTrackedFiles.st | 0 .../LBGitFilesArtifact.class/instance/diffAgainst..st | 0 .../instance/diffContentAgainstThatOf..st | 0 .../LBGitFilesArtifact.class/instance/displayText.st | 0 .../LBGitFilesArtifact.class/instance/isLoadable.st | 0 .../LBGitFilesArtifact.class/instance/isSquotFile..st | 0 .../instance/materializeWith.replacing..st | 0 .../LBGitFilesArtifact.class/instance/ownerSnapshot..st | 0 .../LBGitFilesArtifact.class/instance/ownerSnapshot.st | 0 .../LBGit-Core.package}/LBGitFilesArtifact.class/instance/path.st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../instance/reverseDiffAgainstRecordedFiles..st | 0 .../instance/reverseDiffAgainstUnrecordedFiles..st | 0 .../instance/reverseDiffContentAgainst..st | 0 .../LBGitFilesArtifact.class/instance/rootDirectory..st | 0 .../LBGitFilesArtifact.class/instance/rootDirectory.st | 0 .../LBGitFilesArtifact.class/instance/squotSummaryText.st | 0 .../LBGitFilesArtifact.class/instance/storeInfo.st | 0 .../LBGitFilesArtifact.class/instance/trackedFiles..st | 0 .../LBGitFilesArtifact.class/instance/trackedFiles.st | 0 .../instance/wantsToBeInTableOfContents.st | 0 .../LBGitFilesArtifact.class/instance/workingDirectory.st | 0 .../LBGitFilesArtifact.class/methodProperties.json | 0 .../LBGit-Core.package}/LBGitFilesArtifact.class/properties.json | 0 .../LBGit-Core.package}/LBGitLiveFilesArtifact.class/README.md | 0 .../LBGitLiveFilesArtifact.class/instance/allFiles.st | 0 .../LBGitLiveFilesArtifact.class/instance/capture.st | 0 .../LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st | 0 .../LBGitLiveFilesArtifact.class/instance/diffAgainst..st | 0 .../LBGitLiveFilesArtifact.class/instance/initializeOn..st | 0 .../LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st | 0 .../LBGitLiveFilesArtifact.class/instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../instance/reverseDiffAgainstRecordedFiles..st | 0 .../LBGitLiveFilesArtifact.class/instance/storeWith..st | 0 .../LBGitLiveFilesArtifact.class/instance/workingDirectory.st | 0 .../LBGitLiveFilesArtifact.class/methodProperties.json | 0 .../LBGitLiveFilesArtifact.class/properties.json | 0 .../LBGitRecordedFilesArtifact.class/README.md | 0 .../LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st | 0 .../instance/collectTrackedFiles.st | 0 .../LBGitRecordedFilesArtifact.class/instance/commit.st | 0 .../LBGitRecordedFilesArtifact.class/instance/diffAgainst..st | 0 .../LBGitRecordedFilesArtifact.class/instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../instance/reverseDiffAgainstRecordedFiles..st | 0 .../LBGitRecordedFilesArtifact.class/instance/workingDirectory.st | 0 .../LBGitRecordedFilesArtifact.class/methodProperties.json | 0 .../LBGitRecordedFilesArtifact.class/properties.json | 0 .../LBGit-Core.package}/monticello.meta/categories.st | 0 .../LBGit-Core.package}/monticello.meta/initializers.st | 0 {LBGit-Core.package => src/LBGit-Core.package}/properties.json | 0 {LBGit-Tests.package => src/LBGit-Tests.package}/.filetree | 0 {LBGit-Tests.package => src/LBGit-Tests.package}/.squot-contents | 0 .../LBGit-Tests.package}/LBGitLocalTests.class/README.md | 0 .../LBGitLocalTests.class/instance/testCommitAddsFile.st | 0 .../LBGitLocalTests.class/instance/testCommitAddsFileContent.st | 0 .../LBGitLocalTests.class/instance/testCommitDeletesFile.st | 0 .../LBGitLocalTests.class/instance/testCommitUpdatesFile.st | 0 .../instance/testInitialTrackedFilesArtifact.st | 0 .../LBGitLocalTests.class/instance/testSetupSuccess.st | 0 .../LBGitLocalTests.class/methodProperties.json | 0 .../LBGit-Tests.package}/LBGitLocalTests.class/properties.json | 0 .../LBGit-Tests.package}/LBGitRemoteTests.class/README.md | 0 .../LBGitRemoteTests.class/instance/branchName.st | 0 .../LBGitRemoteTests.class/instance/browser..st | 0 .../LBGitRemoteTests.class/instance/browser.st | 0 .../LBGitRemoteTests.class/instance/commitOtherMessaged..st | 0 .../LBGitRemoteTests.class/instance/createBranch.st | 0 .../LBGitRemoteTests.class/instance/credentials.st | 0 .../LBGitRemoteTests.class/instance/deleteBranch.st | 0 .../LBGitRemoteTests.class/instance/generateToken.st | 0 .../LBGitRemoteTests.class/instance/initialize.st | 0 .../LBGitRemoteTests.class/instance/otherCommit.st | 0 .../LBGitRemoteTests.class/instance/otherReference.st | 0 .../LBGitRemoteTests.class/instance/otherWorkingCopy..st | 0 .../LBGitRemoteTests.class/instance/otherWorkingCopy.st | 0 .../LBGitRemoteTests.class/instance/performTest.st | 0 .../LBGitRemoteTests.class/instance/pullOther.st | 0 .../LBGit-Tests.package}/LBGitRemoteTests.class/instance/push.st | 0 .../LBGitRemoteTests.class/instance/remainingAttempts..st | 0 .../LBGitRemoteTests.class/instance/remainingAttempts.st | 0 .../LBGitRemoteTests.class/instance/remoteURL.st | 0 .../LBGitRemoteTests.class/instance/retryTest.st | 0 .../LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUp.st | 0 .../LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st | 0 .../LBGitRemoteTests.class/instance/setUpRemote.st | 0 .../LBGitRemoteTests.class/instance/setUpRemoteFor..st | 0 .../LBGitRemoteTests.class/instance/tearDown.st | 0 .../LBGitRemoteTests.class/instance/testMergeGenerated.st | 0 .../LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st | 0 .../LBGitRemoteTests.class/instance/testOnOwnBranch.st | 0 .../LBGitRemoteTests.class/instance/testPushAddsFile.st | 0 .../LBGitRemoteTests.class/instance/testPushAddsFileContent.st | 0 .../instance/testPushAddsFileInNewFolder.st | 0 .../LBGitRemoteTests.class/instance/testPushAddsFileToTree.st | 0 .../LBGitRemoteTests.class/instance/testPushDeletedFile.st | 0 .../LBGitRemoteTests.class/instance/testPushImageRegression.st | 0 .../LBGitRemoteTests.class/instance/testPushUpdatesFile.st | 0 .../LBGitRemoteTests.class/instance/testReadmeExists.st | 0 .../LBGitRemoteTests.class/instance/testSetupSuccess.st | 0 .../LBGitRemoteTests.class/instance/token..st | 0 .../LBGit-Tests.package}/LBGitRemoteTests.class/instance/token.st | 0 .../LBGitRemoteTests.class/instance/transferMessaged..st | 0 .../LBGitRemoteTests.class/methodProperties.json | 0 .../LBGit-Tests.package}/LBGitRemoteTests.class/properties.json | 0 .../LBGitSquitBrowserForTests.class/README.md | 0 .../LBGitSquitBrowserForTests.class/instance/projectSelection..st | 0 .../LBGitSquitBrowserForTests.class/instance/projectSelection.st | 0 .../LBGitSquitBrowserForTests.class/methodProperties.json | 0 .../LBGitSquitBrowserForTests.class/properties.json | 0 .../LBGit-Tests.package}/LBGitTestCase.class/README.md | 0 .../LBGit-Tests.package}/LBGitTestCase.class/instance/commit.st | 0 .../LBGitTestCase.class/instance/commitDummyFileAddition.st | 0 .../LBGitTestCase.class/instance/commitMessaged..st | 0 .../LBGitTestCase.class/instance/createDummyFile.st | 0 .../LBGitTestCase.class/instance/createDummyImage.st | 0 .../LBGitTestCase.class/instance/deleteDummyFile.st | 0 .../LBGitTestCase.class/instance/dummyContents.st | 0 .../LBGitTestCase.class/instance/dummyContents2.st | 0 .../LBGitTestCase.class/instance/dummyFile.st | 0 .../LBGitTestCase.class/instance/dummyFile2.st | 0 .../LBGitTestCase.class/instance/dummyImage.st | 0 .../LBGitTestCase.class/instance/dummyImageContents.st | 0 .../LBGitTestCase.class/instance/gitReference.st | 0 .../LBGitTestCase.class/instance/makeWorkingCopyAt..st | 0 .../LBGitTestCase.class/instance/performTest.st | 0 .../LBGitTestCase.class/instance/reference..st | 0 .../LBGitTestCase.class/instance/reference.st | 0 .../LBGit-Tests.package}/LBGitTestCase.class/instance/setUp.st | 0 .../instance/suppressProgressDisplayDuring..st | 0 .../LBGit-Tests.package}/LBGitTestCase.class/instance/tearDown.st | 0 .../LBGitTestCase.class/instance/workingCopy..st | 0 .../LBGitTestCase.class/instance/workingCopy.st | 0 .../LBGitTestCase.class/instance/write.to.in..st | 0 .../LBGitTestCase.class/instance/writeToDummyFile..st | 0 .../LBGitTestCase.class/methodProperties.json | 0 .../LBGit-Tests.package}/LBGitTestCase.class/properties.json | 0 .../LBGit-Tests.package}/monticello.meta/categories.st | 0 .../LBGit-Tests.package}/monticello.meta/initializers.st | 0 {LBGit-Tests.package => src/LBGit-Tests.package}/properties.json | 0 278 files changed, 0 insertions(+), 0 deletions(-) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/.filetree (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/.squot-contents (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/BaselineOfLBGit.class/README.md (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/BaselineOfLBGit.class/instance/baseline..st (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/BaselineOfLBGit.class/instance/postLoad.st (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/BaselineOfLBGit.class/methodProperties.json (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/BaselineOfLBGit.class/properties.json (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/monticello.meta/categories.st (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/monticello.meta/initializers.st (100%) rename {BaselineOfLBGit.package => src/BaselineOfLBGit.package}/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/.filetree (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/.squot-contents (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitArtifactReplacementDiff.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/instance/applyWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/instance/before.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/instance/title.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileAddition.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/class/left.right..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/applyWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/asDiffNode.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/body.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/choice.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/isConflict.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/leftChange..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/leftChange.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/rightChange..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/rightChange.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/instance/title.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileConflict.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/after.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/applyTo..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/applyWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/asDiffNode.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/before.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/body.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/isConflict.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/mergeWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/parent..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/parent.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/path..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/path.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/instance/title.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileDiff.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/class/empty.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/class/left.right..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/added..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/added.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/applyToContainer..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/asDiffTree.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/createDiffs.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/createFile..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/deleteFile..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diff.against..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffAdded.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffAt..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffModified.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffPaths.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffRemoved.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffs..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/diffs.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/gitReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/hasChanges.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/hasConflicts.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/isAddition.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/isFileModified..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/isRemoval.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/left..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/left.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/leftReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/mergeWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/mergeWithRemoval..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/modified..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/modified.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/newSquotDiffNodes.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/path.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/removed..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/removed.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/right..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/right.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/rightReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/sourceReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/squotHasChanges.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/squotHasConflicts.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/stayed..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/stayed.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/storeInfo.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/target..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/target.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/targetReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/topNodes.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/updateFile..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/workingDirectory.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/instance/workingReferenceOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileListDiff.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/class/onTreeEntry..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/contentChangesTo..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/contents.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/entryHash.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/gitChangesTo..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/hasChangesTo..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/path..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/path.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/treeEntry..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/instance/treeEntry.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileMetadata.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileModification.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileModification.class/instance/applyWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileModification.class/instance/title.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileModification.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileModification.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/instance/after.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/instance/applyWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/instance/title.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFileRemoval.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/class/path.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/capture.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/displayText.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/isLoadable.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/isSquotFile..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/materializeWith.replacing..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/ownerSnapshot..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/ownerSnapshot.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/path.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/rootDirectory..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/rootDirectory.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/squotSummaryText.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/storeInfo.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/trackedFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/trackedFiles.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/instance/workingDirectory.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitFilesArtifact.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/allFiles.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/capture.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/initializeOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/printOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/storeWith..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/instance/workingDirectory.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitLiveFilesArtifact.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/README.md (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/commit.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/printOn..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/methodProperties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/LBGitRecordedFilesArtifact.class/properties.json (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/monticello.meta/categories.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/monticello.meta/initializers.st (100%) rename {LBGit-Core.package => src/LBGit-Core.package}/properties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/.filetree (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/.squot-contents (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/README.md (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testCommitAddsFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testCommitAddsFileContent.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testCommitDeletesFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testCommitUpdatesFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/instance/testSetupSuccess.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/methodProperties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitLocalTests.class/properties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/README.md (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/branchName.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/browser..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/browser.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/commitOtherMessaged..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/createBranch.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/credentials.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/deleteBranch.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/generateToken.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/initialize.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/otherCommit.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/otherReference.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/otherWorkingCopy..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/otherWorkingCopy.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/performTest.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/pullOther.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/push.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/remainingAttempts..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/remainingAttempts.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/remoteURL.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/retryTest.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUp.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUpRemote.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/setUpRemoteFor..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/tearDown.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testMergeGenerated.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testOnOwnBranch.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushAddsFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushAddsFileContent.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushDeletedFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushImageRegression.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testPushUpdatesFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testReadmeExists.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/testSetupSuccess.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/token..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/token.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/instance/transferMessaged..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/methodProperties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitRemoteTests.class/properties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitSquitBrowserForTests.class/README.md (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitSquitBrowserForTests.class/instance/projectSelection..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitSquitBrowserForTests.class/instance/projectSelection.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitSquitBrowserForTests.class/methodProperties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitSquitBrowserForTests.class/properties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/README.md (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/commit.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/commitDummyFileAddition.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/commitMessaged..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/createDummyFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/createDummyImage.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/deleteDummyFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyContents.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyContents2.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyFile.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyFile2.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyImage.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/dummyImageContents.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/gitReference.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/makeWorkingCopyAt..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/performTest.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/reference..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/reference.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/setUp.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/tearDown.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/workingCopy..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/workingCopy.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/write.to.in..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/instance/writeToDummyFile..st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/methodProperties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/LBGitTestCase.class/properties.json (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/monticello.meta/categories.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/monticello.meta/initializers.st (100%) rename {LBGit-Tests.package => src/LBGit-Tests.package}/properties.json (100%) diff --git a/BaselineOfLBGit.package/.filetree b/src/BaselineOfLBGit.package/.filetree similarity index 100% rename from BaselineOfLBGit.package/.filetree rename to src/BaselineOfLBGit.package/.filetree diff --git a/BaselineOfLBGit.package/.squot-contents b/src/BaselineOfLBGit.package/.squot-contents similarity index 100% rename from BaselineOfLBGit.package/.squot-contents rename to src/BaselineOfLBGit.package/.squot-contents diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md similarity index 100% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/README.md rename to src/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st similarity index 100% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st rename to src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st similarity index 100% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st rename to src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json similarity index 100% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json rename to src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json diff --git a/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json similarity index 100% rename from BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json rename to src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json diff --git a/BaselineOfLBGit.package/monticello.meta/categories.st b/src/BaselineOfLBGit.package/monticello.meta/categories.st similarity index 100% rename from BaselineOfLBGit.package/monticello.meta/categories.st rename to src/BaselineOfLBGit.package/monticello.meta/categories.st diff --git a/BaselineOfLBGit.package/monticello.meta/initializers.st b/src/BaselineOfLBGit.package/monticello.meta/initializers.st similarity index 100% rename from BaselineOfLBGit.package/monticello.meta/initializers.st rename to src/BaselineOfLBGit.package/monticello.meta/initializers.st diff --git a/BaselineOfLBGit.package/properties.json b/src/BaselineOfLBGit.package/properties.json similarity index 100% rename from BaselineOfLBGit.package/properties.json rename to src/BaselineOfLBGit.package/properties.json diff --git a/LBGit-Core.package/.filetree b/src/LBGit-Core.package/.filetree similarity index 100% rename from LBGit-Core.package/.filetree rename to src/LBGit-Core.package/.filetree diff --git a/LBGit-Core.package/.squot-contents b/src/LBGit-Core.package/.squot-contents similarity index 100% rename from LBGit-Core.package/.squot-contents rename to src/LBGit-Core.package/.squot-contents diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json rename to src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json diff --git a/LBGit-Core.package/LBGitFileAddition.class/README.md b/src/LBGit-Core.package/LBGitFileAddition.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/README.md rename to src/LBGit-Core.package/LBGitFileAddition.class/README.md diff --git a/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st b/src/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st rename to src/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st diff --git a/LBGit-Core.package/LBGitFileAddition.class/instance/before.st b/src/LBGit-Core.package/LBGitFileAddition.class/instance/before.st similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/instance/before.st rename to src/LBGit-Core.package/LBGitFileAddition.class/instance/before.st diff --git a/LBGit-Core.package/LBGitFileAddition.class/instance/title.st b/src/LBGit-Core.package/LBGitFileAddition.class/instance/title.st similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/instance/title.st rename to src/LBGit-Core.package/LBGitFileAddition.class/instance/title.st diff --git a/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileAddition.class/properties.json b/src/LBGit-Core.package/LBGitFileAddition.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileAddition.class/properties.json rename to src/LBGit-Core.package/LBGitFileAddition.class/properties.json diff --git a/LBGit-Core.package/LBGitFileConflict.class/README.md b/src/LBGit-Core.package/LBGitFileConflict.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/README.md rename to src/LBGit-Core.package/LBGitFileConflict.class/README.md diff --git a/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st b/src/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/class/left.right..st rename to src/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/body.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/body.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/body.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/body.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/choice.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/instance/title.st b/src/LBGit-Core.package/LBGitFileConflict.class/instance/title.st similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/instance/title.st rename to src/LBGit-Core.package/LBGitFileConflict.class/instance/title.st diff --git a/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileConflict.class/properties.json b/src/LBGit-Core.package/LBGitFileConflict.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileConflict.class/properties.json rename to src/LBGit-Core.package/LBGitFileConflict.class/properties.json diff --git a/LBGit-Core.package/LBGitFileDiff.class/README.md b/src/LBGit-Core.package/LBGitFileDiff.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/README.md rename to src/LBGit-Core.package/LBGitFileDiff.class/README.md diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/after.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/after.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/before.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/before.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/body.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/body.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/body.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/body.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/parent..st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/parent.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/path..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/path..st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/path..st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/path..st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/path.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/path.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/path.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/path.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/instance/title.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/title.st similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/instance/title.st rename to src/LBGit-Core.package/LBGitFileDiff.class/instance/title.st diff --git a/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileDiff.class/properties.json b/src/LBGit-Core.package/LBGitFileDiff.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileDiff.class/properties.json rename to src/LBGit-Core.package/LBGitFileDiff.class/properties.json diff --git a/LBGit-Core.package/LBGitFileListDiff.class/README.md b/src/LBGit-Core.package/LBGitFileListDiff.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/README.md rename to src/LBGit-Core.package/LBGitFileListDiff.class/README.md diff --git a/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st b/src/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/class/empty.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st b/src/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/added..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/added.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/left..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/left.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/path.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/right..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/right.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/target..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/target.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st rename to src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st diff --git a/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileListDiff.class/properties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileListDiff.class/properties.json rename to src/LBGit-Core.package/LBGitFileListDiff.class/properties.json diff --git a/LBGit-Core.package/LBGitFileMetadata.class/README.md b/src/LBGit-Core.package/LBGitFileMetadata.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/README.md rename to src/LBGit-Core.package/LBGitFileMetadata.class/README.md diff --git a/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st b/src/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/path..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/path.st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st rename to src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st diff --git a/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileMetadata.class/properties.json b/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileMetadata.class/properties.json rename to src/LBGit-Core.package/LBGitFileMetadata.class/properties.json diff --git a/LBGit-Core.package/LBGitFileModification.class/README.md b/src/LBGit-Core.package/LBGitFileModification.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileModification.class/README.md rename to src/LBGit-Core.package/LBGitFileModification.class/README.md diff --git a/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st b/src/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st rename to src/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st diff --git a/LBGit-Core.package/LBGitFileModification.class/instance/title.st b/src/LBGit-Core.package/LBGitFileModification.class/instance/title.st similarity index 100% rename from LBGit-Core.package/LBGitFileModification.class/instance/title.st rename to src/LBGit-Core.package/LBGitFileModification.class/instance/title.st diff --git a/LBGit-Core.package/LBGitFileModification.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileModification.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileModification.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileModification.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileModification.class/properties.json b/src/LBGit-Core.package/LBGitFileModification.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileModification.class/properties.json rename to src/LBGit-Core.package/LBGitFileModification.class/properties.json diff --git a/LBGit-Core.package/LBGitFileRemoval.class/README.md b/src/LBGit-Core.package/LBGitFileRemoval.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/README.md rename to src/LBGit-Core.package/LBGitFileRemoval.class/README.md diff --git a/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st b/src/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/instance/after.st rename to src/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st diff --git a/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st b/src/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st rename to src/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st diff --git a/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st b/src/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/instance/title.st rename to src/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st diff --git a/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFileRemoval.class/properties.json b/src/LBGit-Core.package/LBGitFileRemoval.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFileRemoval.class/properties.json rename to src/LBGit-Core.package/LBGitFileRemoval.class/properties.json diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/README.md b/src/LBGit-Core.package/LBGitFilesArtifact.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/README.md rename to src/LBGit-Core.package/LBGitFilesArtifact.class/README.md diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/class/path.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitFilesArtifact.class/properties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitFilesArtifact.class/properties.json rename to src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json rename to src/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json diff --git a/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json similarity index 100% rename from LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json rename to src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json diff --git a/LBGit-Core.package/monticello.meta/categories.st b/src/LBGit-Core.package/monticello.meta/categories.st similarity index 100% rename from LBGit-Core.package/monticello.meta/categories.st rename to src/LBGit-Core.package/monticello.meta/categories.st diff --git a/LBGit-Core.package/monticello.meta/initializers.st b/src/LBGit-Core.package/monticello.meta/initializers.st similarity index 100% rename from LBGit-Core.package/monticello.meta/initializers.st rename to src/LBGit-Core.package/monticello.meta/initializers.st diff --git a/LBGit-Core.package/properties.json b/src/LBGit-Core.package/properties.json similarity index 100% rename from LBGit-Core.package/properties.json rename to src/LBGit-Core.package/properties.json diff --git a/LBGit-Tests.package/.filetree b/src/LBGit-Tests.package/.filetree similarity index 100% rename from LBGit-Tests.package/.filetree rename to src/LBGit-Tests.package/.filetree diff --git a/LBGit-Tests.package/.squot-contents b/src/LBGit-Tests.package/.squot-contents similarity index 100% rename from LBGit-Tests.package/.squot-contents rename to src/LBGit-Tests.package/.squot-contents diff --git a/LBGit-Tests.package/LBGitLocalTests.class/README.md b/src/LBGit-Tests.package/LBGitLocalTests.class/README.md similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/README.md rename to src/LBGit-Tests.package/LBGitLocalTests.class/README.md diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st rename to src/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st diff --git a/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json b/src/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json rename to src/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json diff --git a/LBGit-Tests.package/LBGitLocalTests.class/properties.json b/src/LBGit-Tests.package/LBGitLocalTests.class/properties.json similarity index 100% rename from LBGit-Tests.package/LBGitLocalTests.class/properties.json rename to src/LBGit-Tests.package/LBGitLocalTests.class/properties.json diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/README.md b/src/LBGit-Tests.package/LBGitRemoteTests.class/README.md similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/README.md rename to src/LBGit-Tests.package/LBGitRemoteTests.class/README.md diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st rename to src/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json rename to src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json diff --git a/LBGit-Tests.package/LBGitRemoteTests.class/properties.json b/src/LBGit-Tests.package/LBGitRemoteTests.class/properties.json similarity index 100% rename from LBGit-Tests.package/LBGitRemoteTests.class/properties.json rename to src/LBGit-Tests.package/LBGitRemoteTests.class/properties.json diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md b/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md similarity index 100% rename from LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md rename to src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st b/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st similarity index 100% rename from LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st rename to src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st b/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st similarity index 100% rename from LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st rename to src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json b/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json similarity index 100% rename from LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json rename to src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json diff --git a/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json b/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json similarity index 100% rename from LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json rename to src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json diff --git a/LBGit-Tests.package/LBGitTestCase.class/README.md b/src/LBGit-Tests.package/LBGitTestCase.class/README.md similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/README.md rename to src/LBGit-Tests.package/LBGitTestCase.class/README.md diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/commit.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/reference..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/reference.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st b/src/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st rename to src/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st diff --git a/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json b/src/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/methodProperties.json rename to src/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json diff --git a/LBGit-Tests.package/LBGitTestCase.class/properties.json b/src/LBGit-Tests.package/LBGitTestCase.class/properties.json similarity index 100% rename from LBGit-Tests.package/LBGitTestCase.class/properties.json rename to src/LBGit-Tests.package/LBGitTestCase.class/properties.json diff --git a/LBGit-Tests.package/monticello.meta/categories.st b/src/LBGit-Tests.package/monticello.meta/categories.st similarity index 100% rename from LBGit-Tests.package/monticello.meta/categories.st rename to src/LBGit-Tests.package/monticello.meta/categories.st diff --git a/LBGit-Tests.package/monticello.meta/initializers.st b/src/LBGit-Tests.package/monticello.meta/initializers.st similarity index 100% rename from LBGit-Tests.package/monticello.meta/initializers.st rename to src/LBGit-Tests.package/monticello.meta/initializers.st diff --git a/LBGit-Tests.package/properties.json b/src/LBGit-Tests.package/properties.json similarity index 100% rename from LBGit-Tests.package/properties.json rename to src/LBGit-Tests.package/properties.json From dedb05286a25b2e61ccaeeeb704ccc66ef38c490 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Thu, 11 Apr 2019 12:02:06 +0200 Subject: [PATCH 130/170] update .squot --- .squot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.squot b/.squot index d6b09363f..45dad35aa 100644 --- a/.squot +++ b/.squot @@ -15,7 +15,7 @@ OrderedDictionary { 'src\/FS-Tests-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-AnsiStreams.package' : #SquotCypressCodeSerializer, 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer, - 'BaselineOfLBGit.package' : #SquotCypressCodeSerializer, - 'LBGit-Core.package' : #SquotCypressCodeSerializer, - 'LBGit-Tests.package' : #SquotCypressCodeSerializer + 'src\/BaselineOfLBGit.package' : #SquotCypressCodeSerializer, + 'src\/LBGit-Core.package' : #SquotCypressCodeSerializer, + 'src\/LBGit-Tests.package' : #SquotCypressCodeSerializer } \ No newline at end of file From 51fc4c53a6d8f1f27df1c71b3cb39e9ead74de3a Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 15:51:51 +0200 Subject: [PATCH 131/170] Added missing methods storeWith: on all file lists and asConflicts on file list diff --- .../LBGitFileListDiff.class/instance/asConflicts.st | 4 ++++ .../LBGitFileListDiff.class/instance/privateAsConflicts.st | 4 ++++ .../LBGitFileListDiff.class/methodProperties.json | 2 ++ .../instance/storeWith..st | 0 .../LBGitFilesArtifact.class/methodProperties.json | 1 + .../LBGitLiveFilesArtifact.class/methodProperties.json | 1 - 6 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st create mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => LBGitFilesArtifact.class}/instance/storeWith..st (100%) diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st new file mode 100644 index 000000000..e279a792e --- /dev/null +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st @@ -0,0 +1,4 @@ +as yet unclassified +asConflicts + + ^ self shallowCopy privateAsConflicts \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st new file mode 100644 index 000000000..9c501dbae --- /dev/null +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st @@ -0,0 +1,4 @@ +as yet unclassified +privateAsConflicts + + self diffs: (self diffs collect: [:each | LBGitFileConflict left: nil right: each]). \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 05a0cb8af..aef808564 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -6,6 +6,7 @@ "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", "applyToContainer:" : "LB 11/26/2018 16:06", + "asConflicts" : "LB 4/27/2019 15:49", "asDiffTree" : "LB 3/27/2019 18:50", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 3/1/2019 15:57", @@ -34,6 +35,7 @@ "newSquotDiffNodes" : "LB 11/23/2018 15:24", "originalOrAddedArtifact" : "LB 11/22/2018 15:53", "path" : "LB 11/22/2018 16:36", + "privateAsConflicts" : "LB 4/27/2019 15:50", "removed" : "LB 11/22/2018 11:17", "removed:" : "LB 11/22/2018 11:17", "right" : "LB 11/22/2018 11:14", diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/storeWith..st rename to src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeWith..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index f08fb9d54..eb87c4bec 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -21,6 +21,7 @@ "rootDirectory:" : "LB 12/4/2018 14:32", "squotSummaryText" : "LB 2/24/2019 16:03", "storeInfo" : "LB 3/27/2019 18:28", + "storeWith:" : "LB 4/27/2019 15:14", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11", diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index 22075b43c..13368edb6 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -11,5 +11,4 @@ "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", - "storeWith:" : "LB 12/4/2018 14:58", "workingDirectory" : "LB 12/13/2018 17:01" } } From fc1312fb951d133f782e68c249cc6cf8665edeb9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 16:11:17 +0200 Subject: [PATCH 132/170] Live artifact now allows one case of diffing against another: if it is equal --- .../LBGitFilesArtifact.class/instance/^equals.st | 4 ++++ .../LBGitFilesArtifact.class/instance/hash.st | 4 ++++ .../LBGitFilesArtifact.class/methodProperties.json | 2 ++ .../instance/reverseDiffAgainstLiveFiles..st | 1 + .../LBGitLiveFilesArtifact.class/methodProperties.json | 2 +- .../instance/testCherryPickOfOrphanedVersion.st | 2 +- .../SquotWorkingCopyTest.class/methodProperties.json | 2 +- 7 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st create mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st new file mode 100644 index 000000000..74a333a7b --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st @@ -0,0 +1,4 @@ +as yet unclassified += otherObject + + ^ self class = otherObject class and: [self instanceVariableValues = otherObject instanceVariableValues] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st new file mode 100644 index 000000000..ae9b4caec --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st @@ -0,0 +1,4 @@ +as yet unclassified +hash + + ^ self instanceVariableValues fold: [:total :each | total bitXor: each] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index eb87c4bec..9fbfcb2e1 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -2,11 +2,13 @@ "class" : { "path" : "LB 12/7/2018 18:14" }, "instance" : { + "=" : "LB 4/27/2019 16:05", "capture" : "LB 3/27/2019 18:25", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", "displayText" : "LB 11/26/2018 16:25", + "hash" : "LB 4/27/2019 16:04", "isLoadable" : "LB 11/25/2018 13:22", "isSquotFile:" : "LB 12/7/2018 18:16", "materializeWith:replacing:" : "LB 3/27/2019 18:27", diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st index 769bf12b9..2838694c7 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -1,4 +1,5 @@ diffing reverseDiffAgainstLiveFiles: otherFilesArtifact "There is only one live file system" + self = otherFilesArtifact ifTrue: [^ LBGitFileListDiff empty]. ^ self shouldNotImplement \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index 13368edb6..f40fd6957 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -9,6 +9,6 @@ "initializeOn:" : "LB 12/4/2018 14:29", "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", - "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:07", + "reverseDiffAgainstLiveFiles:" : "LB 4/27/2019 16:06", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", "workingDirectory" : "LB 12/13/2018 17:01" } } diff --git a/src/Squot.package/SquotWorkingCopyTest.class/instance/testCherryPickOfOrphanedVersion.st b/src/Squot.package/SquotWorkingCopyTest.class/instance/testCherryPickOfOrphanedVersion.st index 9125e8117..6821211a3 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/instance/testCherryPickOfOrphanedVersion.st +++ b/src/Squot.package/SquotWorkingCopyTest.class/instance/testCherryPickOfOrphanedVersion.st @@ -15,4 +15,4 @@ testCherryPickOfOrphanedVersion do: [:request | request resume] ] valueSupplyingAnswers: {{'*'. #default}}]. "then" - self assert: workingCopy artifacts size = 2. \ No newline at end of file + self assert: workingCopy artifacts size = 3. "The two test categories and the tracked files artifact" \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json index 6d023d071..6bc86db97 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json @@ -14,7 +14,7 @@ "targetClass" : "jr 1/26/2017 17:21", "tearDown" : "jr 4/29/2018 17:16", "testAddMultiplePackagesToSameFolder" : "jr 4/7/2018 17:10", - "testCherryPickOfOrphanedVersion" : "jr 10/13/2018 23:58", + "testCherryPickOfOrphanedVersion" : "LB 4/27/2019 16:09", "testDiffWithParent" : "jr 4/29/2018 17:14", "testMergeRemovalAndChange" : "jr 10/21/2017 16:33", "testMergeSingleArtifact" : "jr 4/29/2018 17:08", From 304dab225e2f2440c918798bc5863d3caab32fe8 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 16:26:58 +0200 Subject: [PATCH 133/170] Adapted tests to reflect addition of tracked files artifact --- .../instance/testMergeTwoOrphanedVersions.st | 2 +- .../SquotWorkingCopyTest.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeTwoOrphanedVersions.st b/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeTwoOrphanedVersions.st index 6913fb2f4..3a1e75ae9 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeTwoOrphanedVersions.st +++ b/src/Squot.package/SquotWorkingCopyTest.class/instance/testMergeTwoOrphanedVersions.st @@ -13,4 +13,4 @@ testMergeTwoOrphanedVersions request resume] ] valueSupplyingAnswers: {{'*'. #default}}]. "then" - self assert: workingCopy artifacts size = 2. \ No newline at end of file + self assert: workingCopy artifacts size = 3. "The two test categories and the tracked files artifact" \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json index 6bc86db97..2f97fee35 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json @@ -18,7 +18,7 @@ "testDiffWithParent" : "jr 4/29/2018 17:14", "testMergeRemovalAndChange" : "jr 10/21/2017 16:33", "testMergeSingleArtifact" : "jr 4/29/2018 17:08", - "testMergeTwoOrphanedVersions" : "jr 4/29/2018 16:56", + "testMergeTwoOrphanedVersions" : "LB 4/27/2019 16:25", "testMergeVersionWithLoadedObjects" : "jr 4/29/2018 17:34", "testMergeWithAddedArtifactOnBothSides" : "jr 10/31/2017 21:35", "testMergeWithConflicts" : "jr 11/18/2018 02:21", From 2345adf617cb36a157d3381e9666714062f42aae Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 17:13:54 +0200 Subject: [PATCH 134/170] Changed way how live file artifact is created: now storing dummy object --- .../LBGitFilesObject.class/README.md | 1 + .../LBGitFilesObject.class/methodProperties.json | 5 +++++ .../LBGitFilesObject.class/properties.json | 14 ++++++++++++++ .../SquotImageStore.class/instance/artifacts.st | 2 +- .../SquotImageStore.class/instance/initialize.st | 7 ++++++- .../SquotImageStore.class/methodProperties.json | 4 ++-- .../SquotWorkingCopy.class/instance/loadOrder.st | 6 +----- .../SquotWorkingCopy.class/methodProperties.json | 2 +- .../instance/initialLoadOrder.st | 4 ++++ .../testCannotMoveDownLastObjectInLoadOrder.st | 6 +++--- .../testCannotMoveUpFirstObjectInLoadOrder.st | 6 +++--- .../instance/testMoveDownInLoadOrder.st | 6 +++--- .../instance/testMoveUpInLoadOrder.st | 6 +++--- .../methodProperties.json | 9 +++++---- 14 files changed, 52 insertions(+), 26 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/README.md create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/properties.json create mode 100644 src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/README.md b/src/LBGit-Core.package/LBGitFilesObject.class/README.md new file mode 100644 index 000000000..c6f4a0fda --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/README.md @@ -0,0 +1 @@ +I am an Object for the sole purpose of being stored in an object store to be able to create an artifact for me. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json new file mode 100644 index 000000000..0e4a66223 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + } } diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json new file mode 100644 index 000000000..190fedeb2 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "LB 4/27/2019 16:52", + "instvars" : [ + ], + "name" : "LBGitFilesObject", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/Squot.package/SquotImageStore.class/instance/artifacts.st b/src/Squot.package/SquotImageStore.class/instance/artifacts.st index 7640d10b2..bd8ced769 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifacts.st +++ b/src/Squot.package/SquotImageStore.class/instance/artifacts.st @@ -4,7 +4,7 @@ artifacts artifactsDictionary := Dictionary new. self objectsWithPathsDo: [:each :path | artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. - artifactsDictionary at: '' put: + artifactsDictionary at: LBGitFilesArtifact path put: (LBGitLiveFilesArtifact new ownerSnapshot: self; yourself). diff --git a/src/Squot.package/SquotImageStore.class/instance/initialize.st b/src/Squot.package/SquotImageStore.class/instance/initialize.st index 1b1c2d59a..32c804709 100644 --- a/src/Squot.package/SquotImageStore.class/instance/initialize.st +++ b/src/Squot.package/SquotImageStore.class/instance/initialize.st @@ -4,4 +4,9 @@ initialize paths := IdentityDictionary new. "object -> collection of path" additionalInfo := Dictionary new. "path -> Dictionary" loadOrder := OrderedCollection new. "paths" - environment := Environment current. \ No newline at end of file + environment := Environment current. + + self + add: LBGitFilesObject new + at: LBGitFilesArtifact path + additionalInfo: SquotTrackedObjectMetadata new. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 72beaed3b..1ece85609 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -13,7 +13,7 @@ "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", "artifactAt:" : "jr 4/7/2018 15:53", - "artifacts" : "LB 11/25/2018 14:36", + "artifacts" : "LB 4/27/2019 17:12", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", "capture:at:" : "jr 9/23/2018 22:31", @@ -25,7 +25,7 @@ "environmentForLoadedArtifact:" : "jr 3/6/2017 14:01", "includes:" : "jr 3/11/2017 01:09", "includesObjectAt:" : "jr 3/8/2017 17:48", - "initialize" : "jr 8/18/2018 15:47", + "initialize" : "LB 4/27/2019 17:10", "initializeObjectFrom:" : "jr 7/22/2017 11:59", "liveArtifactFor:at:" : "jr 4/7/2018 15:53", "loadOrder" : "jr 8/18/2018 16:21", diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st index 775b17a61..ef300c999 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st @@ -1,7 +1,3 @@ accessing loadOrder - - "This method is for compatibility to newer Squot versions" - ^ store loadOrder - addIfNotPresent: LBGitFilesArtifact path; - yourself \ No newline at end of file + ^ store loadOrder \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index e516bcc58..572d1dee1 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -38,7 +38,7 @@ "loadArtifact:" : "jr 9/23/2018 18:06", "loadArtifactInteractively:ifCanceled:" : "jr 9/23/2018 18:09", "loadCurrentVersionInteractively" : "jr 5/28/2017 16:18", - "loadOrder" : "LB 12/7/2018 18:15", + "loadOrder" : "jr 8/18/2018 17:00", "loadOrder:" : "jr 8/18/2018 17:00", "loadPatchInteractively:ifCanceled:" : "jr 4/28/2018 18:26", "loadSnapshot:" : "jr 6/29/2017 16:40", diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st new file mode 100644 index 000000000..14a7d0b8b --- /dev/null +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st @@ -0,0 +1,4 @@ +testing +initialLoadOrder + + ^ {LBGitFilesArtifact path. '1'. '2'.} \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st index c3328c1c3..6f1ab50bf 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st @@ -4,10 +4,10 @@ testCannotMoveDownLastObjectInLoadOrder workingCopy add: Object new at: '1'; add: Object new at: '2'. - self assert: #('1' '2') equals: workingCopy loadOrder asArray. + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. browser selectedObjectIndex: 2. "when" browser moveDownInLoadOrder. "then" - self assert: #('1' '2') equals: workingCopy loadOrder asArray; - assert: #('1' '2') equals: browser objectLabels asArray. \ No newline at end of file + self assert: {LBGitFilesArtifact path. '2'. '1'.} equals: workingCopy loadOrder asArray; + assert: {LBGitFilesArtifact path. '2'. '1'.} equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveUpFirstObjectInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveUpFirstObjectInLoadOrder.st index 5e5069520..cbc9d1b1c 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveUpFirstObjectInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveUpFirstObjectInLoadOrder.st @@ -4,10 +4,10 @@ testCannotMoveUpFirstObjectInLoadOrder workingCopy add: Object new at: '1'; add: Object new at: '2'. - self assert: #('1' '2') equals: workingCopy loadOrder asArray. + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. browser selectedObjectIndex: 1. "when" browser moveUpInLoadOrder. "then" - self assert: #('1' '2') equals: workingCopy loadOrder asArray; - assert: #('1' '2') equals: browser objectLabels asArray. \ No newline at end of file + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray; + assert: self initialLoadOrder equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st index fa73b5b4d..e3153d1b1 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st @@ -4,10 +4,10 @@ testMoveDownInLoadOrder workingCopy add: Object new at: '1'; add: Object new at: '2'. - self assert: #('1' '2') equals: workingCopy loadOrder asArray. + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. browser selectedObjectIndex: 1. "when" browser moveDownInLoadOrder. "then" - self assert: #('2' '1') equals: workingCopy loadOrder asArray; - assert: #('2' '1') equals: browser objectLabels asArray. \ No newline at end of file + self assert: {'1'. LBGitFilesArtifact path. '2'.} equals: workingCopy loadOrder asArray; + assert: {'1'. LBGitFilesArtifact path. '2'.} equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st index eab1a0e5f..a375b81d5 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st @@ -4,10 +4,10 @@ testMoveUpInLoadOrder workingCopy add: Object new at: '1'; add: Object new at: '2'. - self assert: #('1' '2') equals: workingCopy loadOrder asArray. + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. browser selectedObjectIndex: 2. "when" browser moveUpInLoadOrder. "then" - self assert: #('2' '1') equals: workingCopy loadOrder asArray; - assert: #('2' '1') equals: browser objectLabels asArray. \ No newline at end of file + self assert: {'1'. LBGitFilesArtifact path. '2'.} equals: workingCopy loadOrder asArray; + assert: {'1'. LBGitFilesArtifact path. '2'.} equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json index 5d2de8e95..d26679bdf 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json @@ -2,9 +2,10 @@ "class" : { }, "instance" : { + "initialLoadOrder" : "LB 4/27/2019 16:59", "setUp" : "jr 10/3/2018 15:28", - "testCannotMoveDownLastObjectInLoadOrder" : "jr 10/3/2018 15:38", - "testCannotMoveUpFirstObjectInLoadOrder" : "jr 10/3/2018 15:37", + "testCannotMoveDownLastObjectInLoadOrder" : "LB 4/27/2019 17:02", + "testCannotMoveUpFirstObjectInLoadOrder" : "LB 4/27/2019 17:01", "testDisplaying" : "jr 10/3/2018 15:32", - "testMoveDownInLoadOrder" : "jr 10/3/2018 15:38", - "testMoveUpInLoadOrder" : "jr 10/3/2018 15:36" } } + "testMoveDownInLoadOrder" : "LB 4/27/2019 17:04", + "testMoveUpInLoadOrder" : "LB 4/27/2019 17:03" } } From 87a02eaedf2e83fe836217f9b78b0331259eceb9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 17:30:46 +0200 Subject: [PATCH 135/170] Revert change of artifact creation --- .../LBGitFilesObject.class/README.md | 1 - .../LBGitFilesObject.class/methodProperties.json | 5 ----- .../LBGitFilesObject.class/properties.json | 14 -------------- .../SquotImageStore.class/instance/artifacts.st | 2 +- .../SquotImageStore.class/instance/initialize.st | 7 +------ .../SquotImageStore.class/methodProperties.json | 4 ++-- .../SquotWorkingCopy.class/instance/loadOrder.st | 6 +++++- .../SquotWorkingCopy.class/methodProperties.json | 2 +- 8 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/README.md delete mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json delete mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/properties.json diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/README.md b/src/LBGit-Core.package/LBGitFilesObject.class/README.md deleted file mode 100644 index c6f4a0fda..000000000 --- a/src/LBGit-Core.package/LBGitFilesObject.class/README.md +++ /dev/null @@ -1 +0,0 @@ -I am an Object for the sole purpose of being stored in an object store to be able to create an artifact for me. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json deleted file mode 100644 index 0e4a66223..000000000 --- a/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - } } diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json deleted file mode 100644 index 190fedeb2..000000000 --- a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "LB 4/27/2019 16:52", - "instvars" : [ - ], - "name" : "LBGitFilesObject", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/src/Squot.package/SquotImageStore.class/instance/artifacts.st b/src/Squot.package/SquotImageStore.class/instance/artifacts.st index bd8ced769..7640d10b2 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifacts.st +++ b/src/Squot.package/SquotImageStore.class/instance/artifacts.st @@ -4,7 +4,7 @@ artifacts artifactsDictionary := Dictionary new. self objectsWithPathsDo: [:each :path | artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. - artifactsDictionary at: LBGitFilesArtifact path put: + artifactsDictionary at: '' put: (LBGitLiveFilesArtifact new ownerSnapshot: self; yourself). diff --git a/src/Squot.package/SquotImageStore.class/instance/initialize.st b/src/Squot.package/SquotImageStore.class/instance/initialize.st index 32c804709..1b1c2d59a 100644 --- a/src/Squot.package/SquotImageStore.class/instance/initialize.st +++ b/src/Squot.package/SquotImageStore.class/instance/initialize.st @@ -4,9 +4,4 @@ initialize paths := IdentityDictionary new. "object -> collection of path" additionalInfo := Dictionary new. "path -> Dictionary" loadOrder := OrderedCollection new. "paths" - environment := Environment current. - - self - add: LBGitFilesObject new - at: LBGitFilesArtifact path - additionalInfo: SquotTrackedObjectMetadata new. \ No newline at end of file + environment := Environment current. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 1ece85609..72beaed3b 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -13,7 +13,7 @@ "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", "artifactAt:" : "jr 4/7/2018 15:53", - "artifacts" : "LB 4/27/2019 17:12", + "artifacts" : "LB 11/25/2018 14:36", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", "capture:at:" : "jr 9/23/2018 22:31", @@ -25,7 +25,7 @@ "environmentForLoadedArtifact:" : "jr 3/6/2017 14:01", "includes:" : "jr 3/11/2017 01:09", "includesObjectAt:" : "jr 3/8/2017 17:48", - "initialize" : "LB 4/27/2019 17:10", + "initialize" : "jr 8/18/2018 15:47", "initializeObjectFrom:" : "jr 7/22/2017 11:59", "liveArtifactFor:at:" : "jr 4/7/2018 15:53", "loadOrder" : "jr 8/18/2018 16:21", diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st index ef300c999..775b17a61 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st @@ -1,3 +1,7 @@ accessing loadOrder - ^ store loadOrder \ No newline at end of file + + "This method is for compatibility to newer Squot versions" + ^ store loadOrder + addIfNotPresent: LBGitFilesArtifact path; + yourself \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index 572d1dee1..e516bcc58 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -38,7 +38,7 @@ "loadArtifact:" : "jr 9/23/2018 18:06", "loadArtifactInteractively:ifCanceled:" : "jr 9/23/2018 18:09", "loadCurrentVersionInteractively" : "jr 5/28/2017 16:18", - "loadOrder" : "jr 8/18/2018 17:00", + "loadOrder" : "LB 12/7/2018 18:15", "loadOrder:" : "jr 8/18/2018 17:00", "loadPatchInteractively:ifCanceled:" : "jr 4/28/2018 18:26", "loadSnapshot:" : "jr 6/29/2017 16:40", From 0616d96061518d941e0e2c43cfe17ff71996dad9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 17:52:27 +0200 Subject: [PATCH 136/170] Adapted test to match their intent and changed way live file artifact is created --- .../SquotImageStore.class/instance/artifactAt..st | 5 +++++ .../SquotImageStore.class/instance/artifacts.st | 11 ++--------- .../SquotImageStore.class/methodProperties.json | 4 ++-- .../instance/initialLoadOrder.st | 2 +- .../instance/swappedLoadOrder.st | 4 ++++ .../testCannotMoveDownLastObjectInLoadOrder.st | 6 +++--- .../instance/testMoveDownInLoadOrder.st | 4 ++-- .../instance/testMoveUpInLoadOrder.st | 4 ++-- .../methodProperties.json | 9 +++++---- 9 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/swappedLoadOrder.st diff --git a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st index 85d4c0b45..cc9d41f74 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st +++ b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st @@ -1,3 +1,8 @@ accessing artifactAt: path + + path = LBGitFilesArtifact path ifTrue: [ + ^ (LBGitLiveFilesArtifact new + ownerSnapshot: self; + yourself)]. ^ self liveArtifactFor: (self objectAt: path) at: path \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/artifacts.st b/src/Squot.package/SquotImageStore.class/instance/artifacts.st index 7640d10b2..17af02fdd 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifacts.st +++ b/src/Squot.package/SquotImageStore.class/instance/artifacts.st @@ -1,11 +1,4 @@ accessing artifacts - | artifactsDictionary | - artifactsDictionary := Dictionary new. - self objectsWithPathsDo: [:each :path | - artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. - artifactsDictionary at: '' put: - (LBGitLiveFilesArtifact new - ownerSnapshot: self; - yourself). - ^ artifactsDictionary \ No newline at end of file + + ^ (self loadOrder with: self artifactsInLoadOrder collect: [:path :artifact | path -> artifact]) asDictionary \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 72beaed3b..a70f9032b 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -12,8 +12,8 @@ "applyDiff:" : "jr 7/16/2017 19:17", "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", - "artifactAt:" : "jr 4/7/2018 15:53", - "artifacts" : "LB 11/25/2018 14:36", + "artifactAt:" : "LB 4/27/2019 17:37", + "artifacts" : "LB 4/27/2019 17:48", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", "capture:at:" : "jr 9/23/2018 22:31", diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st index 14a7d0b8b..71102b238 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st @@ -1,4 +1,4 @@ testing initialLoadOrder - ^ {LBGitFilesArtifact path. '1'. '2'.} \ No newline at end of file + ^ {'1'. '2'. LBGitFilesArtifact path.} \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/swappedLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/swappedLoadOrder.st new file mode 100644 index 000000000..b1b3a9f30 --- /dev/null +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/swappedLoadOrder.st @@ -0,0 +1,4 @@ +testing +swappedLoadOrder + + ^ (self initialLoadOrder swap: 1 with: 2) \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st index 6f1ab50bf..21c21b747 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testCannotMoveDownLastObjectInLoadOrder.st @@ -5,9 +5,9 @@ testCannotMoveDownLastObjectInLoadOrder add: Object new at: '1'; add: Object new at: '2'. self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. - browser selectedObjectIndex: 2. + browser selectedObjectIndex: workingCopy loadOrder size. "when" browser moveDownInLoadOrder. "then" - self assert: {LBGitFilesArtifact path. '2'. '1'.} equals: workingCopy loadOrder asArray; - assert: {LBGitFilesArtifact path. '2'. '1'.} equals: browser objectLabels asArray. \ No newline at end of file + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray; + assert: self initialLoadOrder equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st index e3153d1b1..31c09f79e 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveDownInLoadOrder.st @@ -9,5 +9,5 @@ testMoveDownInLoadOrder "when" browser moveDownInLoadOrder. "then" - self assert: {'1'. LBGitFilesArtifact path. '2'.} equals: workingCopy loadOrder asArray; - assert: {'1'. LBGitFilesArtifact path. '2'.} equals: browser objectLabels asArray. \ No newline at end of file + self assert: self swappedLoadOrder equals: workingCopy loadOrder asArray; + assert: self swappedLoadOrder equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st index a375b81d5..e038ba38c 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/testMoveUpInLoadOrder.st @@ -9,5 +9,5 @@ testMoveUpInLoadOrder "when" browser moveUpInLoadOrder. "then" - self assert: {'1'. LBGitFilesArtifact path. '2'.} equals: workingCopy loadOrder asArray; - assert: {'1'. LBGitFilesArtifact path. '2'.} equals: browser objectLabels asArray. \ No newline at end of file + self assert: self swappedLoadOrder equals: workingCopy loadOrder asArray; + assert: self swappedLoadOrder equals: browser objectLabels asArray. \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json index d26679bdf..3d90f7b0b 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json @@ -2,10 +2,11 @@ "class" : { }, "instance" : { - "initialLoadOrder" : "LB 4/27/2019 16:59", + "initialLoadOrder" : "LB 4/27/2019 17:39", "setUp" : "jr 10/3/2018 15:28", - "testCannotMoveDownLastObjectInLoadOrder" : "LB 4/27/2019 17:02", + "swappedLoadOrder" : "LB 4/27/2019 17:43", + "testCannotMoveDownLastObjectInLoadOrder" : "LB 4/27/2019 17:42", "testCannotMoveUpFirstObjectInLoadOrder" : "LB 4/27/2019 17:01", "testDisplaying" : "jr 10/3/2018 15:32", - "testMoveDownInLoadOrder" : "LB 4/27/2019 17:04", - "testMoveUpInLoadOrder" : "LB 4/27/2019 17:03" } } + "testMoveDownInLoadOrder" : "LB 4/27/2019 17:44", + "testMoveUpInLoadOrder" : "LB 4/27/2019 17:43" } } From 23db5456957c423c7354c90d47c022c44f822806 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 18:57:36 +0200 Subject: [PATCH 137/170] All adding of live file artifact is now in image store --- .../SquotImageStore.class/instance/loadOrder.st | 4 +++- .../SquotImageStore.class/methodProperties.json | 2 +- .../SquotWorkingCopy.class/instance/loadOrder.st | 6 +----- .../SquotWorkingCopy.class/methodProperties.json | 2 +- .../instance/initialLoadOrder.st | 2 +- .../SquotWorkingCopyBrowserTest.class/methodProperties.json | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Squot.package/SquotImageStore.class/instance/loadOrder.st b/src/Squot.package/SquotImageStore.class/instance/loadOrder.st index 340685a56..a2c472daa 100644 --- a/src/Squot.package/SquotImageStore.class/instance/loadOrder.st +++ b/src/Squot.package/SquotImageStore.class/instance/loadOrder.st @@ -1,3 +1,5 @@ accessing loadOrder - ^ loadOrder ifNil: [loadOrder := objects keys asOrderedCollection] \ No newline at end of file + ^ (loadOrder ifNil: [loadOrder := objects keys asOrderedCollection ]) + addIfNotPresent: LBGitFilesArtifact path; + yourself \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index a70f9032b..7d7d1a5f9 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -28,7 +28,7 @@ "initialize" : "jr 8/18/2018 15:47", "initializeObjectFrom:" : "jr 7/22/2017 11:59", "liveArtifactFor:at:" : "jr 4/7/2018 15:53", - "loadOrder" : "jr 8/18/2018 16:21", + "loadOrder" : "LB 4/27/2019 18:53", "loadOrder:" : "jr 9/16/2018 00:20", "materialize:replacing:" : "jr 4/7/2017 16:04", "materializeGraph:from:replacing:" : "jr 7/30/2017 02:58", diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st index 775b17a61..ef300c999 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/loadOrder.st @@ -1,7 +1,3 @@ accessing loadOrder - - "This method is for compatibility to newer Squot versions" - ^ store loadOrder - addIfNotPresent: LBGitFilesArtifact path; - yourself \ No newline at end of file + ^ store loadOrder \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index e516bcc58..572d1dee1 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -38,7 +38,7 @@ "loadArtifact:" : "jr 9/23/2018 18:06", "loadArtifactInteractively:ifCanceled:" : "jr 9/23/2018 18:09", "loadCurrentVersionInteractively" : "jr 5/28/2017 16:18", - "loadOrder" : "LB 12/7/2018 18:15", + "loadOrder" : "jr 8/18/2018 17:00", "loadOrder:" : "jr 8/18/2018 17:00", "loadPatchInteractively:ifCanceled:" : "jr 4/28/2018 18:26", "loadSnapshot:" : "jr 6/29/2017 16:40", diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st index 71102b238..e5569d512 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st @@ -1,4 +1,4 @@ testing initialLoadOrder - ^ {'1'. '2'. LBGitFilesArtifact path.} \ No newline at end of file + ^ {LBGitFilesArtifact path. '1'. '2'. } \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json index 3d90f7b0b..b28b17fe2 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "initialLoadOrder" : "LB 4/27/2019 17:39", + "initialLoadOrder" : "LB 4/27/2019 18:08", "setUp" : "jr 10/3/2018 15:28", "swappedLoadOrder" : "LB 4/27/2019 17:43", "testCannotMoveDownLastObjectInLoadOrder" : "LB 4/27/2019 17:42", From 24bf16eda448a4eff15a7e0fbc418e260462f776 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 19:19:49 +0200 Subject: [PATCH 138/170] Readded tracked dummy object --- .../LBGitFilesObject.class/README.md | 1 + .../LBGitFilesObject.class/methodProperties.json | 5 +++++ .../LBGitFilesObject.class/properties.json | 14 ++++++++++++++ .../SquotImageStore.class/instance/artifactAt..st | 4 ---- .../SquotImageStore.class/instance/initialize.st | 4 +++- .../instance/initializeTrackedFiles.st | 7 +++++++ .../instance/liveArtifactFor.at..st | 5 +++++ .../SquotImageStore.class/instance/loadOrder.st | 4 +--- .../SquotImageStore.class/methodProperties.json | 9 +++++---- 9 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/README.md create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json create mode 100644 src/LBGit-Core.package/LBGitFilesObject.class/properties.json create mode 100644 src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/README.md b/src/LBGit-Core.package/LBGitFilesObject.class/README.md new file mode 100644 index 000000000..c6f4a0fda --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/README.md @@ -0,0 +1 @@ +I am an Object for the sole purpose of being stored in an object store to be able to create an artifact for me. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json new file mode 100644 index 000000000..0e4a66223 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + } } diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json new file mode 100644 index 000000000..190fedeb2 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "LB 4/27/2019 16:52", + "instvars" : [ + ], + "name" : "LBGitFilesObject", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st index cc9d41f74..181ba77fc 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st +++ b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st @@ -1,8 +1,4 @@ accessing artifactAt: path - path = LBGitFilesArtifact path ifTrue: [ - ^ (LBGitLiveFilesArtifact new - ownerSnapshot: self; - yourself)]. ^ self liveArtifactFor: (self objectAt: path) at: path \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/initialize.st b/src/Squot.package/SquotImageStore.class/instance/initialize.st index 1b1c2d59a..7be3a527b 100644 --- a/src/Squot.package/SquotImageStore.class/instance/initialize.st +++ b/src/Squot.package/SquotImageStore.class/instance/initialize.st @@ -4,4 +4,6 @@ initialize paths := IdentityDictionary new. "object -> collection of path" additionalInfo := Dictionary new. "path -> Dictionary" loadOrder := OrderedCollection new. "paths" - environment := Environment current. \ No newline at end of file + environment := Environment current. + + self initializeTrackedFiles. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st b/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st new file mode 100644 index 000000000..ec4815dc9 --- /dev/null +++ b/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st @@ -0,0 +1,7 @@ +initialize-release +initializeTrackedFiles + + self + add: LBGitFilesObject new + at: LBGitFilesArtifact path + additionalInfo: SquotTrackedObjectMetadata new. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st index d5cf3feaa..682484b96 100644 --- a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st +++ b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st @@ -1,5 +1,10 @@ private liveArtifactFor: anObject at: aPath + + aPath = LBGitFilesArtifact path ifTrue: + [^ (LBGitLiveFilesArtifact new + ownerSnapshot: self; + yourself)]. ^ (SquotLiveArtifact on: anObject at: aPath in: self) storeInfo: (additionalInfo at: aPath); yourself \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/loadOrder.st b/src/Squot.package/SquotImageStore.class/instance/loadOrder.st index a2c472daa..340685a56 100644 --- a/src/Squot.package/SquotImageStore.class/instance/loadOrder.st +++ b/src/Squot.package/SquotImageStore.class/instance/loadOrder.st @@ -1,5 +1,3 @@ accessing loadOrder - ^ (loadOrder ifNil: [loadOrder := objects keys asOrderedCollection ]) - addIfNotPresent: LBGitFilesArtifact path; - yourself \ No newline at end of file + ^ loadOrder ifNil: [loadOrder := objects keys asOrderedCollection] \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 7d7d1a5f9..b1d490d8e 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -12,7 +12,7 @@ "applyDiff:" : "jr 7/16/2017 19:17", "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", - "artifactAt:" : "LB 4/27/2019 17:37", + "artifactAt:" : "LB 4/27/2019 19:08", "artifacts" : "LB 4/27/2019 17:48", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", @@ -25,10 +25,11 @@ "environmentForLoadedArtifact:" : "jr 3/6/2017 14:01", "includes:" : "jr 3/11/2017 01:09", "includesObjectAt:" : "jr 3/8/2017 17:48", - "initialize" : "jr 8/18/2018 15:47", + "initialize" : "LB 4/27/2019 19:16", "initializeObjectFrom:" : "jr 7/22/2017 11:59", - "liveArtifactFor:at:" : "jr 4/7/2018 15:53", - "loadOrder" : "LB 4/27/2019 18:53", + "initializeTrackedFiles" : "LB 4/27/2019 19:19", + "liveArtifactFor:at:" : "LB 4/27/2019 19:09", + "loadOrder" : "jr 8/18/2018 16:21", "loadOrder:" : "jr 9/16/2018 00:20", "materialize:replacing:" : "jr 4/7/2017 16:04", "materializeGraph:from:replacing:" : "jr 7/30/2017 02:58", From 811fa20258bc3d2ac1d71f9105463895ea190f50 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 20:00:46 +0200 Subject: [PATCH 139/170] File list artifacts now don't error in file stores outside of git anymore --- .../LBGitFilesArtifact.class/instance/capture.st | 3 ++- .../LBGitFilesArtifact.class/instance/workingDirectory.st | 6 ++++-- .../LBGitFilesArtifact.class/methodProperties.json | 6 +++--- .../LBGitLiveFilesArtifact.class/instance/initializeOn..st | 2 +- .../LBGitLiveFilesArtifact.class/methodProperties.json | 2 +- .../LBGitRecordedFilesArtifact.class/instance/commit.st | 4 +++- .../LBGitRecordedFilesArtifact.class/instance/isInGit.st | 5 +++++ .../instance/workingDirectory.st | 4 +++- .../LBGitRecordedFilesArtifact.class/methodProperties.json | 5 +++-- 9 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st index bdc88e938..c9eb0190b 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st @@ -1,4 +1,5 @@ as yet unclassified capture - ^ self "hopefully already captured?" \ No newline at end of file + "There is no difference between a 'live' and 'snaphshot' file list'" + ^ self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st index 2115cda3e..86c9cfecc 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st @@ -1,4 +1,6 @@ as yet unclassified workingDirectory - - ^ self shouldBeImplemented \ No newline at end of file + + "Unlike #rootDirectory which can be either the git or 'real' filesystem directory, + this is always the real one if set" + ^ self shouldBeImplemented \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 9fbfcb2e1..eef87e294 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -3,7 +3,7 @@ "path" : "LB 12/7/2018 18:14" }, "instance" : { "=" : "LB 4/27/2019 16:05", - "capture" : "LB 3/27/2019 18:25", + "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", @@ -20,11 +20,11 @@ "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", - "rootDirectory:" : "LB 12/4/2018 14:32", + "rootDirectory:" : "LB 4/27/2019 19:56", "squotSummaryText" : "LB 2/24/2019 16:03", "storeInfo" : "LB 3/27/2019 18:28", "storeWith:" : "LB 4/27/2019 15:14", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11", - "workingDirectory" : "LB 12/13/2018 17:00" } } + "workingDirectory" : "LB 4/27/2019 19:50" } } diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st index 11529852a..4b07f7998 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st @@ -1,4 +1,4 @@ as yet unclassified initializeOn: aRecordedFilesArtifact - self rootDirectory: (aRecordedFilesArtifact rootDirectory fileSystem repository repository workingDir). \ No newline at end of file + self rootDirectory: (aRecordedFilesArtifact workingDirectory). \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index f40fd6957..0112111bc 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -6,7 +6,7 @@ "capture" : "LB 12/4/2018 14:58", "collectTrackedFiles" : "LB 12/4/2018 14:28", "diffAgainst:" : "LB 11/26/2018 17:22", - "initializeOn:" : "LB 12/4/2018 14:29", + "initializeOn:" : "LB 4/27/2019 19:51", "pathAndMetadataFor:" : "LB 11/25/2018 17:21", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 4/27/2019 16:06", diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st index fcb3fd965..4229c2495 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st @@ -1,4 +1,6 @@ as yet unclassified commit - ^ self rootDirectory fileSystem store revision \ No newline at end of file + ^ self isInGit + ifTrue: [self rootDirectory fileSystem store revision] + ifFalse: [nil] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st new file mode 100644 index 000000000..eeddb5a78 --- /dev/null +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st @@ -0,0 +1,5 @@ +as yet unclassified +isInGit + + "False is unusual, but possible in certain test cases when a file store is created without a repository" + ^ self rootDirectory fileSystem isKindOf: GitFilesystem \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st index 74c9d3f68..30ba9ada5 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st @@ -1,4 +1,6 @@ as yet unclassified workingDirectory - ^ self rootDirectory fileSystem repository repository workingDir \ No newline at end of file + ^ self isInGit + ifTrue: [self rootDirectory fileSystem repository repository workingDir] + ifFalse: [self rootDirectory]. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json index baceea878..9569f7ce3 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -4,9 +4,10 @@ "instance" : { "collectFilesOf:" : "LB 11/25/2018 15:16", "collectTrackedFiles" : "LB 12/2/2018 14:23", - "commit" : "LB 11/20/2018 16:28", + "commit" : "LB 4/27/2019 19:58", "diffAgainst:" : "LB 11/25/2018 14:06", + "isInGit" : "LB 4/27/2019 19:58", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 11/26/2018 16:15", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08", - "workingDirectory" : "LB 12/13/2018 17:01" } } + "workingDirectory" : "LB 4/27/2019 19:57" } } From dd0448af358b66df4f5761b050f52e81896b66b9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 20:32:58 +0200 Subject: [PATCH 140/170] As now again an object is tracked we do not need the adapted collect artifacts method --- .../SquotImageStore.class/instance/artifacts.st | 7 +++++-- .../SquotImageStore.class/methodProperties.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Squot.package/SquotImageStore.class/instance/artifacts.st b/src/Squot.package/SquotImageStore.class/instance/artifacts.st index 17af02fdd..3f08eebce 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifacts.st +++ b/src/Squot.package/SquotImageStore.class/instance/artifacts.st @@ -1,4 +1,7 @@ accessing artifacts - - ^ (self loadOrder with: self artifactsInLoadOrder collect: [:path :artifact | path -> artifact]) asDictionary \ No newline at end of file + | artifactsDictionary | + artifactsDictionary := Dictionary new. + self objectsWithPathsDo: [:each :path | + artifactsDictionary at: path put: (self liveArtifactFor: each at: path)]. + ^ artifactsDictionary \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index b1d490d8e..45416d309 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -13,7 +13,7 @@ "applyDiff:toObjectAt:" : "jr 10/21/2017 15:55", "applyPatch:" : "jr 9/15/2018 20:41", "artifactAt:" : "LB 4/27/2019 19:08", - "artifacts" : "LB 4/27/2019 17:48", + "artifacts" : "jr 4/7/2018 15:53", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", "capture:at:" : "jr 9/23/2018 22:31", From 93a036e4831754b25c7eb3c08940de2b1b29af3f Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sat, 27 Apr 2019 20:51:57 +0200 Subject: [PATCH 141/170] Fix some tests: missing metadata and missing knowledge about a file list artifact / object --- .../LBGitFilesArtifact.class/instance/storeInfo.st | 4 +++- .../LBGitFilesArtifact.class/methodProperties.json | 2 +- .../SquotImageStoreTest.class/instance/setUp.st | 1 + .../SquotImageStoreTest.class/instance/snapshotClass.at..st | 1 + .../instance/snapshotPackage.at..st | 1 + .../SquotImageStoreTest.class/methodProperties.json | 6 +++--- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st index e0a00807b..a4d041a08 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st @@ -1,4 +1,6 @@ as yet unclassified storeInfo - ^ SquotTrackedObjectMetadata new \ No newline at end of file + ^ SquotTrackedObjectMetadata new + objectClass: LBGitFilesArtifact; + yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index eef87e294..612507db4 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -22,7 +22,7 @@ "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 4/27/2019 19:56", "squotSummaryText" : "LB 2/24/2019 16:03", - "storeInfo" : "LB 3/27/2019 18:28", + "storeInfo" : "LB 4/27/2019 20:45", "storeWith:" : "LB 4/27/2019 15:14", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st b/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st index a23c8c5de..1960593f1 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st @@ -6,4 +6,5 @@ setUp imageStore := SquotImageStore new environment: testEnvironment; yourself. + imageStore removeAt: LBGitFilesArtifact path. changeLogSuppressor := SUnitChangeLogSuppressor new. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st index dc1c58545..40aafe68c 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st @@ -2,4 +2,5 @@ utilities snapshotClass: aClass at: pathString ^ SquotImageStore new add: aClass at: pathString; + removeAt: LBGitFilesArtifact path; captureSnapshot \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st index 10446e69d..193dfb6ca 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st @@ -2,4 +2,5 @@ utilities snapshotPackage: aPackageInfo at: pathString ^ SquotImageStore new add: aPackageInfo at: pathString; + removeAt: LBGitFilesArtifact path; captureSnapshot \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json index bca632cf8..13bef4de1 100644 --- a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json +++ b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json @@ -6,9 +6,9 @@ "createTestEnvironment" : "jr 1/27/2017 16:08", "nameForTestEnvironment" : "jr 1/27/2017 16:02", "newPackageInfoFor:" : "jr 3/5/2017 16:55", - "setUp" : "jr 2/2/2017 14:41", - "snapshotClass:at:" : "jr 3/6/2017 14:33", - "snapshotPackage:at:" : "jr 1/27/2017 16:10", + "setUp" : "LB 4/27/2019 20:47", + "snapshotClass:at:" : "LB 4/27/2019 20:48", + "snapshotPackage:at:" : "LB 4/27/2019 20:49", "tearDown" : "jr 4/29/2018 17:17", "testAddNewObjectsFromArtifact" : "jr 8/18/2017 13:01", "testAddingObjectsAddsThemToTheLoadOrder" : "jr 8/18/2018 15:59", From b695c181979104ba2246a68311a165d9780a56c9 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 10:50:23 +0200 Subject: [PATCH 142/170] Fixes #= on file list artifact --- .../LBGitFilesArtifact.class/instance/^equals.st | 5 ++++- .../LBGitFilesArtifact.class/methodProperties.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st index 74a333a7b..48eda2503 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st @@ -1,4 +1,7 @@ as yet unclassified = otherObject - ^ self class = otherObject class and: [self instanceVariableValues = otherObject instanceVariableValues] \ No newline at end of file + ^ self class = otherObject class + and: [self ownerSnapshot = otherObject ownerSnapshot] + and: [self rootDirectory = otherObject rootDirectory] + and: [trackedFiles = otherObject instVarNamed: #trackedFiles] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 612507db4..35fb6b673 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "path" : "LB 12/7/2018 18:14" }, "instance" : { - "=" : "LB 4/27/2019 16:05", + "=" : "LB 4/28/2019 10:48", "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", From 89c814ae3f1f24e0788cc1e0e420dd24df1ce18e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 11:09:41 +0200 Subject: [PATCH 143/170] Adapted files object class comment and renamed file metadata inst var path to reference --- .../LBGitFileMetadata.class/instance/contents.st | 4 ++-- .../LBGitFileMetadata.class/instance/path..st | 4 ---- .../LBGitFileMetadata.class/instance/path.st | 4 ---- .../LBGitFileMetadata.class/instance/reference..st | 4 ++++ .../LBGitFileMetadata.class/instance/reference.st | 4 ++++ .../LBGitFileMetadata.class/methodProperties.json | 6 +++--- .../LBGitFileMetadata.class/properties.json | 2 +- src/LBGit-Core.package/LBGitFilesObject.class/README.md | 2 +- .../LBGitFilesObject.class/properties.json | 2 +- .../instance/pathAndMetadataFor..st | 2 +- .../LBGitLiveFilesArtifact.class/methodProperties.json | 2 +- .../instance/collectTrackedFiles.st | 2 +- .../LBGitRecordedFilesArtifact.class/methodProperties.json | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st delete mode 100644 src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st create mode 100644 src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st create mode 100644 src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st index 12972e65a..b1d8de5d6 100644 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st +++ b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st @@ -2,10 +2,10 @@ as yet unclassified contents | stream content | - ^ (self path notNil and: [self path exists]) + ^ (self reference notNil and: [self reference exists]) ifFalse: [nil] ifTrue: - [stream := self path readStream binary. + [stream := self reference readStream binary. content := stream contents. stream close. content] diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st deleted file mode 100644 index 23eaf8543..000000000 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path: anObject - - path := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st deleted file mode 100644 index 81c63b398..000000000 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/path.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -path - - ^ path \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st new file mode 100644 index 000000000..8c1e7e098 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st @@ -0,0 +1,4 @@ +accessing +reference: anObject + + reference := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st new file mode 100644 index 000000000..50b50b32e --- /dev/null +++ b/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st @@ -0,0 +1,4 @@ +accessing +reference + + ^ reference \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json index 9dd4270cf..7cf2835d8 100644 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json @@ -3,11 +3,11 @@ "onTreeEntry:" : "LB 11/25/2018 15:17" }, "instance" : { "contentChangesTo:" : "LB 11/25/2018 17:26", - "contents" : "LB 11/25/2018 17:29", + "contents" : "LB 4/28/2019 11:05", "entryHash" : "LB 11/25/2018 15:14", "gitChangesTo:" : "LB 11/25/2018 17:02", "hasChangesTo:" : "LB 2/13/2019 14:04", - "path" : "LB 11/25/2018 15:29", - "path:" : "LB 11/25/2018 15:29", + "reference" : "LB 4/28/2019 11:06", + "reference:" : "LB 4/28/2019 11:05", "treeEntry" : "LB 11/25/2018 15:14", "treeEntry:" : "LB 11/25/2018 15:14" } } diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json b/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json index dc6bca314..b839388e6 100644 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json +++ b/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json @@ -6,7 +6,7 @@ ], "commentStamp" : "", "instvars" : [ - "path", + "reference", "treeEntry" ], "name" : "LBGitFileMetadata", "pools" : [ diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/README.md b/src/LBGit-Core.package/LBGitFilesObject.class/README.md index c6f4a0fda..c878b7e11 100644 --- a/src/LBGit-Core.package/LBGitFilesObject.class/README.md +++ b/src/LBGit-Core.package/LBGitFilesObject.class/README.md @@ -1 +1 @@ -I am an Object for the sole purpose of being stored in an object store to be able to create an artifact for me. \ No newline at end of file +I am an Object for the sole purpose of being stored in an object store, in order to be able to create an artifact for me. I act as a placeholder, only documenting that what is tracked is a file list. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json index 190fedeb2..7026b0066 100644 --- a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json +++ b/src/LBGit-Core.package/LBGitFilesObject.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "LB 4/27/2019 16:52", + "commentStamp" : "LB 4/28/2019 10:52", "instvars" : [ ], "name" : "LBGitFilesObject", diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st index dc96df514..740c79ec3 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st @@ -4,4 +4,4 @@ pathAndMetadataFor: aFSReference | path | path := (aFSReference relativeTo: self rootDirectory) segments fold: [:all :eachSegment | all,'/',eachSegment]. - ^ path -> (LBGitFileMetadata new path: aFSReference) \ No newline at end of file + ^ path -> (LBGitFileMetadata new reference: aFSReference) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index 0112111bc..24cad0c46 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -7,7 +7,7 @@ "collectTrackedFiles" : "LB 12/4/2018 14:28", "diffAgainst:" : "LB 11/26/2018 17:22", "initializeOn:" : "LB 4/27/2019 19:51", - "pathAndMetadataFor:" : "LB 11/25/2018 17:21", + "pathAndMetadataFor:" : "LB 4/28/2019 11:06", "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 4/27/2019 16:06", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st index 45418fe9d..1bbd3b96f 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st @@ -5,4 +5,4 @@ collectTrackedFiles self trackedFiles: (self collectFilesOf: self commit tree entries). self trackedFiles keysDo: - [:key | (self trackedFiles at: key) path: (self rootDirectory resolve: key)] \ No newline at end of file + [:key | (self trackedFiles at: key) reference: (self rootDirectory resolve: key)] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json index 9569f7ce3..f4d34cd75 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -3,7 +3,7 @@ }, "instance" : { "collectFilesOf:" : "LB 11/25/2018 15:16", - "collectTrackedFiles" : "LB 12/2/2018 14:23", + "collectTrackedFiles" : "LB 4/28/2019 11:06", "commit" : "LB 4/27/2019 19:58", "diffAgainst:" : "LB 11/25/2018 14:06", "isInGit" : "LB 4/27/2019 19:58", From 0869dffe5c872530b3acadc06d9beee449613b2e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 11:46:17 +0200 Subject: [PATCH 144/170] Minor fixes * Renamed ownerSnapshot to objectContainer (was initially adopted form the unrecorded files artifact) * Fix = and hash --- .../instance/mergeWithDiff..st | 3 +-- .../methodProperties.json | 2 +- .../instance/^equals.st | 2 +- .../LBGitFilesArtifact.class/instance/hash.st | 5 ++++- .../instance/isSquotFile..st | 2 +- .../instance/materializeWith.replacing..st | 3 +-- .../instance/objectContainer..st | 4 ++++ .../instance/objectContainer.st | 4 ++++ .../instance/ownerSnapshot..st | 4 ---- .../instance/ownerSnapshot.st | 4 ---- .../instance/squotSummaryText.st | 2 +- .../instance/storeInfo.st | 2 +- .../instance/wantsToBeInTableOfContents.st | 2 +- .../methodProperties.json | 18 +++++++++--------- .../LBGitFilesArtifact.class/properties.json | 4 ++-- 15 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st create mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st delete mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st delete mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st index bc360d4ed..ca07bc7c0 100644 --- a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st +++ b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st @@ -1,5 +1,4 @@ as yet unclassified mergeWithDiff: anArtifactDiff - self assert: (anArtifactDiff isKindOf: self class). - ^ anArtifactDiff right diffAgainst: self right \ No newline at end of file + ^ anArtifactDiff inConflictWith: self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json index 3b3603a63..f86412436 100644 --- a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json @@ -3,5 +3,5 @@ }, "instance" : { "applyToContainer:" : "LB 11/20/2018 15:06", - "mergeWithDiff:" : "LB 1/24/2019 10:24", + "mergeWithDiff:" : "LB 4/28/2019 11:34", "squotChangeAsStringOrText" : "LB 2/13/2019 14:04" } } diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st index 48eda2503..1f1b19d37 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st @@ -2,6 +2,6 @@ as yet unclassified = otherObject ^ self class = otherObject class - and: [self ownerSnapshot = otherObject ownerSnapshot] + and: [self objectContainer = otherObject objectContainer] and: [self rootDirectory = otherObject rootDirectory] and: [trackedFiles = otherObject instVarNamed: #trackedFiles] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st index ae9b4caec..b47af3aa5 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st @@ -1,4 +1,7 @@ as yet unclassified hash - ^ self instanceVariableValues fold: [:total :each | total bitXor: each] \ No newline at end of file + ^ ((self class hash + bitXor: self objectContainer hash) + bitXor: self rootDirectory hash) + bitXor: trackedFiles \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st index 62a969bd9..31fbbc317 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st @@ -3,4 +3,4 @@ isSquotFile: aPath ^ (aPath includesSubstring: '.squot') or: [aPath includesSubstring: '.package'] - or: [self ownerSnapshot includesObjectAt: aPath] \ No newline at end of file + or: [self objectContainer includesObjectAt: aPath] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st index b98508a89..a4e76f651 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st @@ -1,5 +1,4 @@ as yet unclassified materializeWith: anArtifact replacing: anObject - self flag: #TODO "what does it do?". - ^ self \ No newline at end of file + ^ LBGitFilesObject new \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st new file mode 100644 index 000000000..b4a4a785a --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st @@ -0,0 +1,4 @@ +accessing +objectContainer: anObject + + objectContainer := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st new file mode 100644 index 000000000..c34ca1fa4 --- /dev/null +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st @@ -0,0 +1,4 @@ +accessing +objectContainer + + ^ objectContainer \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st deleted file mode 100644 index 3a5748fb4..000000000 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ownerSnapshot: anObject - - ownerSnapshot := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st deleted file mode 100644 index 80780b511..000000000 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/ownerSnapshot.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ownerSnapshot - - ^ ownerSnapshot \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st index 584f75668..e09e74ff0 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st @@ -1,4 +1,4 @@ as yet unclassified squotSummaryText - ^ 'Files managed by squot' \ No newline at end of file + ^ 'Files stored outside of Squeak' \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st index a4d041a08..6c608e06e 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st @@ -2,5 +2,5 @@ as yet unclassified storeInfo ^ SquotTrackedObjectMetadata new - objectClass: LBGitFilesArtifact; + objectClass: LBGitFilesObject; yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st index e4a3bb15a..ee91df6a6 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st @@ -1,4 +1,4 @@ as yet unclassified wantsToBeInTableOfContents - "I want to be always created" + "I always want to be newly created" ^ false \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 35fb6b673..1d6be53f3 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -2,18 +2,18 @@ "class" : { "path" : "LB 12/7/2018 18:14" }, "instance" : { - "=" : "LB 4/28/2019 10:48", + "=" : "LB 4/28/2019 11:23", "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", "displayText" : "LB 11/26/2018 16:25", - "hash" : "LB 4/27/2019 16:04", + "hash" : "LB 4/28/2019 11:23", "isLoadable" : "LB 11/25/2018 13:22", - "isSquotFile:" : "LB 12/7/2018 18:16", - "materializeWith:replacing:" : "LB 3/27/2019 18:27", - "ownerSnapshot" : "LB 11/20/2018 15:14", - "ownerSnapshot:" : "LB 11/20/2018 15:14", + "isSquotFile:" : "LB 4/28/2019 11:23", + "materializeWith:replacing:" : "LB 4/28/2019 11:29", + "objectContainer" : "LB 4/28/2019 11:22", + "objectContainer:" : "LB 4/28/2019 11:22", "path" : "LB 12/7/2018 18:14", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", @@ -21,10 +21,10 @@ "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 4/27/2019 19:56", - "squotSummaryText" : "LB 2/24/2019 16:03", - "storeInfo" : "LB 4/27/2019 20:45", + "squotSummaryText" : "LB 4/28/2019 11:37", + "storeInfo" : "LB 4/28/2019 11:38", "storeWith:" : "LB 4/27/2019 15:14", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", - "wantsToBeInTableOfContents" : "LB 11/20/2018 10:11", + "wantsToBeInTableOfContents" : "LB 4/28/2019 11:40", "workingDirectory" : "LB 4/27/2019 19:50" } } diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json index ad6a96d79..19dc01ee6 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json @@ -6,9 +6,9 @@ ], "commentStamp" : "", "instvars" : [ - "ownerSnapshot", "rootDirectory", - "trackedFiles" ], + "trackedFiles", + "objectContainer" ], "name" : "LBGitFilesArtifact", "pools" : [ ], From 63923a2d382cda2e87289f62d0c35a989a950d69 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 12:04:05 +0200 Subject: [PATCH 145/170] Commit missing changes from renaming ownerSnapshot to objectContainer --- .../instance/captureLazySnapshot.st | 2 +- .../instance/captureSnapshot.st | 2 +- .../methodProperties.json | 4 +- .../instance/liveArtifactFor.at..st | 2 +- .../methodProperties.json | 2 +- .../saveNewVersionFromPatch.ifCanceled..st | 45 +++++-------------- .../methodProperties.json | 2 +- 7 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st index be60148f1..ea9b14d29 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st @@ -19,5 +19,5 @@ captureLazySnapshot yourself). builder buildSnapshot in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. + unrecordedFiles objectContainer: snapshot. ^ snapshot]. \ No newline at end of file diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st index a69f82ec8..e26eef1a0 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st @@ -18,5 +18,5 @@ captureSnapshot yourself). builder buildSnapshot in: [:snapshot | - unrecordedFiles ownerSnapshot: snapshot. + unrecordedFiles objectContainer: snapshot. ^ snapshot]. \ No newline at end of file diff --git a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json index b9bb3f831..fe42105db 100644 --- a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json +++ b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json @@ -13,8 +13,8 @@ "artifactReferencesDo:" : "jr 9/23/2018 22:08", "artifacts" : "jr 7/16/2017 02:34", "artifactsDo:" : "jr 5/9/2017 18:00", - "captureLazySnapshot" : "LB 11/26/2018 16:12", - "captureSnapshot" : "LB 11/20/2018 10:16", + "captureLazySnapshot" : "LB 4/28/2019 11:23", + "captureSnapshot" : "LB 4/28/2019 11:23", "capturedArtifacts" : "jr 5/31/2017 17:25", "createLazyArtifactForObjectAt:" : "jr 5/28/2017 14:31", "deserializers" : "jr 1/27/2017 14:33", diff --git a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st index 682484b96..b18c29629 100644 --- a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st +++ b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st @@ -3,7 +3,7 @@ liveArtifactFor: anObject at: aPath aPath = LBGitFilesArtifact path ifTrue: [^ (LBGitLiveFilesArtifact new - ownerSnapshot: self; + objectContainer: self; yourself)]. ^ (SquotLiveArtifact on: anObject at: aPath in: self) storeInfo: (additionalInfo at: aPath); diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 45416d309..879124133 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -28,7 +28,7 @@ "initialize" : "LB 4/27/2019 19:16", "initializeObjectFrom:" : "jr 7/22/2017 11:59", "initializeTrackedFiles" : "LB 4/27/2019 19:19", - "liveArtifactFor:at:" : "LB 4/27/2019 19:09", + "liveArtifactFor:at:" : "LB 4/28/2019 11:23", "loadOrder" : "jr 8/18/2018 16:21", "loadOrder:" : "jr 9/16/2018 00:20", "materialize:replacing:" : "jr 4/7/2017 16:04", diff --git a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st index 91d8c8978..1a3a58326 100644 --- a/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st +++ b/src/Squot.package/SquotWorkingCopy.class/instance/saveNewVersionFromPatch.ifCanceled..st @@ -1,35 +1,14 @@ creating new versions saveNewVersionFromPatch: aPatch ifCanceled: cancelBlock - | selectedPatch message newVersion capturedArtifacts | - self flag: #TODO. "Create new signal for this?" - (SquotSelectionOfChangesRequested new - patch: aPatch; - title: ''; - signal) - ifNotNil: [:signalSelectedPatch | - selectedPatch := signalSelectedPatch. - message := SquotInitialLogMessageRequested new signal ifNil: 'Empty commit message'.] - ifNil: [| tool | - tool := (SquotSaveVersionDialog on: aPatch) - parentVersions: self parentVersions; - controllerForIgnores: self; - yourself. - tool requestSelectedChangesWithTitle: 'Select changes and message for the new version'. - tool accepted ifFalse: [^ cancelBlock value]. - selectedPatch := tool selectedPatch. - message := tool message.]. - [self handlePathChangesDuring: - [newVersion := loadedHistorian createNewVersionFromPatch: selectedPatch - with: [:version | version - message: message asString; - author: self defaultAuthor. - version parents: self parentVersions. - self shouldNotStoreMetadata ifTrue: [version doNotStoreMetadata]]]] - on: SquotArtifactsWereCaptured - doAndResume: [:captured | capturedArtifacts := captured artifacts]. - self loadedVersion: newVersion. - self cacheSavedArtifacts: (capturedArtifacts ifNil: [Dictionary new]). - self resetAdditionalParents. - previousSnapshot := nil. - previousVersionId := newVersion internalId. - self cacheNewMonticelloVersions: selectedPatch message: message. \ No newline at end of file + "Interactively create a new version. Let the user pick changes from aPatch." + | selectedPatch newVersion message | + selectedPatch := self selectFromPatch: aPatch + forSaveWithTitle: 'Select changes and message for the new version' + ifCanceled: [^ cancelBlock value]. + message := self newVersionMessage. + newVersion := self + saveNewVersionFromPatch: selectedPatch + message: message. + self cacheNewMonticelloVersions: selectedPatch message: message. + self resetNewVersionMessage. + ^ newVersion \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json index 572d1dee1..e566845d8 100644 --- a/src/Squot.package/SquotWorkingCopy.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopy.class/methodProperties.json @@ -76,7 +76,7 @@ "resetNewVersionMessage" : "jr 10/13/2018 23:41", "restoreCurrentAncestryAfter:" : "jr 4/29/2018 18:46", "saveChanges:on:message:" : "jr 5/10/2018 17:06", - "saveNewVersionFromPatch:ifCanceled:" : "LB 3/10/2019 17:04", + "saveNewVersionFromPatch:ifCanceled:" : "jr 10/13/2018 23:43", "saveNewVersionFromPatch:message:" : "jr 5/21/2018 21:50", "saveNewVersionInteractivelyIfCanceled:" : "jr 5/10/2018 16:26", "saveNewVersionMessage:interactive:" : "jr 5/10/2018 16:24", From 295ee462a60493a3dc6e1d7721e3cbca897cd4f1 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 12:18:35 +0200 Subject: [PATCH 146/170] Added warning to file list diff merge with removal --- .../LBGitFileListDiff.class/instance/mergeWithRemoval..st | 4 ++++ .../LBGitFileListDiff.class/methodProperties.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st index a83ff3ad0..a52b583d6 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st @@ -1,4 +1,8 @@ as yet unclassified mergeWithRemoval: anArtifactDiff "I shall never be removed!" + Warning signal: +'A file list diff is about to be merged with the removal of the tracked files artifact. +This is not supposed to happen. +Proceed to ignore.'. ^ self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index aef808564..3479229e8 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -29,7 +29,7 @@ "left:" : "LB 11/22/2018 11:14", "leftReferenceOn:" : "LB 2/13/2019 14:04", "mergeWith:" : "LB 2/13/2019 14:05", - "mergeWithRemoval:" : "LB 11/22/2018 12:19", + "mergeWithRemoval:" : "LB 4/28/2019 12:17", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", "newSquotDiffNodes" : "LB 11/23/2018 15:24", From 61a0af45d0d2d607d51d894fb564337e4f4d84ab Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 12:24:56 +0200 Subject: [PATCH 147/170] Safer usage of streams in file diff --- .../LBGitFileDiff.class/instance/after.st | 6 +----- .../LBGitFileDiff.class/instance/before.st | 6 +----- .../LBGitFileDiff.class/instance/contentsOf..st | 7 +++++++ .../LBGitFileDiff.class/methodProperties.json | 5 +++-- 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st index 789187889..b698ffdc1 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st +++ b/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st @@ -1,8 +1,4 @@ accessing after - | stream content | - stream := (self parent rightReferenceOn: self path) readStream binary. - content := stream contents. - stream close. - ^ content \ No newline at end of file + ^ self contentsOf: (self parent rightReferenceOn: self path) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st index f5b46c930..71c480735 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st +++ b/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st @@ -1,8 +1,4 @@ accessing before - | stream content | - stream := (self parent leftReferenceOn: self path) readStream binary. - content := stream contents. - stream close. - ^ content \ No newline at end of file + ^ self contentsOf: (self parent leftReferenceOn: self path) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st b/src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st new file mode 100644 index 000000000..faabe3fdc --- /dev/null +++ b/src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st @@ -0,0 +1,7 @@ +accessing +contentsOf: aReference + + ^ aReference readStreamDo: + [:stream | + stream binary. + stream contents] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json index cf244b61e..1d95b0066 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json @@ -2,12 +2,13 @@ "class" : { }, "instance" : { - "after" : "LB 11/23/2018 18:50", + "after" : "LB 4/28/2019 12:23", "applyTo:" : "LB 11/25/2018 16:37", "applyWith:" : "LB 11/25/2018 16:39", "asDiffNode" : "LB 3/10/2019 17:01", - "before" : "LB 11/23/2018 18:50", + "before" : "LB 4/28/2019 12:23", "body" : "LB 11/23/2018 18:37", + "contentsOf:" : "LB 4/28/2019 12:22", "isConflict" : "LB 12/8/2018 14:17", "mergeWith:" : "LB 11/25/2018 16:34", "parent" : "LB 11/23/2018 18:42", From da8fe558f437c449f73dd8d2ace8dedb1329dca4 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 12:43:31 +0200 Subject: [PATCH 148/170] Minor changes --- .../instance/collectTrackedFiles.st | 4 ++-- .../LBGitLiveFilesArtifact.class/instance/printOn..st | 5 ----- .../LBGitLiveFilesArtifact.class/methodProperties.json | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st index 54636a84d..3dac15edc 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st @@ -2,6 +2,6 @@ collecting tracked files collectTrackedFiles self trackedFiles: - ((self allFiles + (((self allFiles collect: [:each | self pathAndMetadataFor: each]) - reject: [:each | self isSquotFile: each key]) asDictionary \ No newline at end of file + reject: [:each | self isSquotFile: each key]) as: Dictionary) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st deleted file mode 100644 index 57a9c7f1e..000000000 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/printOn..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -printOn: aStream - - super printOn: aStream. - aStream nextPutAll: '(live)'. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index 24cad0c46..f893e9909 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -4,11 +4,10 @@ "instance" : { "allFiles" : "LB 12/4/2018 14:53", "capture" : "LB 12/4/2018 14:58", - "collectTrackedFiles" : "LB 12/4/2018 14:28", + "collectTrackedFiles" : "LB 4/28/2019 12:28", "diffAgainst:" : "LB 11/26/2018 17:22", "initializeOn:" : "LB 4/27/2019 19:51", "pathAndMetadataFor:" : "LB 4/28/2019 11:06", - "printOn:" : "LB 11/25/2018 13:44", "reverseDiffAgainstLiveFiles:" : "LB 4/27/2019 16:06", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", "workingDirectory" : "LB 12/13/2018 17:01" } } From 7299aa754439012e8a9b59539100605796156297 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 12:59:53 +0200 Subject: [PATCH 149/170] Remove unnecessary trait from file list diff --- .../instance/newSquotDiffNodes.st | 9 --------- .../LBGitFileListDiff.class/instance/squotHasChanges.st | 4 ---- .../instance/squotHasConflicts.st | 4 ---- .../LBGitFileListDiff.class/methodProperties.json | 3 --- .../LBGitFileListDiff.class/properties.json | 2 -- .../LBGitFilesArtifact.class/instance/isSquotFile..st | 3 ++- .../LBGitFilesArtifact.class/methodProperties.json | 2 +- 7 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st delete mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st delete mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st deleted file mode 100644 index ad81a9a2b..000000000 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/newSquotDiffNodes.st +++ /dev/null @@ -1,9 +0,0 @@ -Squot-diff-converting -newSquotDiffNodes - "Answer new, uninitialized SquotDiffNodes that will later be initialized - in #initializeSquotDiffNodes:with:" - "Allocating the nodes and initializing them is separated to facilitate cycle breaking - when graphs of changed objects are converted to diff nodes. If all related diffs form - a tree structure, you may also fully initialize the nodes here already." - self deprecated. - ^ (1 to: (self added size + self removed size + self modified size)) collect: [:each | SquotDiffNode new] as: Array \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st deleted file mode 100644 index c00b51531..000000000 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasChanges.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasChanges - "Answer false if the two compared objects were equal, answer true if there were diffs." - ^ self diffs notEmpty \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st deleted file mode 100644 index a1da0bce1..000000000 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotHasConflicts.st +++ /dev/null @@ -1,4 +0,0 @@ -Squot-diff-testing -squotHasConflicts - "Answer whether a choice must be made before this can be applied to something." - ^ self diffs anySatisfy: [:each | each hasConflicts] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json index 3479229e8..04115f468 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json @@ -32,7 +32,6 @@ "mergeWithRemoval:" : "LB 4/28/2019 12:17", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", - "newSquotDiffNodes" : "LB 11/23/2018 15:24", "originalOrAddedArtifact" : "LB 11/22/2018 15:53", "path" : "LB 11/22/2018 16:36", "privateAsConflicts" : "LB 4/27/2019 15:50", @@ -43,8 +42,6 @@ "rightReferenceOn:" : "LB 2/13/2019 14:04", "sourceReferenceOn:" : "LB 11/25/2018 15:56", "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", - "squotHasChanges" : "LB 11/23/2018 15:24", - "squotHasConflicts" : "LB 11/23/2018 15:25", "stayed" : "LB 11/22/2018 11:17", "stayed:" : "LB 11/22/2018 11:17", "storeInfo" : "LB 12/7/2018 18:27", diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json b/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json index fa91c6ef5..4b94763e8 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json +++ b/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json @@ -2,7 +2,6 @@ "category" : "LBGit-Core", "classinstvars" : [ ], - "classtraitcomposition" : "TSquotDiff classTrait", "classvars" : [ ], "commentStamp" : "", @@ -19,5 +18,4 @@ "pools" : [ ], "super" : "Object", - "traitcomposition" : "TSquotDiff", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st index 31fbbc317..f2f6c3997 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st @@ -1,6 +1,7 @@ as yet unclassified isSquotFile: aPath - ^ (aPath includesSubstring: '.squot') + ^ (aPath = SquotFileSystemStore tocFileName) + or: [aPath includesSubstring: 'squot-table-of-contents'] or: [aPath includesSubstring: '.package'] or: [self objectContainer includesObjectAt: aPath] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 1d6be53f3..413611cb5 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -10,7 +10,7 @@ "displayText" : "LB 11/26/2018 16:25", "hash" : "LB 4/28/2019 11:23", "isLoadable" : "LB 11/25/2018 13:22", - "isSquotFile:" : "LB 4/28/2019 11:23", + "isSquotFile:" : "LB 4/28/2019 12:48", "materializeWith:replacing:" : "LB 4/28/2019 11:29", "objectContainer" : "LB 4/28/2019 11:22", "objectContainer:" : "LB 4/28/2019 11:22", From 6436c3c0dc03539f47a7d3ae0e9350bd50c3c217 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 13:29:09 +0200 Subject: [PATCH 150/170] Optimized and cleaned collect files in recorder files artifact --- .../instance/collectFilesOf..st | 9 +-------- .../instance/collectFilesOf.in..st | 14 ++++++++++++++ .../methodProperties.json | 3 ++- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st index 761a66225..a4b2a1641 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st @@ -1,11 +1,4 @@ as yet unclassified collectFilesOf: aGitTreeEntrySet - | result | - result := Dictionary new. - aGitTreeEntrySet do: [:each | - each isInDirectoryMode - ifTrue: [(self collectFilesOf: each object entries) associationsDo: [:eachSub | result add: (each entryName,'/', eachSub key) -> eachSub value]] - ifFalse: [result at: each entryName put: (LBGitFileMetadata onTreeEntry: each)]]. - result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. - ^ result \ No newline at end of file + ^ self collectFilesOf: aGitTreeEntrySet in: '' \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st new file mode 100644 index 000000000..01ddc5462 --- /dev/null +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st @@ -0,0 +1,14 @@ +as yet unclassified +collectFilesOf: aGitTreeEntrySet in: directoryPath + + | result | + result := Dictionary new. + aGitTreeEntrySet do: [:each | | fullPath | + fullPath := directoryPath, each entryName. + (self isSquotFile: fullPath) + ifFalse: [ + each isInDirectoryMode + ifTrue: [result addAll: (self collectFilesOf: each object entries in: fullPath, '/')] + ifFalse: [result at: fullPath put: (LBGitFileMetadata onTreeEntry: each)]]]. + result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. + ^ result \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json index f4d34cd75..d636869ec 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json @@ -2,7 +2,8 @@ "class" : { }, "instance" : { - "collectFilesOf:" : "LB 11/25/2018 15:16", + "collectFilesOf:" : "LB 4/28/2019 13:21", + "collectFilesOf:in:" : "LB 4/28/2019 13:25", "collectTrackedFiles" : "LB 4/28/2019 11:06", "commit" : "LB 4/27/2019 19:58", "diffAgainst:" : "LB 11/25/2018 14:06", From 214bafb6f3cf70c9c13165b842aa21d2e5543014 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 13:53:09 +0200 Subject: [PATCH 151/170] Shouldnotimplement on content diffs in file list diff (has no content) --- .../instance/diffContentAgainstThatOf..st | 4 ++-- .../LBGitFilesArtifact.class/instance/isLoadable.st | 2 ++ .../instance/reverseDiffContentAgainst..st | 10 ++-------- .../LBGitFilesArtifact.class/methodProperties.json | 6 +++--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st index f849520c8..cc643c720 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st @@ -1,5 +1,5 @@ as yet unclassified diffContentAgainstThatOf: anArtifact "Double dispatch with reverseDiffContentAgainst:" - self deprecated. - ^ anArtifact reverseDiffContentAgainst: self content \ No newline at end of file + "Only used for SquotArtifactDiffWithContent, which should never occur on me, I have no content" + self shouldNotImplement. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st index 8b0d22d2c..d88e3db64 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st @@ -1,4 +1,6 @@ as yet unclassified isLoadable "This was needed for commiting" + "I don't want to be ignored by the image store, as for me, it is a general live object store, + and the file list is live" ^ true \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st index b49c7611d..9252792ff 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st @@ -1,11 +1,5 @@ as yet unclassified reverseDiffContentAgainst: otherContent - "| otherContent added changedOrStayed deleted | - otherContent := aCollection ifNil: [Array empty]. - added := self content difference: otherContent. - changedOrStayed := self content intersection: otherContent. - deleted := otherContent difference: self content. - self halt. - ^ SquotDiffOfEqualObjects instance" - ^ otherContent squotDiffAgainst: self content \ No newline at end of file + "see #diffContentAgainstThatOf:" + self shouldNotImplement. \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index 413611cb5..a979f143b 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -6,10 +6,10 @@ "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", - "diffContentAgainstThatOf:" : "LB 11/25/2018 13:36", + "diffContentAgainstThatOf:" : "LB 4/28/2019 13:43", "displayText" : "LB 11/26/2018 16:25", "hash" : "LB 4/28/2019 11:23", - "isLoadable" : "LB 11/25/2018 13:22", + "isLoadable" : "LB 4/28/2019 13:41", "isSquotFile:" : "LB 4/28/2019 12:48", "materializeWith:replacing:" : "LB 4/28/2019 11:29", "objectContainer" : "LB 4/28/2019 11:22", @@ -18,7 +18,7 @@ "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", - "reverseDiffContentAgainst:" : "LB 11/22/2018 11:04", + "reverseDiffContentAgainst:" : "LB 4/28/2019 13:44", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 4/27/2019 19:56", "squotSummaryText" : "LB 4/28/2019 11:37", From 77b34b71764412819cb2bce9dabb293507aa693e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 13:55:41 +0200 Subject: [PATCH 152/170] Added remote tests to expected failures for now --- .../LBGitRemoteTests.class/instance/expectedFailures.st | 7 +++++++ .../LBGitRemoteTests.class/methodProperties.json | 1 + 2 files changed, 8 insertions(+) create mode 100644 src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st new file mode 100644 index 000000000..a9603ea62 --- /dev/null +++ b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st @@ -0,0 +1,7 @@ +as yet unclassified +expectedFailures + self flag: #TODO "Make credentials available". + self credentials + on: NeedGitCredentials + do: [^ super expectedFailures, self class allTestSelectors]. + ^ super expectedFailures \ No newline at end of file diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 4b462cd0b..4cf719726 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -9,6 +9,7 @@ "createBranch" : "LB 12/8/2018 15:28", "credentials" : "LB 12/13/2018 16:35", "deleteBranch" : "LB 12/8/2018 14:42", + "expectedFailures" : "LB 4/28/2019 13:53", "generateToken" : "LB 12/13/2018 17:50", "initialize" : "LB 2/13/2019 16:51", "otherCommit" : "LB 12/10/2018 09:48", From cef02b499214cfd56d75a2470127955642c297f0 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 13:59:34 +0200 Subject: [PATCH 153/170] Fix critical defect: mssing brackets --- .../LBGitFilesArtifact.class/instance/^equals.st | 2 +- .../LBGitFilesArtifact.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st index 1f1b19d37..3e8ea63d4 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st @@ -4,4 +4,4 @@ as yet unclassified ^ self class = otherObject class and: [self objectContainer = otherObject objectContainer] and: [self rootDirectory = otherObject rootDirectory] - and: [trackedFiles = otherObject instVarNamed: #trackedFiles] \ No newline at end of file + and: [trackedFiles = (otherObject instVarNamed: #trackedFiles)] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index a979f143b..a5084b41f 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "path" : "LB 12/7/2018 18:14" }, "instance" : { - "=" : "LB 4/28/2019 11:23", + "=" : "LB 4/28/2019 13:58", "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", "diffAgainst:" : "LB 11/25/2018 13:35", From b738e01799b3f852606e9749ce7458dbd64cdc4c Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 14:07:26 +0200 Subject: [PATCH 154/170] Fix defect: missing brackets --- .../LBGitRemoteTests.class/instance/expectedFailures.st | 2 +- .../LBGitRemoteTests.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st index a9603ea62..e7eae9160 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st +++ b/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st @@ -1,7 +1,7 @@ as yet unclassified expectedFailures self flag: #TODO "Make credentials available". - self credentials + [self credentials] on: NeedGitCredentials do: [^ super expectedFailures, self class allTestSelectors]. ^ super expectedFailures \ No newline at end of file diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json index 4cf719726..af13e053f 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json @@ -9,7 +9,7 @@ "createBranch" : "LB 12/8/2018 15:28", "credentials" : "LB 12/13/2018 16:35", "deleteBranch" : "LB 12/8/2018 14:42", - "expectedFailures" : "LB 4/28/2019 13:53", + "expectedFailures" : "LB 4/28/2019 14:04", "generateToken" : "LB 12/13/2018 17:50", "initialize" : "LB 2/13/2019 16:51", "otherCommit" : "LB 12/10/2018 09:48", From a9629f1b1b8f4fadc171812ebcd4966da2dae3c0 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 14:40:59 +0200 Subject: [PATCH 155/170] Now always allowing diff between multiple live file lists, however is always empty --- .../instance/reverseDiffAgainstLiveFiles..st | 5 +++-- .../LBGitLiveFilesArtifact.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st index 2838694c7..6ffce725d 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -1,5 +1,6 @@ diffing reverseDiffAgainstLiveFiles: otherFilesArtifact "There is only one live file system" - self = otherFilesArtifact ifTrue: [^ LBGitFileListDiff empty]. - ^ self shouldNotImplement \ No newline at end of file + "This could however occur when somebody tries to snapshot the image store and diff between the snapshot and the actuel live system + Live files currently does not support snapshotting them" + ^ LBGitFileListDiff empty \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json index f893e9909..494745782 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json @@ -8,6 +8,6 @@ "diffAgainst:" : "LB 11/26/2018 17:22", "initializeOn:" : "LB 4/27/2019 19:51", "pathAndMetadataFor:" : "LB 4/28/2019 11:06", - "reverseDiffAgainstLiveFiles:" : "LB 4/27/2019 16:06", + "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 14:39", "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", "workingDirectory" : "LB 12/13/2018 17:01" } } From 3a870fc55ba4eef1203c46fc3d6d5454e7b17e94 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 15:23:44 +0200 Subject: [PATCH 156/170] Adapted squot file filtering mask --- .../LBGitFilesArtifact.class/instance/isSquotFile..st | 1 + .../LBGitFilesArtifact.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st index f2f6c3997..0d7447d01 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st @@ -2,6 +2,7 @@ as yet unclassified isSquotFile: aPath ^ (aPath = SquotFileSystemStore tocFileName) + or: [aPath includesSubstring: SquotObjectMetadataFile metadataFileName] or: [aPath includesSubstring: 'squot-table-of-contents'] or: [aPath includesSubstring: '.package'] or: [self objectContainer includesObjectAt: aPath] \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json index a5084b41f..aba7d047a 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json @@ -10,7 +10,7 @@ "displayText" : "LB 11/26/2018 16:25", "hash" : "LB 4/28/2019 11:23", "isLoadable" : "LB 4/28/2019 13:41", - "isSquotFile:" : "LB 4/28/2019 12:48", + "isSquotFile:" : "LB 4/28/2019 15:23", "materializeWith:replacing:" : "LB 4/28/2019 11:29", "objectContainer" : "LB 4/28/2019 11:22", "objectContainer:" : "LB 4/28/2019 11:22", From 3abe9baf669d973e905220d9a62605593c516cd7 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 16:06:52 +0200 Subject: [PATCH 157/170] Add diffing methods for unrecorded file artifact, if somebody tries to rolll back to an old version --- .../instance/reverseDiffAgainstLiveFiles..st | 4 ++++ .../instance/reverseDiffAgainstRecordedFiles..st | 6 ++++++ .../methodProperties.json | 2 ++ 3 files changed, 12 insertions(+) create mode 100644 src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st create mode 100644 src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..eb6376c91 --- /dev/null +++ b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,4 @@ +comparing +reverseDiffAgainstLiveFiles: otherFilesArtifact + + ^ self reverseDiffAgainstRecordedFiles: otherFilesArtifact \ No newline at end of file diff --git a/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..788e7c1a6 --- /dev/null +++ b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,6 @@ +comparing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + ^ (UIManager confirm: 'You are about to remove tracking of files outside the image. Are you sure to do so?') + ifTrue: [LBGitArtifactReplacementDiff left: otherFilesArtifact right: self] + ifFalse: [SquotDiffOfEqualObjects instance] \ No newline at end of file diff --git a/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json b/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json index 83508a067..6dfa31504 100644 --- a/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json +++ b/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json @@ -11,6 +11,8 @@ "ownerSnapshot" : "jr 3/7/2017 01:02", "ownerSnapshot:" : "jr 3/7/2017 01:02", "path:" : "jr 3/8/2017 17:37", + "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 15:54", + "reverseDiffAgainstRecordedFiles:" : "LB 4/28/2019 15:53", "reverseDiffAgainstUnrecordedFiles:" : "jr 7/22/2017 02:43", "rootDirectory" : "jr 3/7/2017 01:02", "rootDirectory:" : "jr 3/7/2017 01:02", From 843b2a7701903aa5be43afca9ee634277793400e Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 16:12:46 +0200 Subject: [PATCH 158/170] Renamed lbgit classes to squot classes --- .../instance/privateAsConflicts.st | 4 ---- .../instance/diffAgainst..st | 4 ---- .../properties.json | 14 -------------- .../README.md | 0 .../instance/applyToContainer..st | 0 .../instance/mergeWithDiff..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/applyWith..st | 0 .../instance/before.st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../README.md | 0 .../class/left.right..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../instance/body.st | 0 .../instance/choice.st | 0 .../instance/isConflict.st | 0 .../instance/leftChange..st | 0 .../instance/leftChange.st | 0 .../instance/rightChange..st | 0 .../instance/rightChange.st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../README.md | 0 .../instance/after.st | 0 .../instance/applyTo..st | 0 .../instance/applyWith..st | 0 .../instance/asDiffNode.st | 0 .../instance/before.st | 0 .../instance/body.st | 0 .../instance/contentsOf..st | 0 .../instance/isConflict.st | 0 .../instance/mergeWith..st | 2 +- .../instance/parent..st | 0 .../instance/parent.st | 0 .../instance/path..st | 0 .../instance/path.st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../instance/title.st | 0 .../methodProperties.json | 2 +- .../properties.json | 2 +- .../README.md | 0 .../class/empty.st | 0 .../class/left.right..st | 0 .../instance/added..st | 0 .../instance/added.st | 0 .../instance/applyToContainer..st | 0 .../instance/asConflicts.st | 0 .../instance/asDiffTree.st | 2 +- .../instance/createDiffs.st | 0 .../instance/createFile..st | 0 .../instance/deleteFile..st | 0 .../instance/diff.against..st | 0 .../instance/diffAdded.st | 2 +- .../instance/diffAt..st | 0 .../instance/diffModified.st | 2 +- .../instance/diffPaths.st | 0 .../instance/diffRemoved.st | 2 +- .../instance/diffs..st | 0 .../instance/diffs.st | 0 .../instance/gitReferenceOn..st | 0 .../instance/hasChanges.st | 0 .../instance/hasConflicts.st | 0 .../instance/isAddition.st | 0 .../instance/isFileModified..st | 0 .../instance/isRemoval.st | 0 .../instance/left..st | 0 .../instance/left.st | 0 .../instance/leftReferenceOn..st | 0 .../instance/mergeWith..st | 2 +- .../instance/mergeWithRemoval..st | 0 .../instance/modified..st | 0 .../instance/modified.st | 0 .../instance/originalOrAddedArtifact.st | 0 .../instance/path.st | 0 .../instance/privateAsConflicts.st | 4 ++++ .../instance/removed..st | 0 .../instance/removed.st | 0 .../instance/right..st | 0 .../instance/right.st | 0 .../instance/rightReferenceOn..st | 0 .../instance/sourceReferenceOn..st | 0 .../instance/squotChangeAsStringOrText.st | 0 .../instance/stayed..st | 0 .../instance/stayed.st | 0 .../instance/storeInfo.st | 0 .../instance/target..st | 0 .../instance/target.st | 0 .../instance/targetReferenceOn..st | 0 .../instance/topNodes.st | 0 .../instance/updateFile..st | 0 .../instance/workingDirectory.st | 0 .../instance/workingReferenceOn..st | 0 .../methodProperties.json | 12 ++++++------ .../properties.json | 2 +- .../README.md | 0 .../class/onTreeEntry..st | 0 .../instance/contentChangesTo..st | 0 .../instance/contents.st | 0 .../instance/entryHash.st | 0 .../instance/gitChangesTo..st | 0 .../instance/hasChangesTo..st | 0 .../instance/reference..st | 0 .../instance/reference.st | 0 .../instance/treeEntry..st | 0 .../instance/treeEntry.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/applyWith..st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../README.md | 0 .../instance/after.st | 0 .../instance/applyWith..st | 0 .../instance/title.st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../README.md | 0 .../class/path.st | 0 .../instance/^equals.st | 0 .../instance/capture.st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 4 ++++ .../instance/diffContentAgainstThatOf..st | 0 .../instance/displayText.st | 0 .../instance/hash.st | 0 .../instance/isLoadable.st | 0 .../instance/isSquotFile..st | 0 .../instance/materializeWith.replacing..st | 2 +- .../instance/objectContainer..st | 0 .../instance/objectContainer.st | 0 .../instance/path.st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 0 .../instance/reverseDiffAgainstRecordedFiles..st | 0 .../instance/reverseDiffAgainstUnrecordedFiles..st | 2 +- .../instance/reverseDiffContentAgainst..st | 0 .../instance/rootDirectory..st | 0 .../instance/rootDirectory.st | 0 .../instance/squotSummaryText.st | 0 .../instance/storeInfo.st | 2 +- .../instance/storeWith..st | 0 .../instance/trackedFiles..st | 0 .../instance/trackedFiles.st | 0 .../instance/wantsToBeInTableOfContents.st | 0 .../instance/workingDirectory.st | 0 .../methodProperties.json | 8 ++++---- .../properties.json | 2 +- .../README.md | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/allFiles.st | 0 .../instance/capture.st | 0 .../instance/collectTrackedFiles.st | 0 .../instance/diffAgainst..st | 0 .../instance/initializeOn..st | 0 .../instance/pathAndMetadataFor..st | 2 +- .../instance/reverseDiffAgainstLiveFiles..st | 2 +- .../instance/reverseDiffAgainstRecordedFiles..st | 2 +- .../instance/workingDirectory.st | 0 .../methodProperties.json | 6 +++--- .../properties.json | 4 ++-- .../README.md | 0 .../instance/collectFilesOf..st | 0 .../instance/collectFilesOf.in..st | 2 +- .../instance/collectTrackedFiles.st | 0 .../instance/commit.st | 0 .../instance/diffAgainst..st | 0 .../instance/isInGit.st | 0 .../instance/printOn..st | 0 .../instance/reverseDiffAgainstLiveFiles..st | 2 +- .../instance/reverseDiffAgainstRecordedFiles..st | 2 +- .../instance/workingDirectory.st | 0 .../methodProperties.json | 6 +++--- .../properties.json | 14 ++++++++++++++ .../instance/initializeTrackedFiles.st | 4 ++-- .../instance/liveArtifactFor.at..st | 2 +- .../SquotImageStore.class/methodProperties.json | 4 ++-- .../SquotImageStoreTest.class/instance/setUp.st | 2 +- .../instance/snapshotClass.at..st | 2 +- .../instance/snapshotPackage.at..st | 2 +- .../methodProperties.json | 6 +++--- .../instance/reverseDiffAgainstRecordedFiles..st | 2 +- .../methodProperties.json | 2 +- .../instance/initialLoadOrder.st | 2 +- .../methodProperties.json | 2 +- 194 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st delete mode 100644 src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st delete mode 100644 src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/instance/applyToContainer..st (100%) rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/instance/mergeWithDiff..st (100%) rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/instance/squotChangeAsStringOrText.st (100%) rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitArtifactReplacementDiff.class => SquotArtifactReplacementDiff.class}/properties.json (82%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/instance/applyWith..st (100%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/instance/before.st (100%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/instance/title.st (100%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFileAddition.class => SquotFileAddition.class}/properties.json (73%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/class/left.right..st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/applyWith..st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/asDiffNode.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/body.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/choice.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/isConflict.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/leftChange..st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/leftChange.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/rightChange..st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/rightChange.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/instance/title.st (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFileConflict.class => SquotFileConflict.class}/properties.json (76%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/after.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/applyTo..st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/applyWith..st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/asDiffNode.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/before.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/body.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/contentsOf..st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/isConflict.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/mergeWith..st (58%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/parent..st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/parent.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/path..st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/path.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/squotChangeAsStringOrText.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/instance/title.st (100%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/methodProperties.json (93%) rename src/LBGit-Core.package/{LBGitFileDiff.class => SquotFileDiff.class}/properties.json (88%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/class/empty.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/class/left.right..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/added..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/added.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/applyToContainer..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/asConflicts.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/asDiffTree.st (79%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/createDiffs.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/createFile..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/deleteFile..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diff.against..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffAdded.st (76%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffAt..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffModified.st (76%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffPaths.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffRemoved.st (78%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffs..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/diffs.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/gitReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/hasChanges.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/hasConflicts.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/isAddition.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/isFileModified..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/isRemoval.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/left..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/left.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/leftReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/mergeWith..st (95%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/mergeWithRemoval..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/modified..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/modified.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/originalOrAddedArtifact.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/path.st (100%) create mode 100644 src/LBGit-Core.package/SquotFileListDiff.class/instance/privateAsConflicts.st rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/removed..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/removed.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/right..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/right.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/rightReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/sourceReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/squotChangeAsStringOrText.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/stayed..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/stayed.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/storeInfo.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/target..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/target.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/targetReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/topNodes.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/updateFile..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/workingDirectory.st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/instance/workingReferenceOn..st (100%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/methodProperties.json (88%) rename src/LBGit-Core.package/{LBGitFileListDiff.class => SquotFileListDiff.class}/properties.json (89%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/class/onTreeEntry..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/contentChangesTo..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/contents.st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/entryHash.st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/gitChangesTo..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/hasChangesTo..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/reference..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/reference.st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/treeEntry..st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/instance/treeEntry.st (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFileMetadata.class => SquotFileMetadata.class}/properties.json (87%) rename src/LBGit-Core.package/{LBGitFileModification.class => SquotFileModification.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileModification.class => SquotFileModification.class}/instance/applyWith..st (100%) rename src/LBGit-Core.package/{LBGitFileModification.class => SquotFileModification.class}/instance/title.st (100%) rename src/LBGit-Core.package/{LBGitFileModification.class => SquotFileModification.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFileModification.class => SquotFileModification.class}/properties.json (72%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/instance/after.st (100%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/instance/applyWith..st (100%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/instance/title.st (100%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFileRemoval.class => SquotFileRemoval.class}/properties.json (73%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/class/path.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/^equals.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/capture.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/collectTrackedFiles.st (100%) create mode 100644 src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffAgainst..st rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/diffContentAgainstThatOf..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/displayText.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/hash.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/isLoadable.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/isSquotFile..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/materializeWith.replacing..st (75%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/objectContainer..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/objectContainer.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/path.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/reverseDiffAgainstLiveFiles..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/reverseDiffAgainstRecordedFiles..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/reverseDiffAgainstUnrecordedFiles..st (59%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/reverseDiffContentAgainst..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/rootDirectory..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/rootDirectory.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/squotSummaryText.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/storeInfo.st (69%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/storeWith..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/trackedFiles..st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/trackedFiles.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/wantsToBeInTableOfContents.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/instance/workingDirectory.st (100%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/methodProperties.json (83%) rename src/LBGit-Core.package/{LBGitFilesArtifact.class => SquotFilesArtifact.class}/properties.json (88%) rename src/LBGit-Core.package/{LBGitFilesObject.class => SquotFilesObject.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitFilesObject.class => SquotFilesObject.class}/methodProperties.json (100%) rename src/LBGit-Core.package/{LBGitFilesObject.class => SquotFilesObject.class}/properties.json (87%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/allFiles.st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/capture.st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/collectTrackedFiles.st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/diffAgainst..st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/initializeOn..st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/pathAndMetadataFor..st (76%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/reverseDiffAgainstLiveFiles..st (91%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/reverseDiffAgainstRecordedFiles..st (63%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/instance/workingDirectory.st (100%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/methodProperties.json (63%) rename src/LBGit-Core.package/{LBGitLiveFilesArtifact.class => SquotLiveFilesArtifact.class}/properties.json (70%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/README.md (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/collectFilesOf..st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/collectFilesOf.in..st (88%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/collectTrackedFiles.st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/commit.st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/diffAgainst..st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/isInGit.st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/printOn..st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/reverseDiffAgainstLiveFiles..st (62%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/reverseDiffAgainstRecordedFiles..st (51%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/instance/workingDirectory.st (100%) rename src/LBGit-Core.package/{LBGitRecordedFilesArtifact.class => SquotTrackedFilesArtifact.class}/methodProperties.json (66%) create mode 100644 src/LBGit-Core.package/SquotTrackedFilesArtifact.class/properties.json diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st b/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st deleted file mode 100644 index 9c501dbae..000000000 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/privateAsConflicts.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -privateAsConflicts - - self diffs: (self diffs collect: [:each | LBGitFileConflict left: nil right: each]). \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st deleted file mode 100644 index e0420bc4d..000000000 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffAgainst..st +++ /dev/null @@ -1,4 +0,0 @@ -diffing -diffAgainst: otherFilesArtifact - - ^ LBGitFileListDiff left: self right: otherFilesArtifact \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json b/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json deleted file mode 100644 index 87537eba1..000000000 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "LBGit-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "LBGitRecordedFilesArtifact", - "pools" : [ - ], - "super" : "LBGitFilesArtifact", - "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/README.md rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st similarity index 100% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/applyToContainer..st rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st similarity index 100% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/mergeWithDiff..st rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/methodProperties.json rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json similarity index 82% rename from src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json rename to src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json index d66221955..ffaa34ac3 100644 --- a/src/LBGit-Core.package/LBGitArtifactReplacementDiff.class/properties.json +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json @@ -7,7 +7,7 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitArtifactReplacementDiff", + "name" : "SquotArtifactReplacementDiff", "pools" : [ ], "super" : "SquotArtifactDiff", diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/README.md b/src/LBGit-Core.package/SquotFileAddition.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileAddition.class/README.md rename to src/LBGit-Core.package/SquotFileAddition.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileAddition.class/instance/applyWith..st rename to src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/instance/before.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileAddition.class/instance/before.st rename to src/LBGit-Core.package/SquotFileAddition.class/instance/before.st diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/instance/title.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileAddition.class/instance/title.st rename to src/LBGit-Core.package/SquotFileAddition.class/instance/title.st diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json b/src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFileAddition.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFileAddition.class/properties.json b/src/LBGit-Core.package/SquotFileAddition.class/properties.json similarity index 73% rename from src/LBGit-Core.package/LBGitFileAddition.class/properties.json rename to src/LBGit-Core.package/SquotFileAddition.class/properties.json index 52e8b0152..431ede880 100644 --- a/src/LBGit-Core.package/LBGitFileAddition.class/properties.json +++ b/src/LBGit-Core.package/SquotFileAddition.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitFileAddition", + "name" : "SquotFileAddition", "pools" : [ ], - "super" : "LBGitFileDiff", + "super" : "SquotFileDiff", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/README.md b/src/LBGit-Core.package/SquotFileConflict.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/README.md rename to src/LBGit-Core.package/SquotFileConflict.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st b/src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/class/left.right..st rename to src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/applyWith..st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/asDiffNode.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/body.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/body.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/body.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/body.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/choice.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/isConflict.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange..st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/leftChange.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange..st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/rightChange.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/instance/title.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/title.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/instance/title.st rename to src/LBGit-Core.package/SquotFileConflict.class/instance/title.st diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFileConflict.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFileConflict.class/properties.json b/src/LBGit-Core.package/SquotFileConflict.class/properties.json similarity index 76% rename from src/LBGit-Core.package/LBGitFileConflict.class/properties.json rename to src/LBGit-Core.package/SquotFileConflict.class/properties.json index b47c3d250..2fd96d14a 100644 --- a/src/LBGit-Core.package/LBGitFileConflict.class/properties.json +++ b/src/LBGit-Core.package/SquotFileConflict.class/properties.json @@ -8,8 +8,8 @@ "instvars" : [ "leftChange", "rightChange" ], - "name" : "LBGitFileConflict", + "name" : "SquotFileConflict", "pools" : [ ], - "super" : "LBGitFileDiff", + "super" : "SquotFileDiff", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/README.md b/src/LBGit-Core.package/SquotFileDiff.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/README.md rename to src/LBGit-Core.package/SquotFileDiff.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/after.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/after.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/applyTo..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/applyWith..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/asDiffNode.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/before.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/before.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/body.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/body.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/body.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/body.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/contentsOf..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/isConflict.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st similarity index 58% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st index d59ec3e99..1f6d131a2 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/instance/mergeWith..st +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st @@ -1,6 +1,6 @@ as yet unclassified mergeWith: anotherFileDiff - ^ (LBGitFileConflict left: self right: anotherFileDiff) + ^ (SquotFileConflict left: self right: anotherFileDiff) path: self path; yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/parent..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/parent.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/path..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/path..st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/path..st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/path.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/path.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/instance/title.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileDiff.class/instance/title.st rename to src/LBGit-Core.package/SquotFileDiff.class/instance/title.st diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json similarity index 93% rename from src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json index 1d95b0066..5f5a852c7 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json @@ -10,7 +10,7 @@ "body" : "LB 11/23/2018 18:37", "contentsOf:" : "LB 4/28/2019 12:22", "isConflict" : "LB 12/8/2018 14:17", - "mergeWith:" : "LB 11/25/2018 16:34", + "mergeWith:" : "LB 4/28/2019 16:09", "parent" : "LB 11/23/2018 18:42", "parent:" : "LB 11/23/2018 18:42", "path" : "LB 11/23/2018 18:51", diff --git a/src/LBGit-Core.package/LBGitFileDiff.class/properties.json b/src/LBGit-Core.package/SquotFileDiff.class/properties.json similarity index 88% rename from src/LBGit-Core.package/LBGitFileDiff.class/properties.json rename to src/LBGit-Core.package/SquotFileDiff.class/properties.json index 92e6cee07..bc561fb99 100644 --- a/src/LBGit-Core.package/LBGitFileDiff.class/properties.json +++ b/src/LBGit-Core.package/SquotFileDiff.class/properties.json @@ -8,7 +8,7 @@ "instvars" : [ "path", "parent" ], - "name" : "LBGitFileDiff", + "name" : "SquotFileDiff", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/README.md b/src/LBGit-Core.package/SquotFileListDiff.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/README.md rename to src/LBGit-Core.package/SquotFileListDiff.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st b/src/LBGit-Core.package/SquotFileListDiff.class/class/empty.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/class/empty.st rename to src/LBGit-Core.package/SquotFileListDiff.class/class/empty.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st b/src/LBGit-Core.package/SquotFileListDiff.class/class/left.right..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/class/left.right..st rename to src/LBGit-Core.package/SquotFileListDiff.class/class/left.right..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/added..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/added..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/added.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/added.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/applyToContainer..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asConflicts.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/asConflicts.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/asConflicts.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st similarity index 79% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st index 7110c9d0d..934b4d709 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/asDiffTree.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st @@ -2,7 +2,7 @@ as yet unclassified asDiffTree ^ SquotDiffNode - title: LBGitFilesArtifact path + title: SquotFilesArtifact path content: self children: self topNodes onInclude: [] diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createDiffs.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/createDiffs.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/createDiffs.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/createFile..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/deleteFile..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/deleteFile..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/deleteFile..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diff.against..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diff.against..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diff.against..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st similarity index 76% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st index 33d3412cb..193ae4790 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAdded.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st @@ -3,7 +3,7 @@ diffAdded self diffs addAll: (self added collect: - [:each | LBGitFileAddition new + [:each | SquotFileAddition new parent: self; path: each; yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAt..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffAt..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAt..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st similarity index 76% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st index 7b528c812..590b06f21 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffModified.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st @@ -3,7 +3,7 @@ diffModified self diffs addAll: (self modified collect: - [:each | LBGitFileModification new + [:each | SquotFileModification new parent: self; path: each; yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffPaths.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffPaths.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffPaths.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st similarity index 78% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st index 51851e012..81e370e1c 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffRemoved.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st @@ -3,7 +3,7 @@ diffRemoved self diffs addAll: (self removed collect: - [:each | LBGitFileRemoval new + [:each | SquotFileRemoval new parent: self; path: each; yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/diffs.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/gitReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/gitReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/gitReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasChanges.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasChanges.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/hasChanges.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasConflicts.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/hasConflicts.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/hasConflicts.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isAddition.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/isAddition.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/isAddition.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isFileModified..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/isFileModified..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/isFileModified..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isRemoval.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/isRemoval.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/isRemoval.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/left..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/left..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/left.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/left.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/leftReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/leftReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/leftReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st similarity index 95% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st index 6a1198c0a..408cda437 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWith..st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st @@ -8,7 +8,7 @@ mergeWith: otherFileListDiff addAll: (self diffs reject: [:each | commonPaths includes: each path]); addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]); addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). - ^ LBGitFileListDiff new + ^ SquotFileListDiff new left: self right; right: otherFileListDiff right; diffs: resultingDiffs; diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWithRemoval..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/mergeWithRemoval..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWithRemoval..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/modified..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/modified.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/modified.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/originalOrAddedArtifact.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/originalOrAddedArtifact.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/originalOrAddedArtifact.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/path.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/privateAsConflicts.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/privateAsConflicts.st new file mode 100644 index 000000000..74de26bac --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/privateAsConflicts.st @@ -0,0 +1,4 @@ +as yet unclassified +privateAsConflicts + + self diffs: (self diffs collect: [:each | SquotFileConflict left: nil right: each]). \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/removed..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/removed.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/removed.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/right..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/right..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/right.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/right.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/rightReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/rightReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/rightReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/sourceReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/sourceReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/sourceReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/squotChangeAsStringOrText.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/squotChangeAsStringOrText.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/squotChangeAsStringOrText.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/stayed.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/storeInfo.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/storeInfo.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/storeInfo.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/target..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/target..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/target.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/target.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/targetReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/topNodes.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/updateFile..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/updateFile..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/updateFile..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingDirectory.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingDirectory.st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/workingDirectory.st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileListDiff.class/instance/workingReferenceOn..st rename to src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json similarity index 88% rename from src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index 04115f468..57e65c319 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -7,16 +7,16 @@ "added:" : "LB 11/22/2018 11:17", "applyToContainer:" : "LB 11/26/2018 16:06", "asConflicts" : "LB 4/27/2019 15:49", - "asDiffTree" : "LB 3/27/2019 18:50", + "asDiffTree" : "LB 4/28/2019 16:11", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 3/1/2019 15:57", "deleteFile:" : "LB 11/25/2018 15:55", "diff:against:" : "LB 11/26/2018 16:06", - "diffAdded" : "LB 11/23/2018 18:52", + "diffAdded" : "LB 4/28/2019 16:09", "diffAt:" : "LB 11/25/2018 16:14", - "diffModified" : "LB 11/23/2018 18:52", + "diffModified" : "LB 4/28/2019 16:09", "diffPaths" : "LB 11/25/2018 16:05", - "diffRemoved" : "LB 11/23/2018 18:52", + "diffRemoved" : "LB 4/28/2019 16:09", "diffs" : "LB 11/23/2018 15:18", "diffs:" : "LB 11/23/2018 15:18", "gitReferenceOn:" : "LB 2/13/2019 14:04", @@ -28,13 +28,13 @@ "left" : "LB 11/22/2018 11:14", "left:" : "LB 11/22/2018 11:14", "leftReferenceOn:" : "LB 2/13/2019 14:04", - "mergeWith:" : "LB 2/13/2019 14:05", + "mergeWith:" : "LB 4/28/2019 16:10", "mergeWithRemoval:" : "LB 4/28/2019 12:17", "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", "originalOrAddedArtifact" : "LB 11/22/2018 15:53", "path" : "LB 11/22/2018 16:36", - "privateAsConflicts" : "LB 4/27/2019 15:50", + "privateAsConflicts" : "LB 4/28/2019 16:09", "removed" : "LB 11/22/2018 11:17", "removed:" : "LB 11/22/2018 11:17", "right" : "LB 11/22/2018 11:14", diff --git a/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json b/src/LBGit-Core.package/SquotFileListDiff.class/properties.json similarity index 89% rename from src/LBGit-Core.package/LBGitFileListDiff.class/properties.json rename to src/LBGit-Core.package/SquotFileListDiff.class/properties.json index 4b94763e8..7a9cbeb43 100644 --- a/src/LBGit-Core.package/LBGitFileListDiff.class/properties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/properties.json @@ -14,7 +14,7 @@ "modified", "diffs", "target" ], - "name" : "LBGitFileListDiff", + "name" : "SquotFileListDiff", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/README.md b/src/LBGit-Core.package/SquotFileMetadata.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/README.md rename to src/LBGit-Core.package/SquotFileMetadata.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st b/src/LBGit-Core.package/SquotFileMetadata.class/class/onTreeEntry..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/class/onTreeEntry..st rename to src/LBGit-Core.package/SquotFileMetadata.class/class/onTreeEntry..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/contentChangesTo..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/contentChangesTo..st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/contentChangesTo..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/contents.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/contents.st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/contents.st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/entryHash.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/entryHash.st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/entryHash.st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/gitChangesTo..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/gitChangesTo..st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/gitChangesTo..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/hasChangesTo..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/hasChangesTo..st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/hasChangesTo..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference..st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/reference..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/reference.st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/reference.st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry..st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry..st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/instance/treeEntry.st rename to src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry.st diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json b/src/LBGit-Core.package/SquotFileMetadata.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFileMetadata.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileMetadata.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json b/src/LBGit-Core.package/SquotFileMetadata.class/properties.json similarity index 87% rename from src/LBGit-Core.package/LBGitFileMetadata.class/properties.json rename to src/LBGit-Core.package/SquotFileMetadata.class/properties.json index b839388e6..77e4afe5c 100644 --- a/src/LBGit-Core.package/LBGitFileMetadata.class/properties.json +++ b/src/LBGit-Core.package/SquotFileMetadata.class/properties.json @@ -8,7 +8,7 @@ "instvars" : [ "reference", "treeEntry" ], - "name" : "LBGitFileMetadata", + "name" : "SquotFileMetadata", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/LBGitFileModification.class/README.md b/src/LBGit-Core.package/SquotFileModification.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileModification.class/README.md rename to src/LBGit-Core.package/SquotFileModification.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileModification.class/instance/applyWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileModification.class/instance/applyWith..st rename to src/LBGit-Core.package/SquotFileModification.class/instance/applyWith..st diff --git a/src/LBGit-Core.package/LBGitFileModification.class/instance/title.st b/src/LBGit-Core.package/SquotFileModification.class/instance/title.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileModification.class/instance/title.st rename to src/LBGit-Core.package/SquotFileModification.class/instance/title.st diff --git a/src/LBGit-Core.package/LBGitFileModification.class/methodProperties.json b/src/LBGit-Core.package/SquotFileModification.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFileModification.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileModification.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFileModification.class/properties.json b/src/LBGit-Core.package/SquotFileModification.class/properties.json similarity index 72% rename from src/LBGit-Core.package/LBGitFileModification.class/properties.json rename to src/LBGit-Core.package/SquotFileModification.class/properties.json index cfff3cef3..bb928ff5c 100644 --- a/src/LBGit-Core.package/LBGitFileModification.class/properties.json +++ b/src/LBGit-Core.package/SquotFileModification.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitFileModification", + "name" : "SquotFileModification", "pools" : [ ], - "super" : "LBGitFileDiff", + "super" : "SquotFileDiff", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/README.md b/src/LBGit-Core.package/SquotFileRemoval.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFileRemoval.class/README.md rename to src/LBGit-Core.package/SquotFileRemoval.class/README.md diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/after.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileRemoval.class/instance/after.st rename to src/LBGit-Core.package/SquotFileRemoval.class/instance/after.st diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/applyWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFileRemoval.class/instance/applyWith..st rename to src/LBGit-Core.package/SquotFileRemoval.class/instance/applyWith..st diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/title.st similarity index 100% rename from src/LBGit-Core.package/LBGitFileRemoval.class/instance/title.st rename to src/LBGit-Core.package/SquotFileRemoval.class/instance/title.st diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json b/src/LBGit-Core.package/SquotFileRemoval.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFileRemoval.class/methodProperties.json rename to src/LBGit-Core.package/SquotFileRemoval.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFileRemoval.class/properties.json b/src/LBGit-Core.package/SquotFileRemoval.class/properties.json similarity index 73% rename from src/LBGit-Core.package/LBGitFileRemoval.class/properties.json rename to src/LBGit-Core.package/SquotFileRemoval.class/properties.json index 2134d75c4..581b96d37 100644 --- a/src/LBGit-Core.package/LBGitFileRemoval.class/properties.json +++ b/src/LBGit-Core.package/SquotFileRemoval.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitFileRemoval", + "name" : "SquotFileRemoval", "pools" : [ ], - "super" : "LBGitFileDiff", + "super" : "SquotFileDiff", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotFilesArtifact.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/README.md rename to src/LBGit-Core.package/SquotFilesArtifact.class/README.md diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st b/src/LBGit-Core.package/SquotFilesArtifact.class/class/path.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/class/path.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/class/path.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/^equals.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/^equals.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/^equals.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/capture.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/capture.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/capture.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..7996ca0a5 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +1,4 @@ +diffing +diffAgainst: otherFilesArtifact + + ^ SquotFileListDiff left: self right: otherFilesArtifact \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffContentAgainstThatOf..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/diffContentAgainstThatOf..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffContentAgainstThatOf..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/displayText.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/displayText.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/displayText.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/hash.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/hash.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/hash.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isLoadable.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isLoadable.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/isLoadable.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isSquotFile..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/isSquotFile..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/isSquotFile..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/materializeWith.replacing..st similarity index 75% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/materializeWith.replacing..st index a4e76f651..d83f786a5 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/materializeWith.replacing..st +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/materializeWith.replacing..st @@ -1,4 +1,4 @@ as yet unclassified materializeWith: anArtifact replacing: anObject - ^ LBGitFilesObject new \ No newline at end of file + ^ SquotFilesObject new \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/objectContainer.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/path.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/path.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/path.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st similarity index 59% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st index 73b8828fa..1deb2c907 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st @@ -1,4 +1,4 @@ as yet unclassified reverseDiffAgainstUnrecordedFiles: anUnrecordedFilesArtifact - ^ LBGitArtifactReplacementDiff left: anUnrecordedFilesArtifact right: self \ No newline at end of file + ^ SquotArtifactReplacementDiff left: anUnrecordedFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffContentAgainst..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/reverseDiffContentAgainst..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffContentAgainst..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/rootDirectory.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/squotSummaryText.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/squotSummaryText.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/squotSummaryText.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st similarity index 69% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st index 6c608e06e..ab15b5080 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeInfo.st +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st @@ -2,5 +2,5 @@ as yet unclassified storeInfo ^ SquotTrackedObjectMetadata new - objectClass: LBGitFilesObject; + objectClass: SquotFilesObject; yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeWith..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeWith..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/storeWith..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeWith..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles..st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles..st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles..st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/trackedFiles.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/wantsToBeInTableOfContents.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/wantsToBeInTableOfContents.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/wantsToBeInTableOfContents.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/SquotFilesArtifact.class/instance/workingDirectory.st diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json similarity index 83% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json index aba7d047a..01e0468d5 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json @@ -5,24 +5,24 @@ "=" : "LB 4/28/2019 13:58", "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", - "diffAgainst:" : "LB 11/25/2018 13:35", + "diffAgainst:" : "LB 4/28/2019 16:10", "diffContentAgainstThatOf:" : "LB 4/28/2019 13:43", "displayText" : "LB 11/26/2018 16:25", "hash" : "LB 4/28/2019 11:23", "isLoadable" : "LB 4/28/2019 13:41", "isSquotFile:" : "LB 4/28/2019 15:23", - "materializeWith:replacing:" : "LB 4/28/2019 11:29", + "materializeWith:replacing:" : "LB 4/28/2019 16:07", "objectContainer" : "LB 4/28/2019 11:22", "objectContainer:" : "LB 4/28/2019 11:22", "path" : "LB 12/7/2018 18:14", "reverseDiffAgainstLiveFiles:" : "LB 11/25/2018 14:05", "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:06", - "reverseDiffAgainstUnrecordedFiles:" : "LB 11/20/2018 15:02", + "reverseDiffAgainstUnrecordedFiles:" : "LB 4/28/2019 16:08", "reverseDiffContentAgainst:" : "LB 4/28/2019 13:44", "rootDirectory" : "LB 11/20/2018 10:17", "rootDirectory:" : "LB 4/27/2019 19:56", "squotSummaryText" : "LB 4/28/2019 11:37", - "storeInfo" : "LB 4/28/2019 11:38", + "storeInfo" : "LB 4/28/2019 16:07", "storeWith:" : "LB 4/27/2019 15:14", "trackedFiles" : "LB 11/22/2018 15:46", "trackedFiles:" : "LB 11/20/2018 15:12", diff --git a/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json b/src/LBGit-Core.package/SquotFilesArtifact.class/properties.json similarity index 88% rename from src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json rename to src/LBGit-Core.package/SquotFilesArtifact.class/properties.json index 19dc01ee6..16e853f5e 100644 --- a/src/LBGit-Core.package/LBGitFilesArtifact.class/properties.json +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/properties.json @@ -9,7 +9,7 @@ "rootDirectory", "trackedFiles", "objectContainer" ], - "name" : "LBGitFilesArtifact", + "name" : "SquotFilesArtifact", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/README.md b/src/LBGit-Core.package/SquotFilesObject.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitFilesObject.class/README.md rename to src/LBGit-Core.package/SquotFilesObject.class/README.md diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json b/src/LBGit-Core.package/SquotFilesObject.class/methodProperties.json similarity index 100% rename from src/LBGit-Core.package/LBGitFilesObject.class/methodProperties.json rename to src/LBGit-Core.package/SquotFilesObject.class/methodProperties.json diff --git a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json b/src/LBGit-Core.package/SquotFilesObject.class/properties.json similarity index 87% rename from src/LBGit-Core.package/LBGitFilesObject.class/properties.json rename to src/LBGit-Core.package/SquotFilesObject.class/properties.json index 7026b0066..366e1187b 100644 --- a/src/LBGit-Core.package/LBGitFilesObject.class/properties.json +++ b/src/LBGit-Core.package/SquotFilesObject.class/properties.json @@ -7,7 +7,7 @@ "commentStamp" : "LB 4/28/2019 10:52", "instvars" : [ ], - "name" : "LBGitFilesObject", + "name" : "SquotFilesObject", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/README.md rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/README.md diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/allFiles.st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/allFiles.st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/allFiles.st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/capture.st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/capture.st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/capture.st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/diffAgainst..st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/diffAgainst..st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/initializeOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/initializeOn..st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/initializeOn..st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/pathAndMetadataFor..st similarity index 76% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/pathAndMetadataFor..st index 740c79ec3..42bdea811 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/pathAndMetadataFor..st +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/pathAndMetadataFor..st @@ -4,4 +4,4 @@ pathAndMetadataFor: aFSReference | path | path := (aFSReference relativeTo: self rootDirectory) segments fold: [:all :eachSegment | all,'/',eachSegment]. - ^ path -> (LBGitFileMetadata new reference: aFSReference) \ No newline at end of file + ^ path -> (SquotFileMetadata new reference: aFSReference) \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 91% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st index 6ffce725d..e8c277457 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -3,4 +3,4 @@ reverseDiffAgainstLiveFiles: otherFilesArtifact "There is only one live file system" "This could however occur when somebody tries to snapshot the image store and diff between the snapshot and the actuel live system Live files currently does not support snapshotting them" - ^ LBGitFileListDiff empty \ No newline at end of file + ^ SquotFileListDiff empty \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 63% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st index 3d5ecd637..349fcf6de 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -2,4 +2,4 @@ diffing reverseDiffAgainstRecordedFiles: otherFilesArtifact self initializeOn: otherFilesArtifact. - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/workingDirectory.st diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json similarity index 63% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json index 494745782..e632ac5b0 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json @@ -7,7 +7,7 @@ "collectTrackedFiles" : "LB 4/28/2019 12:28", "diffAgainst:" : "LB 11/26/2018 17:22", "initializeOn:" : "LB 4/27/2019 19:51", - "pathAndMetadataFor:" : "LB 4/28/2019 11:06", - "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 14:39", - "reverseDiffAgainstRecordedFiles:" : "LB 11/26/2018 16:06", + "pathAndMetadataFor:" : "LB 4/28/2019 16:10", + "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 16:10", + "reverseDiffAgainstRecordedFiles:" : "LB 4/28/2019 16:10", "workingDirectory" : "LB 12/13/2018 17:01" } } diff --git a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/properties.json similarity index 70% rename from src/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json rename to src/LBGit-Core.package/SquotLiveFilesArtifact.class/properties.json index 36497e1a2..494078ef0 100644 --- a/src/LBGit-Core.package/LBGitLiveFilesArtifact.class/properties.json +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitLiveFilesArtifact", + "name" : "SquotLiveFilesArtifact", "pools" : [ ], - "super" : "LBGitFilesArtifact", + "super" : "SquotFilesArtifact", "type" : "normal" } diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/README.md similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/README.md rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/README.md diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf..st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf..st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf.in..st similarity index 88% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf.in..st index 01ddc5462..eed2a58ac 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectFilesOf.in..st +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf.in..st @@ -9,6 +9,6 @@ collectFilesOf: aGitTreeEntrySet in: directoryPath ifFalse: [ each isInDirectoryMode ifTrue: [result addAll: (self collectFilesOf: each object entries in: fullPath, '/')] - ifFalse: [result at: fullPath put: (LBGitFileMetadata onTreeEntry: each)]]]. + ifFalse: [result at: fullPath put: (SquotFileMetadata onTreeEntry: each)]]]. result keys select: [:each | self isSquotFile: each] thenDo: [:each | result removeKey: each]. ^ result \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectTrackedFiles.st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/collectTrackedFiles.st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectTrackedFiles.st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/commit.st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/commit.st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/commit.st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/diffAgainst..st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/diffAgainst..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/diffAgainst..st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/isInGit.st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/isInGit.st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/isInGit.st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/printOn..st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/printOn..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/printOn..st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st similarity index 62% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st index ceafad9e2..c39fafbc3 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -2,4 +2,4 @@ diffing reverseDiffAgainstLiveFiles: otherFilesArtifact otherFilesArtifact initializeOn: self. - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st similarity index 51% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st index 08e02cc19..9a99fe28c 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -1,4 +1,4 @@ diffing reverseDiffAgainstRecordedFiles: otherFilesArtifact - ^ LBGitFileListDiff left: otherFilesArtifact right: self \ No newline at end of file + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/workingDirectory.st similarity index 100% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/instance/workingDirectory.st rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/workingDirectory.st diff --git a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/methodProperties.json similarity index 66% rename from src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json rename to src/LBGit-Core.package/SquotTrackedFilesArtifact.class/methodProperties.json index d636869ec..3046950d2 100644 --- a/src/LBGit-Core.package/LBGitRecordedFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/methodProperties.json @@ -3,12 +3,12 @@ }, "instance" : { "collectFilesOf:" : "LB 4/28/2019 13:21", - "collectFilesOf:in:" : "LB 4/28/2019 13:25", + "collectFilesOf:in:" : "LB 4/28/2019 16:10", "collectTrackedFiles" : "LB 4/28/2019 11:06", "commit" : "LB 4/27/2019 19:58", "diffAgainst:" : "LB 11/25/2018 14:06", "isInGit" : "LB 4/27/2019 19:58", "printOn:" : "LB 11/25/2018 13:44", - "reverseDiffAgainstLiveFiles:" : "LB 11/26/2018 16:15", - "reverseDiffAgainstRecordedFiles:" : "LB 11/25/2018 14:08", + "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 16:10", + "reverseDiffAgainstRecordedFiles:" : "LB 4/28/2019 16:10", "workingDirectory" : "LB 4/27/2019 19:57" } } diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/properties.json b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/properties.json new file mode 100644 index 000000000..9d8c4248a --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotTrackedFilesArtifact", + "pools" : [ + ], + "super" : "SquotFilesArtifact", + "type" : "normal" } diff --git a/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st b/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st index ec4815dc9..f766f28ad 100644 --- a/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st +++ b/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st @@ -2,6 +2,6 @@ initialize-release initializeTrackedFiles self - add: LBGitFilesObject new - at: LBGitFilesArtifact path + add: SquotFilesObject new + at: SquotFilesArtifact path additionalInfo: SquotTrackedObjectMetadata new. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st index b18c29629..0cddbc370 100644 --- a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st +++ b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st @@ -1,7 +1,7 @@ private liveArtifactFor: anObject at: aPath - aPath = LBGitFilesArtifact path ifTrue: + aPath = SquotFilesArtifact path ifTrue: [^ (LBGitLiveFilesArtifact new objectContainer: self; yourself)]. diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 879124133..c76ff6f87 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -27,8 +27,8 @@ "includesObjectAt:" : "jr 3/8/2017 17:48", "initialize" : "LB 4/27/2019 19:16", "initializeObjectFrom:" : "jr 7/22/2017 11:59", - "initializeTrackedFiles" : "LB 4/27/2019 19:19", - "liveArtifactFor:at:" : "LB 4/28/2019 11:23", + "initializeTrackedFiles" : "LB 4/28/2019 16:11", + "liveArtifactFor:at:" : "LB 4/28/2019 16:11", "loadOrder" : "jr 8/18/2018 16:21", "loadOrder:" : "jr 9/16/2018 00:20", "materialize:replacing:" : "jr 4/7/2017 16:04", diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st b/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st index 1960593f1..0afe1869f 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st @@ -6,5 +6,5 @@ setUp imageStore := SquotImageStore new environment: testEnvironment; yourself. - imageStore removeAt: LBGitFilesArtifact path. + imageStore removeAt: SquotFilesArtifact path. changeLogSuppressor := SUnitChangeLogSuppressor new. \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st index 40aafe68c..ad1115fa3 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotClass.at..st @@ -2,5 +2,5 @@ utilities snapshotClass: aClass at: pathString ^ SquotImageStore new add: aClass at: pathString; - removeAt: LBGitFilesArtifact path; + removeAt: SquotFilesArtifact path; captureSnapshot \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st index 193dfb6ca..2d88fec4e 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/snapshotPackage.at..st @@ -2,5 +2,5 @@ utilities snapshotPackage: aPackageInfo at: pathString ^ SquotImageStore new add: aPackageInfo at: pathString; - removeAt: LBGitFilesArtifact path; + removeAt: SquotFilesArtifact path; captureSnapshot \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json index 13bef4de1..ad02bfc87 100644 --- a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json +++ b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json @@ -6,9 +6,9 @@ "createTestEnvironment" : "jr 1/27/2017 16:08", "nameForTestEnvironment" : "jr 1/27/2017 16:02", "newPackageInfoFor:" : "jr 3/5/2017 16:55", - "setUp" : "LB 4/27/2019 20:47", - "snapshotClass:at:" : "LB 4/27/2019 20:48", - "snapshotPackage:at:" : "LB 4/27/2019 20:49", + "setUp" : "LB 4/28/2019 16:11", + "snapshotClass:at:" : "LB 4/28/2019 16:11", + "snapshotPackage:at:" : "LB 4/28/2019 16:11", "tearDown" : "jr 4/29/2018 17:17", "testAddNewObjectsFromArtifact" : "jr 8/18/2017 13:01", "testAddingObjectsAddsThemToTheLoadOrder" : "jr 8/18/2018 15:59", diff --git a/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st index 788e7c1a6..fd17ca9a4 100644 --- a/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st +++ b/src/Squot.package/SquotUnrecordedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -2,5 +2,5 @@ comparing reverseDiffAgainstRecordedFiles: otherFilesArtifact ^ (UIManager confirm: 'You are about to remove tracking of files outside the image. Are you sure to do so?') - ifTrue: [LBGitArtifactReplacementDiff left: otherFilesArtifact right: self] + ifTrue: [SquotArtifactReplacementDiff left: otherFilesArtifact right: self] ifFalse: [SquotDiffOfEqualObjects instance] \ No newline at end of file diff --git a/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json b/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json index 6dfa31504..c5fcf1bd0 100644 --- a/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json +++ b/src/Squot.package/SquotUnrecordedFilesArtifact.class/methodProperties.json @@ -12,7 +12,7 @@ "ownerSnapshot:" : "jr 3/7/2017 01:02", "path:" : "jr 3/8/2017 17:37", "reverseDiffAgainstLiveFiles:" : "LB 4/28/2019 15:54", - "reverseDiffAgainstRecordedFiles:" : "LB 4/28/2019 15:53", + "reverseDiffAgainstRecordedFiles:" : "LB 4/28/2019 16:08", "reverseDiffAgainstUnrecordedFiles:" : "jr 7/22/2017 02:43", "rootDirectory" : "jr 3/7/2017 01:02", "rootDirectory:" : "jr 3/7/2017 01:02", diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st index e5569d512..3136312e2 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st @@ -1,4 +1,4 @@ testing initialLoadOrder - ^ {LBGitFilesArtifact path. '1'. '2'. } \ No newline at end of file + ^ {SquotFilesArtifact path. '1'. '2'. } \ No newline at end of file diff --git a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json index b28b17fe2..887d2cded 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "initialLoadOrder" : "LB 4/27/2019 18:08", + "initialLoadOrder" : "LB 4/28/2019 16:11", "setUp" : "jr 10/3/2018 15:28", "swappedLoadOrder" : "LB 4/27/2019 17:43", "testCannotMoveDownLastObjectInLoadOrder" : "LB 4/27/2019 17:42", From 9136020ed15bfb1b78910a216051ee48645a54e2 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 16:15:30 +0200 Subject: [PATCH 159/170] Removed lbgit baseline and renamed lbgit tests --- .../BaselineOfLBGit.class/instance/baseline..st | 13 ------------- .../BaselineOfLBGit.class/instance/postLoad.st | 7 ------- .../BaselineOfLBGit.class/methodProperties.json | 6 ------ .../BaselineOfLBGit.class/properties.json | 14 -------------- .../monticello.meta/categories.st | 1 - .../LBGitTestCase.class/README.md | 0 .../SquotFilesBrowserForTests.class}/README.md | 0 .../instance/projectSelection..st | 0 .../instance/projectSelection.st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- .../README.md | 0 .../instance/testCommitAddsFile.st | 0 .../instance/testCommitAddsFileContent.st | 0 .../instance/testCommitDeletesFile.st | 0 .../instance/testCommitUpdatesFile.st | 0 .../instance/testInitialTrackedFilesArtifact.st | 0 .../instance/testSetupSuccess.st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../README.md | 0 .../instance/branchName.st | 0 .../instance/browser..st | 0 .../instance/browser.st | 0 .../instance/commitOtherMessaged..st | 0 .../instance/createBranch.st | 0 .../instance/credentials.st | 0 .../instance/deleteBranch.st | 0 .../instance/expectedFailures.st | 0 .../instance/generateToken.st | 0 .../instance/initialize.st | 0 .../instance/otherCommit.st | 0 .../instance/otherReference.st | 0 .../instance/otherWorkingCopy..st | 0 .../instance/otherWorkingCopy.st | 0 .../instance/performTest.st | 0 .../instance/pullOther.st | 0 .../instance/push.st | 0 .../instance/remainingAttempts..st | 0 .../instance/remainingAttempts.st | 0 .../instance/remoteURL.st | 0 .../instance/retryTest.st | 0 .../instance/setUp.st | 2 +- .../instance/setUpAdditionalWorkingCopy.st | 0 .../instance/setUpRemote.st | 0 .../instance/setUpRemoteFor..st | 0 .../instance/tearDown.st | 0 .../instance/testMergeGenerated.st | 0 .../instance/testNoCheckoutNeeded.st | 0 .../instance/testOnOwnBranch.st | 0 .../instance/testPushAddsFile.st | 0 .../instance/testPushAddsFileContent.st | 0 .../instance/testPushAddsFileInNewFolder.st | 0 .../instance/testPushAddsFileToTree.st | 0 .../instance/testPushDeletedFile.st | 0 .../instance/testPushImageRegression.st | 0 .../instance/testPushUpdatesFile.st | 0 .../instance/testReadmeExists.st | 0 .../instance/testSetupSuccess.st | 0 .../instance/token..st | 0 .../instance/token.st | 0 .../instance/transferMessaged..st | 0 .../methodProperties.json | 2 +- .../properties.json | 4 ++-- .../README.md | 0 .../instance/commit.st | 0 .../instance/commitDummyFileAddition.st | 0 .../instance/commitMessaged..st | 0 .../instance/createDummyFile.st | 0 .../instance/createDummyImage.st | 0 .../instance/deleteDummyFile.st | 0 .../instance/dummyContents.st | 0 .../instance/dummyContents2.st | 0 .../instance/dummyFile.st | 0 .../instance/dummyFile2.st | 0 .../instance/dummyImage.st | 0 .../instance/dummyImageContents.st | 0 .../instance/gitReference.st | 0 .../instance/makeWorkingCopyAt..st | 0 .../instance/performTest.st | 0 .../instance/reference..st | 0 .../instance/reference.st | 0 .../instance/setUp.st | 0 .../instance/suppressProgressDisplayDuring..st | 0 .../instance/tearDown.st | 0 .../instance/workingCopy..st | 0 .../instance/workingCopy.st | 0 .../instance/write.to.in..st | 0 .../instance/writeToDummyFile..st | 0 .../methodProperties.json | 0 .../properties.json | 2 +- 91 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st delete mode 100644 src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st delete mode 100644 src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json delete mode 100644 src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json delete mode 100644 src/BaselineOfLBGit.package/monticello.meta/categories.st delete mode 100644 src/LBGit-Tests.package/LBGitTestCase.class/README.md rename src/{BaselineOfLBGit.package/BaselineOfLBGit.class => LBGit-Tests.package/SquotFilesBrowserForTests.class}/README.md (100%) rename src/LBGit-Tests.package/{LBGitSquitBrowserForTests.class => SquotFilesBrowserForTests.class}/instance/projectSelection..st (100%) rename src/LBGit-Tests.package/{LBGitSquitBrowserForTests.class => SquotFilesBrowserForTests.class}/instance/projectSelection.st (100%) rename src/LBGit-Tests.package/{LBGitSquitBrowserForTests.class => SquotFilesBrowserForTests.class}/methodProperties.json (100%) rename src/LBGit-Tests.package/{LBGitSquitBrowserForTests.class => SquotFilesBrowserForTests.class}/properties.json (84%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/README.md (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testCommitAddsFile.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testCommitAddsFileContent.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testCommitDeletesFile.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testCommitUpdatesFile.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testInitialTrackedFilesArtifact.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/instance/testSetupSuccess.st (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/methodProperties.json (100%) rename src/LBGit-Tests.package/{LBGitLocalTests.class => SquotFilesLocalTests.class}/properties.json (71%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/README.md (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/branchName.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/browser..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/browser.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/commitOtherMessaged..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/createBranch.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/credentials.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/deleteBranch.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/expectedFailures.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/generateToken.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/initialize.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/otherCommit.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/otherReference.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/otherWorkingCopy..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/otherWorkingCopy.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/performTest.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/pullOther.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/push.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/remainingAttempts..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/remainingAttempts.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/remoteURL.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/retryTest.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/setUp.st (86%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/setUpAdditionalWorkingCopy.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/setUpRemote.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/setUpRemoteFor..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/tearDown.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testMergeGenerated.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testNoCheckoutNeeded.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testOnOwnBranch.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushAddsFile.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushAddsFileContent.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushAddsFileInNewFolder.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushAddsFileToTree.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushDeletedFile.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushImageRegression.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testPushUpdatesFile.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testReadmeExists.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/testSetupSuccess.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/token..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/token.st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/instance/transferMessaged..st (100%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/methodProperties.json (98%) rename src/LBGit-Tests.package/{LBGitRemoteTests.class => SquotFilesRemoteTests.class}/properties.json (77%) rename src/LBGit-Tests.package/{LBGitSquitBrowserForTests.class => SquotFilesTestCase.class}/README.md (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/commit.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/commitDummyFileAddition.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/commitMessaged..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/createDummyFile.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/createDummyImage.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/deleteDummyFile.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyContents.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyContents2.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyFile.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyFile2.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyImage.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/dummyImageContents.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/gitReference.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/makeWorkingCopyAt..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/performTest.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/reference..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/reference.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/setUp.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/suppressProgressDisplayDuring..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/tearDown.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/workingCopy..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/workingCopy.st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/write.to.in..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/instance/writeToDummyFile..st (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/methodProperties.json (100%) rename src/LBGit-Tests.package/{LBGitTestCase.class => SquotFilesTestCase.class}/properties.json (91%) diff --git a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st deleted file mode 100644 index d6c82d606..000000000 --- a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/baseline..st +++ /dev/null @@ -1,13 +0,0 @@ -as yet unclassified -baseline: spec - - spec for: #common do: [ - spec - baseline: 'Squot' with: [spec repository: 'github://hpi-swa/Squot:master/src']; - package: 'LBGit-Core' with: [spec requires: #('Squot')]; - package: 'LBGit-Extensions' with: [spec requires: #('LBGit-Core')]; - package: 'LBGit-Tests' with: [spec requires: #('LBGit-Core' 'LBGit-Extensions')]; - group: 'default' with: #('LBGit-Core' 'LBGit-Extensions'); - group: 'tests' with: #('LBGit-Tests'); - postLoadDoIt: #postLoad - ]. \ No newline at end of file diff --git a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st deleted file mode 100644 index 3ce4c2b99..000000000 --- a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/instance/postLoad.st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -postLoad - - [GitStamp defaultName. - GitStamp defaultEmail] on: GitStampNameRequest do: - [GitStamp defaultName: 'Test User'. - GitStamp defaultEmail: 'test@user.org'.] \ No newline at end of file diff --git a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json deleted file mode 100644 index b9e211f49..000000000 --- a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "baseline:" : "LB 12/4/2018 15:58", - "postLoad" : "LB 12/4/2018 15:49" } } diff --git a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json b/src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json deleted file mode 100644 index 05e9fc2fb..000000000 --- a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "BaselineOfLBGit", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "BaselineOfLBGit", - "pools" : [ - ], - "super" : "BaselineOf", - "type" : "normal" } diff --git a/src/BaselineOfLBGit.package/monticello.meta/categories.st b/src/BaselineOfLBGit.package/monticello.meta/categories.st deleted file mode 100644 index 86c66b517..000000000 --- a/src/BaselineOfLBGit.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #BaselineOfLBGit! diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/README.md b/src/LBGit-Tests.package/LBGitTestCase.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/README.md similarity index 100% rename from src/BaselineOfLBGit.package/BaselineOfLBGit.class/README.md rename to src/LBGit-Tests.package/SquotFilesBrowserForTests.class/README.md diff --git a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection..st similarity index 100% rename from src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection..st rename to src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection..st diff --git a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection.st similarity index 100% rename from src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/instance/projectSelection.st rename to src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection.st diff --git a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/methodProperties.json similarity index 100% rename from src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/methodProperties.json rename to src/LBGit-Tests.package/SquotFilesBrowserForTests.class/methodProperties.json diff --git a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json similarity index 84% rename from src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json rename to src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json index f9393acff..6276a8e2e 100644 --- a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/properties.json +++ b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json @@ -7,7 +7,7 @@ "commentStamp" : "", "instvars" : [ "projectSelection" ], - "name" : "LBGitSquitBrowserForTests", + "name" : "SquotFilesBrowserForTests", "pools" : [ ], "super" : "SquitBrowser", diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/README.md b/src/LBGit-Tests.package/SquotFilesLocalTests.class/README.md similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/README.md rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/README.md diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFile.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFile.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFileContent.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitAddsFileContent.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFileContent.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitDeletesFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitDeletesFile.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitDeletesFile.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitUpdatesFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testCommitUpdatesFile.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitUpdatesFile.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testInitialTrackedFilesArtifact.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testSetupSuccess.st similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/instance/testSetupSuccess.st rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testSetupSuccess.st diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json similarity index 100% rename from src/LBGit-Tests.package/LBGitLocalTests.class/methodProperties.json rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json diff --git a/src/LBGit-Tests.package/LBGitLocalTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json similarity index 71% rename from src/LBGit-Tests.package/LBGitLocalTests.class/properties.json rename to src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json index b172ae7a7..31bfdffe9 100644 --- a/src/LBGit-Tests.package/LBGitLocalTests.class/properties.json +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "LBGitLocalTests", + "name" : "SquotFilesLocalTests", "pools" : [ ], - "super" : "LBGitTestCase", + "super" : "SquotFilesTestCase", "type" : "normal" } diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/README.md b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/README.md similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/README.md rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/README.md diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/branchName.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/branchName.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/branchName.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/browser.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/commitOtherMessaged..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/commitOtherMessaged..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/commitOtherMessaged..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/createBranch.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/createBranch.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/createBranch.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/credentials.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/credentials.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/credentials.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/deleteBranch.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/deleteBranch.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/deleteBranch.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/expectedFailures.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/expectedFailures.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/expectedFailures.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/generateToken.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/generateToken.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/generateToken.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/initialize.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/initialize.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/initialize.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherCommit.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherCommit.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherCommit.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherReference.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherReference.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherReference.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/otherWorkingCopy.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/performTest.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/performTest.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/performTest.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/pullOther.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/pullOther.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/pullOther.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/push.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/push.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/push.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remainingAttempts.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remoteURL.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/remoteURL.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remoteURL.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/retryTest.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/retryTest.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/retryTest.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st similarity index 86% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st index cc5e7f11e..b8f11cdfc 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUp.st +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st @@ -10,4 +10,4 @@ setUp createBranch]. self workingCopy register. self otherWorkingCopy register. - self browser: LBGitSquitBrowserForTests new. \ No newline at end of file + self browser: SquotFilesBrowserForTests new. \ No newline at end of file diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpAdditionalWorkingCopy.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpAdditionalWorkingCopy.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpAdditionalWorkingCopy.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemote.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemoteFor..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/setUpRemoteFor..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemoteFor..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/tearDown.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/tearDown.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/tearDown.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testMergeGenerated.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testMergeGenerated.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testMergeGenerated.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testNoCheckoutNeeded.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testNoCheckoutNeeded.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testNoCheckoutNeeded.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testOnOwnBranch.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testOnOwnBranch.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testOnOwnBranch.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFile.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFile.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileContent.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileContent.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileContent.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileInNewFolder.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileInNewFolder.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileInNewFolder.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileToTree.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushAddsFileToTree.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileToTree.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushDeletedFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushDeletedFile.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushDeletedFile.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushImageRegression.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushImageRegression.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushImageRegression.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushUpdatesFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testPushUpdatesFile.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushUpdatesFile.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testReadmeExists.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testReadmeExists.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testReadmeExists.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testSetupSuccess.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/testSetupSuccess.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testSetupSuccess.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token.st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/token.st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token.st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/transferMessaged..st similarity index 100% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/instance/transferMessaged..st rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/transferMessaged..st diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json similarity index 98% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json index af13e053f..e576ad228 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/methodProperties.json +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json @@ -23,7 +23,7 @@ "remainingAttempts:" : "LB 2/13/2019 16:44", "remoteURL" : "LB 12/8/2018 13:16", "retryTest" : "LB 2/13/2019 16:48", - "setUp" : "LB 12/8/2018 16:12", + "setUp" : "LB 4/28/2019 16:14", "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", "setUpRemote" : "LB 12/8/2018 15:31", "setUpRemoteFor:" : "LB 12/8/2018 16:56", diff --git a/src/LBGit-Tests.package/LBGitRemoteTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json similarity index 77% rename from src/LBGit-Tests.package/LBGitRemoteTests.class/properties.json rename to src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json index 5ad46cad2..a58c1900f 100644 --- a/src/LBGit-Tests.package/LBGitRemoteTests.class/properties.json +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json @@ -10,8 +10,8 @@ "browser", "token", "remainingAttempts" ], - "name" : "LBGitRemoteTests", + "name" : "SquotFilesRemoteTests", "pools" : [ ], - "super" : "LBGitTestCase", + "super" : "SquotFilesTestCase", "type" : "normal" } diff --git a/src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md b/src/LBGit-Tests.package/SquotFilesTestCase.class/README.md similarity index 100% rename from src/LBGit-Tests.package/LBGitSquitBrowserForTests.class/README.md rename to src/LBGit-Tests.package/SquotFilesTestCase.class/README.md diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commit.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/commit.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commit.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitDummyFileAddition.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/commitDummyFileAddition.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitDummyFileAddition.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitMessaged..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/commitMessaged..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitMessaged..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyFile.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyFile.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyImage.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/createDummyImage.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyImage.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/deleteDummyFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/deleteDummyFile.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/deleteDummyFile.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents2.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyContents2.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents2.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile2.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyFile2.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile2.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImage.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImage.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImage.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImageContents.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/dummyImageContents.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImageContents.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/gitReference.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/gitReference.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/gitReference.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/makeWorkingCopyAt..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/makeWorkingCopyAt..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/makeWorkingCopyAt..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/performTest.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/performTest.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/performTest.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/reference..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/reference.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/setUp.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/setUp.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/setUp.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/suppressProgressDisplayDuring..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/suppressProgressDisplayDuring..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/suppressProgressDisplayDuring..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/tearDown.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/tearDown.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/tearDown.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy.st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/workingCopy.st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy.st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/write.to.in..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/write.to.in..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/write.to.in..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/writeToDummyFile..st similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/instance/writeToDummyFile..st rename to src/LBGit-Tests.package/SquotFilesTestCase.class/instance/writeToDummyFile..st diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesTestCase.class/methodProperties.json similarity index 100% rename from src/LBGit-Tests.package/LBGitTestCase.class/methodProperties.json rename to src/LBGit-Tests.package/SquotFilesTestCase.class/methodProperties.json diff --git a/src/LBGit-Tests.package/LBGitTestCase.class/properties.json b/src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json similarity index 91% rename from src/LBGit-Tests.package/LBGitTestCase.class/properties.json rename to src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json index c4689ac80..d79f4d937 100644 --- a/src/LBGit-Tests.package/LBGitTestCase.class/properties.json +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json @@ -9,7 +9,7 @@ "instvars" : [ "workingCopy", "reference" ], - "name" : "LBGitTestCase", + "name" : "SquotFilesTestCase", "pools" : [ ], "super" : "TestCase", From af7b46ecde4cf53fe3f22b2badd7f48950fcd0e7 Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 16:20:04 +0200 Subject: [PATCH 160/170] Fix obsolete class references --- .squot | 4 ++-- .../instance/captureLazySnapshot.st | 2 +- .../SquotFileSystemStore.class/instance/captureSnapshot.st | 2 +- .../SquotFileSystemStore.class/methodProperties.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.squot b/.squot index 45dad35aa..2e20cf4ee 100644 --- a/.squot +++ b/.squot @@ -15,7 +15,7 @@ OrderedDictionary { 'src\/FS-Tests-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-AnsiStreams.package' : #SquotCypressCodeSerializer, 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer, - 'src\/BaselineOfLBGit.package' : #SquotCypressCodeSerializer, 'src\/LBGit-Core.package' : #SquotCypressCodeSerializer, - 'src\/LBGit-Tests.package' : #SquotCypressCodeSerializer + 'src\/LBGit-Tests.package' : #SquotCypressCodeSerializer, + 'src\/BaselineOfLBGit.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st index ea9b14d29..f81ba33e3 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st @@ -14,7 +14,7 @@ captureLazySnapshot thenDo: [:eachArtifact | builder add: eachArtifact. addedPaths add: eachArtifact path. e add: eachArtifact]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + builder add: (unrecordedFiles := SquotTrackedFilesArtifact new rootDirectory: directory; yourself). builder buildSnapshot diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st index e26eef1a0..cf6c081b5 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/captureSnapshot.st @@ -13,7 +13,7 @@ captureSnapshot thenDo: [:eachArtifact | builder add: eachArtifact. addedPaths add: eachArtifact path. e add: eachArtifact]]]. - builder add: (unrecordedFiles := LBGitRecordedFilesArtifact new + builder add: (unrecordedFiles := SquotTrackedFilesArtifact new rootDirectory: directory; yourself). builder buildSnapshot diff --git a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json index fe42105db..4941fc1c6 100644 --- a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json +++ b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json @@ -13,8 +13,8 @@ "artifactReferencesDo:" : "jr 9/23/2018 22:08", "artifacts" : "jr 7/16/2017 02:34", "artifactsDo:" : "jr 5/9/2017 18:00", - "captureLazySnapshot" : "LB 4/28/2019 11:23", - "captureSnapshot" : "LB 4/28/2019 11:23", + "captureLazySnapshot" : "LB 4/28/2019 16:19", + "captureSnapshot" : "LB 4/28/2019 16:19", "capturedArtifacts" : "jr 5/31/2017 17:25", "createLazyArtifactForObjectAt:" : "jr 5/28/2017 14:31", "deserializers" : "jr 1/27/2017 14:33", From 1cba4144f506f1755dbb1b53e7e694c59f7e2dca Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 16:35:28 +0200 Subject: [PATCH 161/170] Fix more obsolete class refs (refactoring tools seem to have failed fully) --- .../SquotImageStore.class/instance/liveArtifactFor.at..st | 2 +- src/Squot.package/SquotImageStore.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st index 0cddbc370..e13c68c9d 100644 --- a/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st +++ b/src/Squot.package/SquotImageStore.class/instance/liveArtifactFor.at..st @@ -2,7 +2,7 @@ private liveArtifactFor: anObject at: aPath aPath = SquotFilesArtifact path ifTrue: - [^ (LBGitLiveFilesArtifact new + [^ (SquotLiveFilesArtifact new objectContainer: self; yourself)]. ^ (SquotLiveArtifact on: anObject at: aPath in: self) diff --git a/src/Squot.package/SquotImageStore.class/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index c76ff6f87..1944f2120 100644 --- a/src/Squot.package/SquotImageStore.class/methodProperties.json +++ b/src/Squot.package/SquotImageStore.class/methodProperties.json @@ -28,7 +28,7 @@ "initialize" : "LB 4/27/2019 19:16", "initializeObjectFrom:" : "jr 7/22/2017 11:59", "initializeTrackedFiles" : "LB 4/28/2019 16:11", - "liveArtifactFor:at:" : "LB 4/28/2019 16:11", + "liveArtifactFor:at:" : "LB 4/28/2019 16:34", "loadOrder" : "jr 8/18/2018 16:21", "loadOrder:" : "jr 9/16/2018 00:20", "materialize:replacing:" : "jr 4/7/2017 16:04", From ed07287079f0111e23e760c6285230f2cf232eae Mon Sep 17 00:00:00 2001 From: LeonBein Date: Sun, 28 Apr 2019 17:01:49 +0200 Subject: [PATCH 162/170] Fix (hopefully) last obsolete class ref --- .../instance/testInitialTrackedFilesArtifact.st | 2 +- .../SquotFilesLocalTests.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st index a36f0366a..8618fbc69 100644 --- a/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st @@ -2,4 +2,4 @@ tests testInitialTrackedFilesArtifact self assert: - (self workingCopy currentSnapshot artifacts anySatisfy: [:each | each isKindOf: LBGitLiveFilesArtifact]). \ No newline at end of file + (self workingCopy currentSnapshot artifacts anySatisfy: [:each | each isKindOf: SquotLiveFilesArtifact]). \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json index ae10f392f..894aaab93 100644 --- a/src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/methodProperties.json @@ -6,5 +6,5 @@ "testCommitAddsFileContent" : "LB 12/4/2018 14:46", "testCommitDeletesFile" : "LB 12/8/2018 13:13", "testCommitUpdatesFile" : "LB 12/8/2018 13:06", - "testInitialTrackedFilesArtifact" : "LB 12/7/2018 17:53", + "testInitialTrackedFilesArtifact" : "LB 4/28/2019 17:00", "testSetupSuccess" : "LB 12/8/2018 15:40" } } From 18b0c0e1d9a2e1fcc9ce5e65789b92383565b66a Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 28 Apr 2019 19:24:51 +0200 Subject: [PATCH 163/170] file list diff now uses right path --- .../SquotFileListDiff.class/instance/asDiffTree.st | 2 +- .../SquotFileListDiff.class/instance/path.st | 2 +- .../SquotFileListDiff.class/methodProperties.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st index 934b4d709..14ac8e984 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st @@ -2,7 +2,7 @@ as yet unclassified asDiffTree ^ SquotDiffNode - title: SquotFilesArtifact path + title: self path content: self children: self topNodes onInclude: [] diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st index a6af6b0fa..d8861dbe7 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st @@ -1,4 +1,4 @@ as yet unclassified path - ^ '' \ No newline at end of file + ^ SquotFilesArtifact path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index 57e65c319..f28f19a90 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -7,7 +7,7 @@ "added:" : "LB 11/22/2018 11:17", "applyToContainer:" : "LB 11/26/2018 16:06", "asConflicts" : "LB 4/27/2019 15:49", - "asDiffTree" : "LB 4/28/2019 16:11", + "asDiffTree" : "LB 4/28/2019 19:24", "createDiffs" : "LB 11/23/2018 15:20", "createFile:" : "LB 3/1/2019 15:57", "deleteFile:" : "LB 11/25/2018 15:55", @@ -33,7 +33,7 @@ "modified" : "LB 11/23/2018 13:28", "modified:" : "LB 11/23/2018 13:28", "originalOrAddedArtifact" : "LB 11/22/2018 15:53", - "path" : "LB 11/22/2018 16:36", + "path" : "LB 4/28/2019 19:22", "privateAsConflicts" : "LB 4/28/2019 16:09", "removed" : "LB 11/22/2018 11:17", "removed:" : "LB 11/22/2018 11:17", From d1d4ec6dabad46c797b47acc00766d3ebf8705ae Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 5 May 2019 12:10:08 +0200 Subject: [PATCH 164/170] Added choice to file conflicts --- .../SquotFileConflict.class/instance/applyWith..st | 2 +- .../SquotFileConflict.class/instance/asDiffNode.st | 6 +++--- .../SquotFileConflict.class/instance/choice..st | 4 ++++ .../SquotFileConflict.class/instance/choice.st | 3 +-- .../SquotFileConflict.class/instance/chooseLeft.st | 4 ++++ .../SquotFileConflict.class/instance/chooseRight.st | 4 ++++ .../SquotFileConflict.class/instance/isConflict.st | 2 +- .../SquotFileConflict.class/instance/resetChoice.st | 4 ++++ .../SquotFileConflict.class/methodProperties.json | 12 ++++++++---- .../SquotFileConflict.class/properties.json | 3 ++- 10 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st index 3b2cd8b73..1fd6ba618 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st @@ -1,4 +1,4 @@ as yet unclassified applyWith: aFileListDiff - "A conflict cannot be applied" + "A conflict cannot be applied - but the diff that has been chosen can" self choice applyWith: aFileListDiff \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st index bd88eec92..275cb3aa2 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st @@ -5,6 +5,6 @@ asDiffNode title: self title content: self children: #() - onInclude: [] - onExclude: [] - onReset: [] \ No newline at end of file + onInclude: [self chooseRight] + onExclude: [self chooseLeft] + onReset: [self resetChoice] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st new file mode 100644 index 000000000..81dbf70fd --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st @@ -0,0 +1,4 @@ +accessing +choice: anObject + + choice := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st index 11b5b9b9a..84e6e9f6b 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st @@ -1,5 +1,4 @@ as yet unclassified choice - self flag: #TODO. - ^ self rightChange \ No newline at end of file + ^ choice "leftChange, rightChange or nil" \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st new file mode 100644 index 000000000..6f8234547 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st @@ -0,0 +1,4 @@ +as yet unclassified +chooseLeft + + ^ self choice: self leftChange \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st new file mode 100644 index 000000000..1ba5d4125 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st @@ -0,0 +1,4 @@ +as yet unclassified +chooseRight + + ^ self choice: self rightChange \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st index 492420ec8..afc7c0add 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st @@ -1,4 +1,4 @@ as yet unclassified isConflict - ^ true \ No newline at end of file + ^ self choice = nil \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st new file mode 100644 index 000000000..7d3f9e6ce --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st @@ -0,0 +1,4 @@ +as yet unclassified +resetChoice + + self choice: nil. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json index 6a281308a..665e267a5 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json @@ -2,13 +2,17 @@ "class" : { "left:right:" : "LB 11/25/2018 16:22" }, "instance" : { - "applyWith:" : "LB 11/25/2018 16:47", - "asDiffNode" : "LB 3/10/2019 17:01", + "applyWith:" : "LB 5/5/2019 12:05", + "asDiffNode" : "LB 5/5/2019 12:07", "body" : "LB 11/25/2018 16:35", - "choice" : "LB 11/25/2018 16:47", - "isConflict" : "LB 12/8/2018 14:17", + "choice" : "LB 5/5/2019 12:07", + "choice:" : "LB 5/5/2019 12:04", + "chooseLeft" : "LB 5/5/2019 12:05", + "chooseRight" : "LB 5/5/2019 12:05", + "isConflict" : "LB 5/5/2019 12:07", "leftChange" : "LB 11/25/2018 16:22", "leftChange:" : "LB 11/25/2018 16:22", + "resetChoice" : "LB 5/5/2019 12:06", "rightChange" : "LB 11/25/2018 16:22", "rightChange:" : "LB 11/25/2018 16:22", "title" : "LB 11/25/2018 16:20" } } diff --git a/src/LBGit-Core.package/SquotFileConflict.class/properties.json b/src/LBGit-Core.package/SquotFileConflict.class/properties.json index 2fd96d14a..80e6d0128 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/properties.json +++ b/src/LBGit-Core.package/SquotFileConflict.class/properties.json @@ -7,7 +7,8 @@ "commentStamp" : "", "instvars" : [ "leftChange", - "rightChange" ], + "rightChange", + "choice" ], "name" : "SquotFileConflict", "pools" : [ ], From df3cc88032c84aac336550f1b602ecc4315cd398 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 5 May 2019 12:24:29 +0200 Subject: [PATCH 165/170] Added include/exclude behavior to all file diffs; tweaked conflict behavior --- .../SquotFileConflict.class/instance/applyWith..st | 4 ++-- .../SquotFileConflict.class/instance/asDiffNode.st | 6 +++--- .../SquotFileConflict.class/instance/choice..st | 4 ---- .../SquotFileConflict.class/instance/choice.st | 4 ---- .../SquotFileConflict.class/instance/chooseLeft.st | 4 ---- .../instance/chooseRight.st | 4 ---- .../SquotFileConflict.class/instance/excludeIn..st | 5 +++++ .../SquotFileConflict.class/instance/includeIn..st | 5 +++++ .../SquotFileConflict.class/instance/isConflict.st | 2 +- .../instance/resetChoice.st | 4 ---- .../SquotFileConflict.class/instance/resetIn..st | 6 ++++++ .../SquotFileConflict.class/methodProperties.json | 14 ++++++-------- .../SquotFileConflict.class/properties.json | 3 +-- .../SquotFileDiff.class/instance/excludeIn..st | 4 ++++ .../SquotFileDiff.class/instance/includeIn..st | 4 ++++ .../SquotFileDiff.class/instance/resetIn..st | 4 ++++ .../SquotFileDiff.class/methodProperties.json | 3 +++ .../SquotFileListDiff.class/instance/topNodes.st | 6 +++++- .../SquotFileListDiff.class/methodProperties.json | 2 +- 19 files changed, 50 insertions(+), 38 deletions(-) delete mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st delete mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st delete mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st delete mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st delete mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st create mode 100644 src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st create mode 100644 src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st create mode 100644 src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st create mode 100644 src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st index 1fd6ba618..616733936 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st @@ -1,4 +1,4 @@ as yet unclassified applyWith: aFileListDiff - "A conflict cannot be applied - but the diff that has been chosen can" - self choice applyWith: aFileListDiff \ No newline at end of file + "A conflict cannot be applied - only the diff that has been chosen can" + self error: 'Conflict must be resolved first'. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st index 275cb3aa2..bd88eec92 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st @@ -5,6 +5,6 @@ asDiffNode title: self title content: self children: #() - onInclude: [self chooseRight] - onExclude: [self chooseLeft] - onReset: [self resetChoice] \ No newline at end of file + onInclude: [] + onExclude: [] + onReset: [] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st deleted file mode 100644 index 81dbf70fd..000000000 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -choice: anObject - - choice := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st deleted file mode 100644 index 84e6e9f6b..000000000 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/choice.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -choice - - ^ choice "leftChange, rightChange or nil" \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st deleted file mode 100644 index 6f8234547..000000000 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseLeft.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -chooseLeft - - ^ self choice: self leftChange \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st deleted file mode 100644 index 1ba5d4125..000000000 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/chooseRight.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -chooseRight - - ^ self choice: self rightChange \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st new file mode 100644 index 000000000..6ef001c8f --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st @@ -0,0 +1,5 @@ +as yet unclassified +excludeIn: aSquotFileListDiff + + super excludeIn: aSquotFileListDiff. + self leftChange includeIn: aSquotFileListDiff. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st new file mode 100644 index 000000000..fa1045e42 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st @@ -0,0 +1,5 @@ +as yet unclassified +includeIn: aSquotFileListDiff + + super excludeIn: aSquotFileListDiff. + self rightChange includeIn: aSquotFileListDiff. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st index afc7c0add..492420ec8 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st @@ -1,4 +1,4 @@ as yet unclassified isConflict - ^ self choice = nil \ No newline at end of file + ^ true \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st deleted file mode 100644 index 7d3f9e6ce..000000000 --- a/src/LBGit-Core.package/SquotFileConflict.class/instance/resetChoice.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -resetChoice - - self choice: nil. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st new file mode 100644 index 000000000..60d3411ba --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st @@ -0,0 +1,6 @@ +as yet unclassified +resetIn: aSquotFileListDiff + + self leftChange excludeIn: aSquotFileListDiff. + self rightChange excludeIn: aSquotFileListDiff. + super includeIn: aSquotFileListDiff. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json index 665e267a5..3eb2afd78 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json @@ -2,17 +2,15 @@ "class" : { "left:right:" : "LB 11/25/2018 16:22" }, "instance" : { - "applyWith:" : "LB 5/5/2019 12:05", - "asDiffNode" : "LB 5/5/2019 12:07", + "applyWith:" : "LB 5/5/2019 12:21", + "asDiffNode" : "LB 5/5/2019 12:16", "body" : "LB 11/25/2018 16:35", - "choice" : "LB 5/5/2019 12:07", - "choice:" : "LB 5/5/2019 12:04", - "chooseLeft" : "LB 5/5/2019 12:05", - "chooseRight" : "LB 5/5/2019 12:05", - "isConflict" : "LB 5/5/2019 12:07", + "excludeIn:" : "LB 5/5/2019 12:17", + "includeIn:" : "LB 5/5/2019 12:17", + "isConflict" : "LB 5/5/2019 12:16", "leftChange" : "LB 11/25/2018 16:22", "leftChange:" : "LB 11/25/2018 16:22", - "resetChoice" : "LB 5/5/2019 12:06", + "resetIn:" : "LB 5/5/2019 12:18", "rightChange" : "LB 11/25/2018 16:22", "rightChange:" : "LB 11/25/2018 16:22", "title" : "LB 11/25/2018 16:20" } } diff --git a/src/LBGit-Core.package/SquotFileConflict.class/properties.json b/src/LBGit-Core.package/SquotFileConflict.class/properties.json index 80e6d0128..2fd96d14a 100644 --- a/src/LBGit-Core.package/SquotFileConflict.class/properties.json +++ b/src/LBGit-Core.package/SquotFileConflict.class/properties.json @@ -7,8 +7,7 @@ "commentStamp" : "", "instvars" : [ "leftChange", - "rightChange", - "choice" ], + "rightChange" ], "name" : "SquotFileConflict", "pools" : [ ], diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st new file mode 100644 index 000000000..5b1b9f587 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st @@ -0,0 +1,4 @@ +as yet unclassified +excludeIn: aSquotFileListDiff + + aSquotFileListDiff diffs remove: self. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st new file mode 100644 index 000000000..93492a34a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st @@ -0,0 +1,4 @@ +as yet unclassified +includeIn: aSquotFileListDiff + + aSquotFileListDiff diffs add: self. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st new file mode 100644 index 000000000..dc666d7c8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st @@ -0,0 +1,4 @@ +as yet unclassified +resetIn: aSquotFileListDiff + + "Per default, reset is needed only for conflicts" \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json index 5f5a852c7..1741934a6 100644 --- a/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json @@ -9,11 +9,14 @@ "before" : "LB 4/28/2019 12:23", "body" : "LB 11/23/2018 18:37", "contentsOf:" : "LB 4/28/2019 12:22", + "excludeIn:" : "LB 5/5/2019 12:14", + "includeIn:" : "LB 5/5/2019 12:14", "isConflict" : "LB 12/8/2018 14:17", "mergeWith:" : "LB 4/28/2019 16:09", "parent" : "LB 11/23/2018 18:42", "parent:" : "LB 11/23/2018 18:42", "path" : "LB 11/23/2018 18:51", "path:" : "LB 11/23/2018 18:51", + "resetIn:" : "LB 5/5/2019 12:15", "squotChangeAsStringOrText" : "LB 11/23/2018 19:03", "title" : "LB 11/23/2018 18:34" } } diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st index 57a90c0ec..ed6cfe595 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st @@ -1,4 +1,8 @@ as yet unclassified topNodes - ^ self diffs collect: [:each | each asDiffNode] \ No newline at end of file + ^ self diffs collect: [:each | each asDiffNode + includeBlock: [each includeIn: self]; + excludeBlock: [each excludeIn: self]; + resetBlock: [each resetIn: self]; + yourself] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index f28f19a90..c3058d297 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -48,7 +48,7 @@ "target" : "LB 11/25/2018 15:53", "target:" : "LB 11/25/2018 15:53", "targetReferenceOn:" : "LB 11/25/2018 16:46", - "topNodes" : "LB 11/23/2018 15:22", + "topNodes" : "LB 5/5/2019 12:14", "updateFile:" : "LB 11/23/2018 18:56", "workingDirectory" : "LB 12/13/2018 17:01", "workingReferenceOn:" : "LB 2/13/2019 14:04" } } From c0eed3ca47e8c9a765aa6abd563cf985d8d673b8 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 5 May 2019 15:08:42 +0200 Subject: [PATCH 166/170] Changed diff dispatch => no nasty typechecking anymore --- .../SquotFileDiff.class/instance/applyTo..st | 4 ---- .../SquotFileDiff.class/instance/printOn..st | 5 +++++ .../SquotFileDiff.class/methodProperties.json | 2 +- .../SquotFileListDiff.class/instance/applyTo..st | 4 ++++ .../instance/applyToContainer..st | 7 ++----- .../instance/applyToLoaded..st | 4 ++++ .../instance/applyToTarget..st | 5 +++++ .../instance/targetReferenceOn..st | 2 +- .../SquotFileListDiff.class/methodProperties.json | 7 +++++-- .../instance/copyWithDiffApplied..st | 5 +++++ .../SquotFilesArtifact.class/methodProperties.json | 1 + .../instance/setUpRemote.st | 12 ------------ .../methodProperties.json | 1 - .../instance/applyDiff.toObjectAt..st | 2 ++ .../SquotFileSystemStore.class/methodProperties.json | 2 +- 15 files changed, 36 insertions(+), 27 deletions(-) delete mode 100644 src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st create mode 100644 src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st create mode 100644 src/LBGit-Core.package/SquotFileListDiff.class/instance/applyTo..st create mode 100644 src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToLoaded..st create mode 100644 src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToTarget..st create mode 100644 src/LBGit-Core.package/SquotFilesArtifact.class/instance/copyWithDiffApplied..st delete mode 100644 src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st deleted file mode 100644 index 01c58adea..000000000 --- a/src/LBGit-Core.package/SquotFileDiff.class/instance/applyTo..st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -applyTo: anObjectContainer - - ^ self subclassResponsibility \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st new file mode 100644 index 000000000..0506aacda --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st @@ -0,0 +1,5 @@ +as yet unclassified +printOn: aStream + + super printOn: aStream. + aStream nextPutAll: '(''', self path, ''')'. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json index 1741934a6..dcf4691dd 100644 --- a/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json @@ -3,7 +3,6 @@ }, "instance" : { "after" : "LB 4/28/2019 12:23", - "applyTo:" : "LB 11/25/2018 16:37", "applyWith:" : "LB 11/25/2018 16:39", "asDiffNode" : "LB 3/10/2019 17:01", "before" : "LB 4/28/2019 12:23", @@ -17,6 +16,7 @@ "parent:" : "LB 11/23/2018 18:42", "path" : "LB 11/23/2018 18:51", "path:" : "LB 11/23/2018 18:51", + "printOn:" : "LB 5/5/2019 14:31", "resetIn:" : "LB 5/5/2019 12:15", "squotChangeAsStringOrText" : "LB 11/23/2018 19:03", "title" : "LB 11/23/2018 18:34" } } diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyTo..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyTo..st new file mode 100644 index 000000000..5b32aeed7 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyTo..st @@ -0,0 +1,4 @@ +applying +applyTo: aSquotFileSystemStore + + self applyToTarget: aSquotFileSystemStore directory. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st index a49c0c5f5..8e3bf8ad8 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st @@ -1,8 +1,5 @@ applying applyToContainer: anObjectContainer - self target: ((anObjectContainer class canUnderstand: #directory) - ifTrue: [anObjectContainer directory] - ifFalse: [self workingDirectory]). - - self diffs do: [:each | each applyWith: self]. \ No newline at end of file + self hasChanges ifFalse: [^ nil]. + ^ anObjectContainer applyDiff: self toObjectAt: self path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToLoaded..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToLoaded..st new file mode 100644 index 000000000..58318bafb --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToLoaded..st @@ -0,0 +1,4 @@ +applying +applyToLoaded: unknown + + self applyToTarget: self workingDirectory. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToTarget..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToTarget..st new file mode 100644 index 000000000..6abf0c2f2 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToTarget..st @@ -0,0 +1,5 @@ +applying +applyToTarget: aReference + + self target: aReference. + self diffs do: [:each | each applyWith: self]. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st index bda1615a6..6b439966a 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st @@ -2,5 +2,5 @@ applying targetReferenceOn: aPath ^ self target - ifNil: [self left rootDirectory resolve: aPath] + ifNil: [self isThisEverCalled: 'targetreferenc but target is nil'. self left rootDirectory resolve: aPath] ifNotNil: [self target resolve: aPath] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index c3058d297..93f30f895 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -5,7 +5,10 @@ "instance" : { "added" : "LB 11/22/2018 11:17", "added:" : "LB 11/22/2018 11:17", - "applyToContainer:" : "LB 11/26/2018 16:06", + "applyTo:" : "LB 5/5/2019 13:18", + "applyToContainer:" : "LB 5/5/2019 14:59", + "applyToLoaded:" : "LB 5/5/2019 13:19", + "applyToTarget:" : "LB 5/5/2019 13:17", "asConflicts" : "LB 4/27/2019 15:49", "asDiffTree" : "LB 4/28/2019 19:24", "createDiffs" : "LB 11/23/2018 15:20", @@ -47,7 +50,7 @@ "storeInfo" : "LB 12/7/2018 18:27", "target" : "LB 11/25/2018 15:53", "target:" : "LB 11/25/2018 15:53", - "targetReferenceOn:" : "LB 11/25/2018 16:46", + "targetReferenceOn:" : "LB 5/5/2019 13:16", "topNodes" : "LB 5/5/2019 12:14", "updateFile:" : "LB 11/23/2018 18:56", "workingDirectory" : "LB 12/13/2018 17:01", diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/copyWithDiffApplied..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/copyWithDiffApplied..st new file mode 100644 index 000000000..67731f078 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/copyWithDiffApplied..st @@ -0,0 +1,5 @@ +as yet unclassified +copyWithDiffApplied: aSquotFileListDiff + + aSquotFileListDiff applyToLoaded: aSquotFileListDiff right. + ^ aSquotFileListDiff right \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json index 01e0468d5..1eaefff9e 100644 --- a/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json @@ -5,6 +5,7 @@ "=" : "LB 4/28/2019 13:58", "capture" : "LB 4/27/2019 19:43", "collectTrackedFiles" : "LB 11/25/2018 13:34", + "copyWithDiffApplied:" : "LB 5/5/2019 13:57", "diffAgainst:" : "LB 4/28/2019 16:10", "diffContentAgainstThatOf:" : "LB 4/28/2019 13:43", "displayText" : "LB 11/26/2018 16:25", diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st deleted file mode 100644 index a5a8a8a0d..000000000 --- a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemote.st +++ /dev/null @@ -1,12 +0,0 @@ -running -setUpRemote - - | testsBranch newBranch gitRepository | - gitRepository := self workingCopy repository gitRepository. - self workingCopy repository cloneFrom: self remoteURL. - newBranch := self workingCopy repository historianNamed: self branchName. - testsBranch := self workingCopy repository historianNamed: 'tests'. - newBranch version: testsBranch version. - self workingCopy switchTo: newBranch. - gitRepository repository setUpstreamRemoteOfBranchNamed: self branchName to: 'origin'. - gitRepository repository setUpstreamRefOfBranchNamed: self branchName to: (gitRepository expandRemoteRef: self branchName). \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json index e576ad228..255eba29f 100644 --- a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json @@ -25,7 +25,6 @@ "retryTest" : "LB 2/13/2019 16:48", "setUp" : "LB 4/28/2019 16:14", "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", - "setUpRemote" : "LB 12/8/2018 15:31", "setUpRemoteFor:" : "LB 12/8/2018 16:56", "tearDown" : "LB 12/8/2018 17:35", "testMergeGenerated" : "LB 2/13/2019 15:10", diff --git a/src/Squot.package/SquotFileSystemStore.class/instance/applyDiff.toObjectAt..st b/src/Squot.package/SquotFileSystemStore.class/instance/applyDiff.toObjectAt..st index 7f1787581..62bb6c5b3 100644 --- a/src/Squot.package/SquotFileSystemStore.class/instance/applyDiff.toObjectAt..st +++ b/src/Squot.package/SquotFileSystemStore.class/instance/applyDiff.toObjectAt..st @@ -1,6 +1,8 @@ patching applyDiff: aDiff toObjectAt: path | reference updatedArtifact | + path = SquotFilesArtifact path + ifTrue: [^ aDiff applyTo: self]. reference := directory resolve: path. reference exists ifFalse: [self error: 'Attempt to patch non-existent files']. self flag: #optimize. "avoid patching an artifact if the serializer supports writing a diff directly" diff --git a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json index 4941fc1c6..0308ab912 100644 --- a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json +++ b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json @@ -8,7 +8,7 @@ "instance" : { "/" : "jr 1/27/2017 15:07", "add:" : "jr 10/2/2017 23:27", - "applyDiff:toObjectAt:" : "jr 10/2/2017 21:56", + "applyDiff:toObjectAt:" : "LB 5/5/2019 13:21", "applyPatch:" : "jr 10/3/2017 00:49", "artifactReferencesDo:" : "jr 9/23/2018 22:08", "artifacts" : "jr 7/16/2017 02:34", From 4d9a794919fb4a9e81a5538d639d12fb6b65e32e Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 5 May 2019 15:14:04 +0200 Subject: [PATCH 167/170] Trying to apply a file addition without existing file now throws an error. --- .../SquotFileListDiff.class/instance/createFile..st | 3 ++- .../SquotFileListDiff.class/methodProperties.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st index 324f11d4b..da9a753e0 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st @@ -3,6 +3,7 @@ createFile: aPath | sourceReference targetReference | sourceReference := self sourceReferenceOn: aPath. - sourceReference exists ifFalse: [^ self]. + sourceReference exists + ifFalse: [self error: 'Trying to apply a file addition of ''', aPath, ''' but file not existent in addition source']. targetReference := self targetReferenceOn: aPath. sourceReference copyTo: targetReference. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index 93f30f895..f6ee4b246 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -12,7 +12,7 @@ "asConflicts" : "LB 4/27/2019 15:49", "asDiffTree" : "LB 4/28/2019 19:24", "createDiffs" : "LB 11/23/2018 15:20", - "createFile:" : "LB 3/1/2019 15:57", + "createFile:" : "LB 5/5/2019 15:12", "deleteFile:" : "LB 11/25/2018 15:55", "diff:against:" : "LB 11/26/2018 16:06", "diffAdded" : "LB 4/28/2019 16:09", From feb3187fd10a6d9d01394b556f2a83f91a3720b2 Mon Sep 17 00:00:00 2001 From: Leon Bein Date: Sun, 5 May 2019 15:17:54 +0200 Subject: [PATCH 168/170] Deleted unused method --- .../SquotFileListDiff.class/instance/workingReferenceOn..st | 6 ------ .../SquotFileListDiff.class/methodProperties.json | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st deleted file mode 100644 index b60611903..000000000 --- a/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingReferenceOn..st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -workingReferenceOn: aPath - - | workingReference | - workingReference := self left rootDirectory fileSystem repository repository instVarNamed: #reference. - ^ workingReference resolve: aPath \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json index f6ee4b246..18c32f204 100644 --- a/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -53,5 +53,4 @@ "targetReferenceOn:" : "LB 5/5/2019 13:16", "topNodes" : "LB 5/5/2019 12:14", "updateFile:" : "LB 11/23/2018 18:56", - "workingDirectory" : "LB 12/13/2018 17:01", - "workingReferenceOn:" : "LB 2/13/2019 14:04" } } + "workingDirectory" : "LB 12/13/2018 17:01" } } From edb0cf4b6ab2ed1b37f33d1f3fa49a85c46fc2b1 Mon Sep 17 00:00:00 2001 From: Jakob Reschke Date: Sun, 5 May 2019 18:24:52 +0200 Subject: [PATCH 169/170] Remove unused SquotFileArtifact and SquotUnacquaintedFileVisitor They would only cause confusion with the new classes for tracking files. That test for the image store might be misleading. It actually tests that things that are not #isLoadable are not added to the store. --- .squot | 1 - .../SquotFileArtifact.class/README.md | 6 ------ .../SquotFileArtifact.class/class/for..st | 5 ----- .../SquotFileArtifact.class/instance/^equals.st | 6 ------ .../instance/content..st | 4 ---- .../SquotFileArtifact.class/instance/content.st | 3 --- .../instance/fileReference..st | 4 ---- .../instance/fileReference.st | 4 ---- .../SquotFileArtifact.class/instance/hash.st | 3 --- .../instance/isLoadable.st | 3 --- .../instance/materializeWith.replacing..st | 6 ------ .../instance/printOn..st | 6 ------ .../instance/squotSummaryText.st | 3 --- .../instance/storeWith..st | 4 ---- .../instance/wantsToBeInTableOfContents.st | 4 ---- .../instance/writeWith..st | 4 ---- .../methodProperties.json | 17 ----------------- .../SquotFileArtifact.class/properties.json | 14 -------------- .../instance/testFiles.st | 14 +++++--------- .../methodProperties.json | 2 +- .../README.md | 0 .../class/on.ignoring.addingTo..st | 7 ------- .../instance/fileStore..st | 4 ---- .../instance/fileStore.st | 4 ---- .../instance/ignoredPaths..st | 6 ------ .../instance/ignoredPaths.st | 4 ---- .../instance/snapshotBuilder..st | 4 ---- .../instance/snapshotBuilder.st | 4 ---- .../instance/visit..st | 5 ----- .../instance/visitDirectory..st | 4 ---- .../instance/visitFile..st | 6 ------ .../methodProperties.json | 13 ------------- .../properties.json | 16 ---------------- 33 files changed, 6 insertions(+), 184 deletions(-) delete mode 100644 src/Squot.package/SquotFileArtifact.class/README.md delete mode 100644 src/Squot.package/SquotFileArtifact.class/class/for..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/^equals.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/content..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/content.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/fileReference..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/fileReference.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/hash.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/isLoadable.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/materializeWith.replacing..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/printOn..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/squotSummaryText.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/storeWith..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/wantsToBeInTableOfContents.st delete mode 100644 src/Squot.package/SquotFileArtifact.class/instance/writeWith..st delete mode 100644 src/Squot.package/SquotFileArtifact.class/methodProperties.json delete mode 100644 src/Squot.package/SquotFileArtifact.class/properties.json delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/README.md delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/class/on.ignoring.addingTo..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore.st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths.st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder.st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visit..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitDirectory..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitFile..st delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/methodProperties.json delete mode 100644 src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json diff --git a/.squot b/.squot index 2e20cf4ee..5b19d38d5 100644 --- a/.squot +++ b/.squot @@ -1,7 +1,6 @@ OrderedDictionary { 'src\/VersionControl.package' : #SquotCypressCodeSerializer, 'src\/Pharo-compatibility.package' : #SquotCypressCodeSerializer, - 'src\/FS-Core.package' : #SquotCypressCodeSerializer, 'src\/FS-Memory.package' : #SquotCypressCodeSerializer, 'src\/FS-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-AnsiStreams.package' : #SquotCypressCodeSerializer, diff --git a/src/Squot.package/SquotFileArtifact.class/README.md b/src/Squot.package/SquotFileArtifact.class/README.md deleted file mode 100644 index 997b74ee5..000000000 --- a/src/Squot.package/SquotFileArtifact.class/README.md +++ /dev/null @@ -1,6 +0,0 @@ -I am an Artifact for a file that is not explicitly tracked by Squot. It could be a resource in the repository or metadata. - -Because I do not store the content but only keep a reference to the file, you must be careful when you work with me. My file's content might be changed by operations on a repository or working copy, or by other programs. - -Instance Variables - fileReference: \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/class/for..st b/src/Squot.package/SquotFileArtifact.class/class/for..st deleted file mode 100644 index e5cf2952d..000000000 --- a/src/Squot.package/SquotFileArtifact.class/class/for..st +++ /dev/null @@ -1,5 +0,0 @@ -instance creation -for: aFileReference - ^ self new - fileReference: aFileReference; - yourself \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/^equals.st b/src/Squot.package/SquotFileArtifact.class/instance/^equals.st deleted file mode 100644 index d57377acf..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/^equals.st +++ /dev/null @@ -1,6 +0,0 @@ -comparing -= anotherObject - self species = anotherObject species - ifFalse: [^ super = anotherObject]. - ^ fileReference = anotherObject fileReference - \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/content..st b/src/Squot.package/SquotFileArtifact.class/instance/content..st deleted file mode 100644 index 2a106f0cf..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/content..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -content: anObject - self shouldNotImplement. - "maybe I should, but let's be sure of the use case first" \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/content.st b/src/Squot.package/SquotFileArtifact.class/instance/content.st deleted file mode 100644 index a5048ce7b..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/content.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -content - ^ fileReference readStreamDo: [:stream | stream contents] \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/fileReference..st b/src/Squot.package/SquotFileArtifact.class/instance/fileReference..st deleted file mode 100644 index 37cb39c6b..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/fileReference..st +++ /dev/null @@ -1,4 +0,0 @@ -initialize-release -fileReference: anObject - - fileReference := anObject \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/fileReference.st b/src/Squot.package/SquotFileArtifact.class/instance/fileReference.st deleted file mode 100644 index 6439b4bfe..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/fileReference.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileReference - - ^ fileReference \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/hash.st b/src/Squot.package/SquotFileArtifact.class/instance/hash.st deleted file mode 100644 index 76a10e96c..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/hash.st +++ /dev/null @@ -1,3 +0,0 @@ -comparing -hash - ^ (fileReference hash hashMultiply bitXor: self species hash) hashMultiply \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/isLoadable.st b/src/Squot.package/SquotFileArtifact.class/instance/isLoadable.st deleted file mode 100644 index 86d6ffa9c..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/isLoadable.st +++ /dev/null @@ -1,3 +0,0 @@ -loading -isLoadable - ^ false "for now" \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/materializeWith.replacing..st b/src/Squot.package/SquotFileArtifact.class/instance/materializeWith.replacing..st deleted file mode 100644 index 77fc1668f..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/materializeWith.replacing..st +++ /dev/null @@ -1,6 +0,0 @@ -loading -materializeWith: imageStore replacing: anObject - "Answer myself as the object in the image." - self flag: 'Another possiblity would be to place the fileReference in the image'. - self assert: (anObject isNil or: [anObject species = self species]). - ^ self "do not invoke the store's loading facilities, we do not want to destroy snapshots etc." \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/printOn..st b/src/Squot.package/SquotFileArtifact.class/instance/printOn..st deleted file mode 100644 index 7247ac5ad..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/printOn..st +++ /dev/null @@ -1,6 +0,0 @@ -printing -printOn: aStream - super printOn: aStream. - aStream nextPut: $(; - print: fileReference; - nextPut: $). \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/squotSummaryText.st b/src/Squot.package/SquotFileArtifact.class/instance/squotSummaryText.st deleted file mode 100644 index 9f07d413a..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/squotSummaryText.st +++ /dev/null @@ -1,3 +0,0 @@ -tools -squotSummaryText - ^ self content \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/storeWith..st b/src/Squot.package/SquotFileArtifact.class/instance/storeWith..st deleted file mode 100644 index 85dbf1f6a..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/storeWith..st +++ /dev/null @@ -1,4 +0,0 @@ -serializing -storeWith: aStore - "double dispatch" - ^ aStore storeFile: self \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/wantsToBeInTableOfContents.st b/src/Squot.package/SquotFileArtifact.class/instance/wantsToBeInTableOfContents.st deleted file mode 100644 index b67accbe9..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/wantsToBeInTableOfContents.st +++ /dev/null @@ -1,4 +0,0 @@ -serializing -wantsToBeInTableOfContents - "Stray files are not in the table of contents, otherwise they would be ordinary Artifacts." - ^ false \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/instance/writeWith..st b/src/Squot.package/SquotFileArtifact.class/instance/writeWith..st deleted file mode 100644 index 8970d8f31..000000000 --- a/src/Squot.package/SquotFileArtifact.class/instance/writeWith..st +++ /dev/null @@ -1,4 +0,0 @@ -serializing -writeWith: aSerializer - "I already am a file, no need to serialize me again." - self shouldNotImplement \ No newline at end of file diff --git a/src/Squot.package/SquotFileArtifact.class/methodProperties.json b/src/Squot.package/SquotFileArtifact.class/methodProperties.json deleted file mode 100644 index 982b91f23..000000000 --- a/src/Squot.package/SquotFileArtifact.class/methodProperties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "class" : { - "for:" : "jr 1/31/2017 11:54" }, - "instance" : { - "=" : "jr 1/31/2017 14:14", - "content" : "jr 1/31/2017 11:56", - "content:" : "jr 1/31/2017 11:57", - "fileReference" : "jr 1/31/2017 11:55", - "fileReference:" : "jr 1/31/2017 11:55", - "hash" : "jr 3/7/2017 00:58", - "isLoadable" : "jr 3/8/2017 16:16", - "materializeWith:replacing:" : "jr 5/31/2017 16:37", - "printOn:" : "jr 1/31/2017 14:45", - "squotSummaryText" : "jr 11/17/2018 22:29", - "storeWith:" : "jr 1/31/2017 13:54", - "wantsToBeInTableOfContents" : "jr 1/31/2017 13:36", - "writeWith:" : "jr 1/31/2017 14:10" } } diff --git a/src/Squot.package/SquotFileArtifact.class/properties.json b/src/Squot.package/SquotFileArtifact.class/properties.json deleted file mode 100644 index dae46b29c..000000000 --- a/src/Squot.package/SquotFileArtifact.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "Squot-FileSystemStore", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "jr 3/17/2018 19:21", - "instvars" : [ - "fileReference" ], - "name" : "SquotFileArtifact", - "pools" : [ - ], - "super" : "SquotArtifact", - "type" : "normal" } diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/testFiles.st b/src/Squot.package/SquotImageStoreTest.class/instance/testFiles.st index 4eb993d53..9ca270809 100644 --- a/src/Squot.package/SquotImageStoreTest.class/instance/testFiles.st +++ b/src/Squot.package/SquotImageStoreTest.class/instance/testFiles.st @@ -1,14 +1,10 @@ tests testFiles - | vmBinaryArtifact snapshot | - vmBinaryArtifact := (SquotFileArtifact for: FSLocator vmBinary asFileReference) - path: 'vm'; - yourself. + "ImageStore cannot store files" + | filesArtifact snapshot | + filesArtifact := SquotUnrecordedFilesArtifact new. snapshot := SquotSnapshot builder - add: vmBinaryArtifact; + add: filesArtifact; buildSnapshot. imageStore restoreToSnapshot: snapshot. - self deny: (imageStore includesObjectAt: 'vm'). - "self shouldnt: [imageStore objectAt: 'vm'] raise: Error. - self assert: ((imageStore objectAt: 'vm') isKindOf: SquotFileArtifact). - self assert: vmBinaryArtifact equals: (imageStore objectAt: 'vm')." \ No newline at end of file + self deny: (imageStore includesObjectAt: 'vm'). \ No newline at end of file diff --git a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json index ad02bfc87..ffa75b94d 100644 --- a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json +++ b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json @@ -13,7 +13,7 @@ "testAddNewObjectsFromArtifact" : "jr 8/18/2017 13:01", "testAddingObjectsAddsThemToTheLoadOrder" : "jr 8/18/2018 15:59", "testApplyPatch" : "jr 9/23/2018 17:30", - "testFiles" : "jr 3/8/2017 17:49", + "testFiles" : "jr 5/5/2019 18:19", "testIgnoredInstanceVariables" : "jr 7/20/2017 13:08", "testRemoveAlsoRemovesFromLoadOrder" : "jr 9/16/2018 00:03", "testRestoreAdheresToTheLoadOrder" : "jr 8/18/2018 18:35", diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/README.md b/src/Squot.package/SquotUnacquaintedFileVisitor.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/class/on.ignoring.addingTo..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/class/on.ignoring.addingTo..st deleted file mode 100644 index 78b2e444f..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/class/on.ignoring.addingTo..st +++ /dev/null @@ -1,7 +0,0 @@ -instance creation -on: aFileSystemStore ignoring: aSetOfPathStrings addingTo: aSnapshotBuilder - ^ self new - fileStore: aFileSystemStore; - ignoredPaths: aSetOfPathStrings; - snapshotBuilder: aSnapshotBuilder; - yourself \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore..st deleted file mode 100644 index a07c5afa2..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore..st +++ /dev/null @@ -1,4 +0,0 @@ -initialize-release -fileStore: anObject - - fileStore := anObject \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore.st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore.st deleted file mode 100644 index 11f69634d..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/fileStore.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -fileStore - - ^ fileStore \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths..st deleted file mode 100644 index 3bf68cf48..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths..st +++ /dev/null @@ -1,6 +0,0 @@ -initialize-release -ignoredPaths: aCollectionOfPathsOrStrings - - ignoredPaths := aCollectionOfPathsOrStrings - collect: [:each | (fileStore directory resolve: each) path ] - as: Set. \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths.st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths.st deleted file mode 100644 index 298d6afa0..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/ignoredPaths.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ignoredPaths - - ^ ignoredPaths \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder..st deleted file mode 100644 index b9b132168..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder..st +++ /dev/null @@ -1,4 +0,0 @@ -initialize-release -snapshotBuilder: anObject - - snapshotBuilder := anObject \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder.st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder.st deleted file mode 100644 index eb4c681a9..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/snapshotBuilder.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -snapshotBuilder - - ^ snapshotBuilder \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visit..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visit..st deleted file mode 100644 index 3d66d942a..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visit..st +++ /dev/null @@ -1,5 +0,0 @@ -visiting -visit: aReference - aReference isFile - ifTrue: [self visitFile: aReference] - ifFalse: [self visitDirectory: aReference]. \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitDirectory..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitDirectory..st deleted file mode 100644 index ab338b371..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitDirectory..st +++ /dev/null @@ -1,4 +0,0 @@ -visiting -visitDirectory: aDirectoryReference - (ignoredPaths includes: aDirectoryReference path) ifTrue: [^ self]. - aDirectoryReference entries do: [:each | self visit: each reference]. \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitFile..st b/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitFile..st deleted file mode 100644 index c85b5c551..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/instance/visitFile..st +++ /dev/null @@ -1,6 +0,0 @@ -visiting -visitFile: aFileReference - (ignoredPaths includes: aFileReference path) ifTrue: [^ self]. - snapshotBuilder add: ((SquotFileArtifact for: aFileReference) - path: (fileStore pathOf: aFileReference); - yourself). \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/methodProperties.json b/src/Squot.package/SquotUnacquaintedFileVisitor.class/methodProperties.json deleted file mode 100644 index 7d94face7..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/methodProperties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "class" : { - "on:ignoring:addingTo:" : "jr 1/31/2017 11:46" }, - "instance" : { - "fileStore" : "jr 1/31/2017 11:46", - "fileStore:" : "jr 1/31/2017 11:46", - "ignoredPaths" : "jr 1/31/2017 11:46", - "ignoredPaths:" : "jr 1/31/2017 12:04", - "snapshotBuilder" : "jr 1/31/2017 11:46", - "snapshotBuilder:" : "jr 1/31/2017 11:46", - "visit:" : "jr 1/31/2017 11:49", - "visitDirectory:" : "jr 1/31/2017 12:02", - "visitFile:" : "jr 1/31/2017 11:59" } } diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json b/src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json deleted file mode 100644 index a66ecd7fe..000000000 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "Squot-FileSystemStore", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "fileStore", - "ignoredPaths", - "snapshotBuilder" ], - "name" : "SquotUnacquaintedFileVisitor", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } From 879ca037682c8387864b4736208c1b0bea5ad25c Mon Sep 17 00:00:00 2001 From: Jakob Reschke Date: Sun, 5 May 2019 18:46:51 +0200 Subject: [PATCH 170/170] fixup! Remove unused SquotFileArtifact and SquotUnacquaintedFileVisitor --- .squot | 1 + 1 file changed, 1 insertion(+) diff --git a/.squot b/.squot index 5b19d38d5..2e20cf4ee 100644 --- a/.squot +++ b/.squot @@ -1,6 +1,7 @@ OrderedDictionary { 'src\/VersionControl.package' : #SquotCypressCodeSerializer, 'src\/Pharo-compatibility.package' : #SquotCypressCodeSerializer, + 'src\/FS-Core.package' : #SquotCypressCodeSerializer, 'src\/FS-Memory.package' : #SquotCypressCodeSerializer, 'src\/FS-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-AnsiStreams.package' : #SquotCypressCodeSerializer,