diff --git a/.squot b/.squot index a65546990..2e20cf4ee 100644 --- a/.squot +++ b/.squot @@ -14,5 +14,8 @@ OrderedDictionary { 'src\/FS-Tests-Memory.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-Disk.package' : #SquotCypressCodeSerializer, 'src\/FS-Tests-AnsiStreams.package' : #SquotCypressCodeSerializer, - 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer + 'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer, + 'src\/LBGit-Core.package' : #SquotCypressCodeSerializer, + 'src\/LBGit-Tests.package' : #SquotCypressCodeSerializer, + 'src\/BaselineOfLBGit.package' : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/BaselineOfLBGit.package/.filetree b/src/BaselineOfLBGit.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/src/BaselineOfLBGit.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/src/BaselineOfLBGit.package/.squot-contents b/src/BaselineOfLBGit.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/src/BaselineOfLBGit.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/src/Squot.package/SquotUnacquaintedFileVisitor.class/README.md b/src/BaselineOfLBGit.package/monticello.meta/initializers.st similarity index 100% rename from src/Squot.package/SquotUnacquaintedFileVisitor.class/README.md rename to src/BaselineOfLBGit.package/monticello.meta/initializers.st diff --git a/src/BaselineOfLBGit.package/properties.json b/src/BaselineOfLBGit.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/src/BaselineOfLBGit.package/properties.json @@ -0,0 +1,2 @@ +{ + } 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" } } diff --git a/src/LBGit-Core.package/.filetree b/src/LBGit-Core.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/src/LBGit-Core.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/src/LBGit-Core.package/.squot-contents b/src/LBGit-Core.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/src/LBGit-Core.package/.squot-contents @@ -0,0 +1,5 @@ +SquotTrackedObjectMetadata { + #objectClassName : #PackageInfo, + #objectsReplacedByNames : true, + #serializer : #SquotCypressCodeSerializer +} \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st new file mode 100644 index 000000000..a29f3ba94 --- /dev/null +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.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/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st new file mode 100644 index 000000000..ca07bc7c0 --- /dev/null +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st @@ -0,0 +1,4 @@ +as yet unclassified +mergeWithDiff: anArtifactDiff + + ^ anArtifactDiff inConflictWith: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..e70f7ecad --- /dev/null +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.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/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json new file mode 100644 index 000000000..f86412436 --- /dev/null +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "applyToContainer:" : "LB 11/20/2018 15:06", + "mergeWithDiff:" : "LB 4/28/2019 11:34", + "squotChangeAsStringOrText" : "LB 2/13/2019 14:04" } } diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json new file mode 100644 index 000000000..ffaa34ac3 --- /dev/null +++ b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotArtifactReplacementDiff", + "pools" : [ + ], + "super" : "SquotArtifactDiff", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileAddition.class/README.md b/src/LBGit-Core.package/SquotFileAddition.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st new file mode 100644 index 000000000..32f22605a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileAddition.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/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st new file mode 100644 index 000000000..798927c0e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st @@ -0,0 +1,4 @@ +as yet unclassified +before + + ^ String empty \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st new file mode 100644 index 000000000..8c14de241 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Added: ', self path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json b/src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json new file mode 100644 index 000000000..f382b01a4 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "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/src/LBGit-Core.package/SquotFileAddition.class/properties.json b/src/LBGit-Core.package/SquotFileAddition.class/properties.json new file mode 100644 index 000000000..431ede880 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileAddition.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotFileAddition", + "pools" : [ + ], + "super" : "SquotFileDiff", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileConflict.class/README.md b/src/LBGit-Core.package/SquotFileConflict.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st b/src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st new file mode 100644 index 000000000..21b179855 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.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/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st new file mode 100644 index 000000000..616733936 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + "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 new file mode 100644 index 000000000..bd88eec92 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st @@ -0,0 +1,10 @@ +as yet unclassified +asDiffNode + + ^ SquotMergeDiffNode + title: self title + content: self + children: #() + onInclude: [] + onExclude: [] + onReset: [] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/body.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/body.st new file mode 100644 index 000000000..4dad0e8d1 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.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/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 new file mode 100644 index 000000000..492420ec8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st @@ -0,0 +1,4 @@ +as yet unclassified +isConflict + + ^ true \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st new file mode 100644 index 000000000..7b89be7d5 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st @@ -0,0 +1,4 @@ +accessing +leftChange: anObject + + leftChange := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st new file mode 100644 index 000000000..e44e107d3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st @@ -0,0 +1,4 @@ +accessing +leftChange + + ^ leftChange \ 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/instance/rightChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st new file mode 100644 index 000000000..b842b9dee --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st @@ -0,0 +1,4 @@ +accessing +rightChange: anObject + + rightChange := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st new file mode 100644 index 000000000..4fd62848e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st @@ -0,0 +1,4 @@ +accessing +rightChange + + ^ rightChange \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/title.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/title.st new file mode 100644 index 000000000..ae1128eb8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.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/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json new file mode 100644 index 000000000..3eb2afd78 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json @@ -0,0 +1,16 @@ +{ + "class" : { + "left:right:" : "LB 11/25/2018 16:22" }, + "instance" : { + "applyWith:" : "LB 5/5/2019 12:21", + "asDiffNode" : "LB 5/5/2019 12:16", + "body" : "LB 11/25/2018 16:35", + "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", + "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 new file mode 100644 index 000000000..2fd96d14a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileConflict.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "leftChange", + "rightChange" ], + "name" : "SquotFileConflict", + "pools" : [ + ], + "super" : "SquotFileDiff", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileDiff.class/README.md b/src/LBGit-Core.package/SquotFileDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st new file mode 100644 index 000000000..b698ffdc1 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st @@ -0,0 +1,4 @@ +accessing +after + + ^ self contentsOf: (self parent rightReferenceOn: self path) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st new file mode 100644 index 000000000..67539f7f8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st @@ -0,0 +1,4 @@ +as yet unclassified +applyWith: aFileListDiff + + ^ self subclassResponsibility \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st new file mode 100644 index 000000000..58ede69d3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st @@ -0,0 +1,9 @@ +as yet unclassified +asDiffNode + + ^ SquotDiffNode + title: self title + content: self + children: #() + onInclude: [] + onExclude: [] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st new file mode 100644 index 000000000..71c480735 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st @@ -0,0 +1,4 @@ +accessing +before + + ^ self contentsOf: (self parent leftReferenceOn: self path) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/body.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/body.st new file mode 100644 index 000000000..c11e5a467 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.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/src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st new file mode 100644 index 000000000..faabe3fdc --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.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/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/isConflict.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st new file mode 100644 index 000000000..205d2940d --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st @@ -0,0 +1,4 @@ +as yet unclassified +isConflict + + ^ false \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st new file mode 100644 index 000000000..1f6d131a2 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st @@ -0,0 +1,6 @@ +as yet unclassified +mergeWith: anotherFileDiff + + ^ (SquotFileConflict left: self right: anotherFileDiff) + path: self path; + yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st new file mode 100644 index 000000000..82076cedf --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st @@ -0,0 +1,4 @@ +accessing +parent: aLBGitFileListDiff + + parent := aLBGitFileListDiff. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st new file mode 100644 index 000000000..5f7789b51 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st @@ -0,0 +1,4 @@ +accessing +parent + + ^ parent \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st new file mode 100644 index 000000000..23eaf8543 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st @@ -0,0 +1,4 @@ +accessing +path: anObject + + path := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st new file mode 100644 index 000000000..81c63b398 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st @@ -0,0 +1,4 @@ +accessing +path + + ^ path \ 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/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/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..ceb032137 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.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/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st new file mode 100644 index 000000000..a05ce996c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st @@ -0,0 +1,4 @@ +accessing +title + + ^ self subclassResponsibility \ 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 new file mode 100644 index 000000000..dcf4691dd --- /dev/null +++ b/src/LBGit-Core.package/SquotFileDiff.class/methodProperties.json @@ -0,0 +1,22 @@ +{ + "class" : { + }, + "instance" : { + "after" : "LB 4/28/2019 12:23", + "applyWith:" : "LB 11/25/2018 16:39", + "asDiffNode" : "LB 3/10/2019 17:01", + "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", + "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/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json b/src/LBGit-Core.package/SquotFileDiff.class/properties.json similarity index 52% rename from src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json rename to src/LBGit-Core.package/SquotFileDiff.class/properties.json index a66ecd7fe..bc561fb99 100644 --- a/src/Squot.package/SquotUnacquaintedFileVisitor.class/properties.json +++ b/src/LBGit-Core.package/SquotFileDiff.class/properties.json @@ -1,15 +1,14 @@ { - "category" : "Squot-FileSystemStore", + "category" : "LBGit-Core", "classinstvars" : [ ], "classvars" : [ ], "commentStamp" : "", "instvars" : [ - "fileStore", - "ignoredPaths", - "snapshotBuilder" ], - "name" : "SquotUnacquaintedFileVisitor", + "path", + "parent" ], + "name" : "SquotFileDiff", "pools" : [ ], "super" : "Object", diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/README.md b/src/LBGit-Core.package/SquotFileListDiff.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/class/empty.st b/src/LBGit-Core.package/SquotFileListDiff.class/class/empty.st new file mode 100644 index 000000000..a650626ce --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/class/left.right..st b/src/LBGit-Core.package/SquotFileListDiff.class/class/left.right..st new file mode 100644 index 000000000..b665e9b7f --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/class/left.right..st @@ -0,0 +1,6 @@ +as yet unclassified +left: leftArtifact right: rightArtifact + + ^ self new + diff: leftArtifact against: rightArtifact; + yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/added..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added..st new file mode 100644 index 000000000..4fe99c293 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added..st @@ -0,0 +1,4 @@ +accessing +added: anObject + + added := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/added.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added.st new file mode 100644 index 000000000..d5e63b92d --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/added.st @@ -0,0 +1,4 @@ +accessing +added + + ^ added \ No newline at end of file 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 new file mode 100644 index 000000000..8e3bf8ad8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/applyToContainer..st @@ -0,0 +1,5 @@ +applying +applyToContainer: anObjectContainer + + 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/asConflicts.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asConflicts.st new file mode 100644 index 000000000..e279a792e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/SquotFileListDiff.class/instance/asDiffTree.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st new file mode 100644 index 000000000..14ac8e984 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/asDiffTree.st @@ -0,0 +1,9 @@ +as yet unclassified +asDiffTree + + ^ SquotDiffNode + title: self path + content: self + children: self topNodes + onInclude: [] + onExclude: [] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/createDiffs.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createDiffs.st new file mode 100644 index 000000000..622455218 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st new file mode 100644 index 000000000..da9a753e0 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/createFile..st @@ -0,0 +1,9 @@ +applying +createFile: aPath + + | sourceReference targetReference | + sourceReference := self sourceReferenceOn: aPath. + 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/instance/deleteFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/deleteFile..st new file mode 100644 index 000000000..98e940619 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/deleteFile..st @@ -0,0 +1,7 @@ +applying +deleteFile: aPath + + | targetReference | + targetReference := self targetReferenceOn: aPath. + targetReference exists + ifTrue: [targetReference delete] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/diff.against..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diff.against..st new file mode 100644 index 000000000..e57fbd29d --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diff.against..st @@ -0,0 +1,14 @@ +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/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st new file mode 100644 index 000000000..193ae4790 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAdded.st @@ -0,0 +1,9 @@ +diff creation +diffAdded + + self diffs addAll: + (self added collect: + [:each | SquotFileAddition new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAt..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffAt..st new file mode 100644 index 000000000..9a7bc586d --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st new file mode 100644 index 000000000..590b06f21 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffModified.st @@ -0,0 +1,9 @@ +diff creation +diffModified + + self diffs addAll: + (self modified collect: + [:each | SquotFileModification new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffPaths.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffPaths.st new file mode 100644 index 000000000..5872a1812 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st new file mode 100644 index 000000000..81e370e1c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffRemoved.st @@ -0,0 +1,9 @@ +diff creation +diffRemoved + + self diffs addAll: + (self removed collect: + [:each | SquotFileRemoval new + parent: self; + path: each; + yourself]) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs..st new file mode 100644 index 000000000..db1e5c9ec --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs..st @@ -0,0 +1,4 @@ +accessing +diffs: anObject + + diffs := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs.st new file mode 100644 index 000000000..accc270dc --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/diffs.st @@ -0,0 +1,4 @@ +accessing +diffs + + ^ diffs \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/gitReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/gitReferenceOn..st new file mode 100644 index 000000000..3f1b3e127 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/gitReferenceOn..st @@ -0,0 +1,4 @@ +as yet unclassified +gitReferenceOn: aPath + + ^ self rightReferenceOn: aPath \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasChanges.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasChanges.st new file mode 100644 index 000000000..e94fa2c3b --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasChanges.st @@ -0,0 +1,4 @@ +as yet unclassified +hasChanges + + ^ self diffs notEmpty \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasConflicts.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/hasConflicts.st new file mode 100644 index 000000000..2379258f2 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/isAddition.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isAddition.st new file mode 100644 index 000000000..9b36fa9ce --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isAddition.st @@ -0,0 +1,4 @@ +applying +isAddition + + ^ false \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/isFileModified..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isFileModified..st new file mode 100644 index 000000000..119fa08c0 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isFileModified..st @@ -0,0 +1,4 @@ +diff creation +isFileModified: aPath + + ^ (self left trackedFiles at: aPath) hasChangesTo: (self right trackedFiles at: aPath) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/isRemoval.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isRemoval.st new file mode 100644 index 000000000..257126f3e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/isRemoval.st @@ -0,0 +1,4 @@ +applying +isRemoval + + ^ false \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/left..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left..st new file mode 100644 index 000000000..b701cc139 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left..st @@ -0,0 +1,4 @@ +accessing +left: anObject + + left := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/left.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left.st new file mode 100644 index 000000000..7a159c36d --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/left.st @@ -0,0 +1,4 @@ +accessing +left + + ^ left \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/leftReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/leftReferenceOn..st new file mode 100644 index 000000000..8f039e089 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st new file mode 100644 index 000000000..408cda437 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWith..st @@ -0,0 +1,15 @@ +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]); + addAll: (otherFileListDiff diffs reject: [:each | commonPaths includes: each path]); + addAll: (commonPaths collect: [:each | (self diffAt: each) mergeWith: (otherFileListDiff diffAt: each)]). + ^ SquotFileListDiff new + left: self right; + right: otherFileListDiff right; + diffs: resultingDiffs; + yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWithRemoval..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWithRemoval..st new file mode 100644 index 000000000..a52b583d6 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/mergeWithRemoval..st @@ -0,0 +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/SquotFileListDiff.class/instance/modified..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified..st new file mode 100644 index 000000000..f732fdb2a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified..st @@ -0,0 +1,4 @@ +accessing +modified: anObject + + modified := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified.st new file mode 100644 index 000000000..ea2e839cb --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/modified.st @@ -0,0 +1,4 @@ +accessing +modified + + ^ modified \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/originalOrAddedArtifact.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/originalOrAddedArtifact.st new file mode 100644 index 000000000..98b8bb1c6 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st new file mode 100644 index 000000000..d8861dbe7 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ SquotFilesArtifact path \ No newline at end of file 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/SquotFileListDiff.class/instance/removed..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed..st new file mode 100644 index 000000000..4dc20ce4f --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed..st @@ -0,0 +1,4 @@ +accessing +removed: anObject + + removed := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed.st new file mode 100644 index 000000000..85a979d62 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/removed.st @@ -0,0 +1,4 @@ +accessing +removed + + ^ removed \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/right..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right..st new file mode 100644 index 000000000..9e650c91e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right..st @@ -0,0 +1,4 @@ +accessing +right: anObject + + right := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/right.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right.st new file mode 100644 index 000000000..85787af13 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/right.st @@ -0,0 +1,4 @@ +accessing +right + + ^ right \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/rightReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/rightReferenceOn..st new file mode 100644 index 000000000..b9b821fc2 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.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/src/LBGit-Core.package/SquotFileListDiff.class/instance/sourceReferenceOn..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/sourceReferenceOn..st new file mode 100644 index 000000000..a7f327e4b --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/sourceReferenceOn..st @@ -0,0 +1,4 @@ +applying +sourceReferenceOn: aPath + + ^ self rightReferenceOn: aPath \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/squotChangeAsStringOrText.st new file mode 100644 index 000000000..10f80705b --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/squotChangeAsStringOrText.st @@ -0,0 +1,5 @@ +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/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed..st new file mode 100644 index 000000000..ea20aae30 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed..st @@ -0,0 +1,4 @@ +accessing +stayed: anObject + + stayed := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed.st new file mode 100644 index 000000000..508bc5ca4 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/stayed.st @@ -0,0 +1,4 @@ +accessing +stayed + + ^ stayed \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/storeInfo.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/storeInfo.st new file mode 100644 index 000000000..d9e820d3a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/storeInfo.st @@ -0,0 +1,4 @@ +applying +storeInfo + + ^ SquotTrackedObjectMetadata new \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/target..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target..st new file mode 100644 index 000000000..08fc09ad3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target..st @@ -0,0 +1,4 @@ +accessing +target: anObject + + target := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/target.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target.st new file mode 100644 index 000000000..66264783f --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/target.st @@ -0,0 +1,4 @@ +accessing +target + + ^ target \ 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 new file mode 100644 index 000000000..6b439966a --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/targetReferenceOn..st @@ -0,0 +1,6 @@ +applying +targetReferenceOn: aPath + + ^ self target + 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/instance/topNodes.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st new file mode 100644 index 000000000..ed6cfe595 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/topNodes.st @@ -0,0 +1,8 @@ +as yet unclassified +topNodes + + ^ 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/instance/updateFile..st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/updateFile..st new file mode 100644 index 000000000..952591ca3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/updateFile..st @@ -0,0 +1,7 @@ +applying +updateFile: aPath + + self + deleteFile: aPath; + createFile: aPath. + \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingDirectory.st new file mode 100644 index 000000000..cc92ecd6c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self right workingDirectory \ 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 new file mode 100644 index 000000000..18c32f204 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/methodProperties.json @@ -0,0 +1,56 @@ +{ + "class" : { + "empty" : "LB 2/13/2019 14:04", + "left:right:" : "LB 11/26/2018 16:06" }, + "instance" : { + "added" : "LB 11/22/2018 11:17", + "added:" : "LB 11/22/2018 11:17", + "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", + "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", + "diffAt:" : "LB 11/25/2018 16:14", + "diffModified" : "LB 4/28/2019 16:09", + "diffPaths" : "LB 11/25/2018 16:05", + "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", + "hasChanges" : "LB 12/8/2018 14:18", + "hasConflicts" : "LB 12/8/2018 14:18", + "isAddition" : "LB 12/7/2018 18:25", + "isFileModified:" : "LB 11/25/2018 15:20", + "isRemoval" : "LB 12/7/2018 18:24", + "left" : "LB 11/22/2018 11:14", + "left:" : "LB 11/22/2018 11:14", + "leftReferenceOn:" : "LB 2/13/2019 14:04", + "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 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", + "right" : "LB 11/22/2018 11:14", + "right:" : "LB 11/22/2018 11:14", + "rightReferenceOn:" : "LB 2/13/2019 14:04", + "sourceReferenceOn:" : "LB 11/25/2018 15:56", + "squotChangeAsStringOrText" : "LB 11/23/2018 15:23", + "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 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/SquotFileListDiff.class/properties.json b/src/LBGit-Core.package/SquotFileListDiff.class/properties.json new file mode 100644 index 000000000..7a9cbeb43 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileListDiff.class/properties.json @@ -0,0 +1,21 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "left", + "right", + "added", + "removed", + "stayed", + "modified", + "diffs", + "target" ], + "name" : "SquotFileListDiff", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/README.md b/src/LBGit-Core.package/SquotFileMetadata.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/class/onTreeEntry..st b/src/LBGit-Core.package/SquotFileMetadata.class/class/onTreeEntry..st new file mode 100644 index 000000000..b91d8447b --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.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/src/LBGit-Core.package/SquotFileMetadata.class/instance/contentChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/contentChangesTo..st new file mode 100644 index 000000000..e0ef646ba --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.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/src/LBGit-Core.package/SquotFileMetadata.class/instance/contents.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/contents.st new file mode 100644 index 000000000..b1d8de5d6 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/instance/contents.st @@ -0,0 +1,11 @@ +as yet unclassified +contents + + | stream content | + ^ (self reference notNil and: [self reference exists]) + ifFalse: [nil] + ifTrue: + [stream := self reference readStream binary. + content := stream contents. + stream close. + content] diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/instance/entryHash.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/entryHash.st new file mode 100644 index 000000000..c4fa6a8c5 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.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/src/LBGit-Core.package/SquotFileMetadata.class/instance/gitChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/gitChangesTo..st new file mode 100644 index 000000000..6ea3049c0 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.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/src/LBGit-Core.package/SquotFileMetadata.class/instance/hasChangesTo..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/hasChangesTo..st new file mode 100644 index 000000000..d26c3c250 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/instance/hasChangesTo..st @@ -0,0 +1,6 @@ +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/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference..st new file mode 100644 index 000000000..8c1e7e098 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.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/SquotFileMetadata.class/instance/reference.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference.st new file mode 100644 index 000000000..50b50b32e --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/instance/reference.st @@ -0,0 +1,4 @@ +accessing +reference + + ^ reference \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry..st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry..st new file mode 100644 index 000000000..2efd7749f --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry..st @@ -0,0 +1,4 @@ +accessing +treeEntry: anObject + + treeEntry := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry.st b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry.st new file mode 100644 index 000000000..d6dfefb76 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/instance/treeEntry.st @@ -0,0 +1,4 @@ +accessing +treeEntry + + ^ treeEntry \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileMetadata.class/methodProperties.json b/src/LBGit-Core.package/SquotFileMetadata.class/methodProperties.json new file mode 100644 index 000000000..7cf2835d8 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/methodProperties.json @@ -0,0 +1,13 @@ +{ + "class" : { + "onTreeEntry:" : "LB 11/25/2018 15:17" }, + "instance" : { + "contentChangesTo:" : "LB 11/25/2018 17:26", + "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", + "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/SquotFileMetadata.class/properties.json b/src/LBGit-Core.package/SquotFileMetadata.class/properties.json new file mode 100644 index 000000000..77e4afe5c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileMetadata.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "reference", + "treeEntry" ], + "name" : "SquotFileMetadata", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileModification.class/README.md b/src/LBGit-Core.package/SquotFileModification.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileModification.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileModification.class/instance/applyWith..st new file mode 100644 index 000000000..e3a16c84c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileModification.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/src/LBGit-Core.package/SquotFileModification.class/instance/title.st b/src/LBGit-Core.package/SquotFileModification.class/instance/title.st new file mode 100644 index 000000000..21e6e0b14 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileModification.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Modified: ', self path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileModification.class/methodProperties.json b/src/LBGit-Core.package/SquotFileModification.class/methodProperties.json new file mode 100644 index 000000000..47f7175dc --- /dev/null +++ b/src/LBGit-Core.package/SquotFileModification.class/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "applyWith:" : "LB 11/25/2018 16:40", + "title" : "LB 11/23/2018 18:52" } } diff --git a/src/LBGit-Core.package/SquotFileModification.class/properties.json b/src/LBGit-Core.package/SquotFileModification.class/properties.json new file mode 100644 index 000000000..bb928ff5c --- /dev/null +++ b/src/LBGit-Core.package/SquotFileModification.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotFileModification", + "pools" : [ + ], + "super" : "SquotFileDiff", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFileRemoval.class/README.md b/src/LBGit-Core.package/SquotFileRemoval.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFileRemoval.class/instance/after.st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/after.st new file mode 100644 index 000000000..bbb1722ec --- /dev/null +++ b/src/LBGit-Core.package/SquotFileRemoval.class/instance/after.st @@ -0,0 +1,4 @@ +as yet unclassified +after + + ^ String empty \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileRemoval.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/applyWith..st new file mode 100644 index 000000000..42b0318e3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileRemoval.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/src/LBGit-Core.package/SquotFileRemoval.class/instance/title.st b/src/LBGit-Core.package/SquotFileRemoval.class/instance/title.st new file mode 100644 index 000000000..d0fb38629 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileRemoval.class/instance/title.st @@ -0,0 +1,4 @@ +as yet unclassified +title + + ^ 'Removed: ', self path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFileRemoval.class/methodProperties.json b/src/LBGit-Core.package/SquotFileRemoval.class/methodProperties.json new file mode 100644 index 000000000..71b972692 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileRemoval.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "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/src/LBGit-Core.package/SquotFileRemoval.class/properties.json b/src/LBGit-Core.package/SquotFileRemoval.class/properties.json new file mode 100644 index 000000000..581b96d37 --- /dev/null +++ b/src/LBGit-Core.package/SquotFileRemoval.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotFileRemoval", + "pools" : [ + ], + "super" : "SquotFileDiff", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/class/path.st b/src/LBGit-Core.package/SquotFilesArtifact.class/class/path.st new file mode 100644 index 000000000..28a7d9952 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/class/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ '' \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/^equals.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/^equals.st new file mode 100644 index 000000000..3e8ea63d4 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/^equals.st @@ -0,0 +1,7 @@ +as yet unclassified += otherObject + + ^ 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 diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/capture.st new file mode 100644 index 000000000..c9eb0190b --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/capture.st @@ -0,0 +1,5 @@ +as yet unclassified +capture + + "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/SquotFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..1f72266e9 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,4 @@ +as yet unclassified +collectTrackedFiles + + ^ self subclassResponsibility \ No newline at end of file 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/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/SquotFilesArtifact.class/instance/diffContentAgainstThatOf..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffContentAgainstThatOf..st new file mode 100644 index 000000000..cc643c720 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/diffContentAgainstThatOf..st @@ -0,0 +1,5 @@ +as yet unclassified +diffContentAgainstThatOf: anArtifact + "Double dispatch with reverseDiffContentAgainst:" + "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/SquotFilesArtifact.class/instance/displayText.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/displayText.st new file mode 100644 index 000000000..3361c3e3b --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/displayText.st @@ -0,0 +1,4 @@ +as yet unclassified +displayText + + ^'Recorded files: (', (self trackedFiles keys inject: '' into: [:sum :each | sum, each, ', ']) ,')' \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/hash.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/hash.st new file mode 100644 index 000000000..b47af3aa5 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/hash.st @@ -0,0 +1,7 @@ +as yet unclassified +hash + + ^ ((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/SquotFilesArtifact.class/instance/isLoadable.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isLoadable.st new file mode 100644 index 000000000..d88e3db64 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isLoadable.st @@ -0,0 +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/SquotFilesArtifact.class/instance/isSquotFile..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isSquotFile..st new file mode 100644 index 000000000..0d7447d01 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/isSquotFile..st @@ -0,0 +1,8 @@ +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/SquotFilesArtifact.class/instance/materializeWith.replacing..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/materializeWith.replacing..st new file mode 100644 index 000000000..d83f786a5 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/materializeWith.replacing..st @@ -0,0 +1,4 @@ +as yet unclassified +materializeWith: anArtifact replacing: anObject + + ^ SquotFilesObject new \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer..st new file mode 100644 index 000000000..b4a4a785a --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.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/SquotFilesArtifact.class/instance/objectContainer.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer.st new file mode 100644 index 000000000..c34ca1fa4 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/objectContainer.st @@ -0,0 +1,4 @@ +accessing +objectContainer + + ^ objectContainer \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/path.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/path.st new file mode 100644 index 000000000..fd5e47c0c --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/path.st @@ -0,0 +1,4 @@ +as yet unclassified +path + + ^ self class path \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..91c2c2192 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstLiveFiles: otherFilesArtifact + + ^ self subclassResponsibility \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..cdc89b8bf --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + ^ self subclassResponsibility \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st new file mode 100644 index 000000000..1deb2c907 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffAgainstUnrecordedFiles..st @@ -0,0 +1,4 @@ +as yet unclassified +reverseDiffAgainstUnrecordedFiles: anUnrecordedFilesArtifact + + ^ SquotArtifactReplacementDiff left: anUnrecordedFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffContentAgainst..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffContentAgainst..st new file mode 100644 index 000000000..9252792ff --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/reverseDiffContentAgainst..st @@ -0,0 +1,5 @@ +as yet unclassified +reverseDiffContentAgainst: otherContent + + "see #diffContentAgainstThatOf:" + self shouldNotImplement. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory..st new file mode 100644 index 000000000..87a97cde3 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory..st @@ -0,0 +1,4 @@ +accessing +rootDirectory: anObject + + rootDirectory := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory.st new file mode 100644 index 000000000..5d66c63e9 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/rootDirectory.st @@ -0,0 +1,4 @@ +accessing +rootDirectory + + ^ rootDirectory \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/squotSummaryText.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/squotSummaryText.st new file mode 100644 index 000000000..e09e74ff0 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/squotSummaryText.st @@ -0,0 +1,4 @@ +as yet unclassified +squotSummaryText + + ^ 'Files stored outside of Squeak' \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st new file mode 100644 index 000000000..ab15b5080 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeInfo.st @@ -0,0 +1,6 @@ +as yet unclassified +storeInfo + + ^ SquotTrackedObjectMetadata new + objectClass: SquotFilesObject; + yourself \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeWith..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/storeWith..st new file mode 100644 index 000000000..1d7225a1f --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.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/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles..st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles..st new file mode 100644 index 000000000..ee8f804c4 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles..st @@ -0,0 +1,4 @@ +accessing +trackedFiles: anObject + + trackedFiles := anObject. \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles.st new file mode 100644 index 000000000..69b050a32 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/trackedFiles.st @@ -0,0 +1,4 @@ +accessing +trackedFiles + + ^ trackedFiles ifNil: [self collectTrackedFiles. trackedFiles] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/wantsToBeInTableOfContents.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/wantsToBeInTableOfContents.st new file mode 100644 index 000000000..ee91df6a6 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/wantsToBeInTableOfContents.st @@ -0,0 +1,4 @@ +as yet unclassified +wantsToBeInTableOfContents + "I always want to be newly created" + ^ false \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..86c9cfecc --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,6 @@ +as yet unclassified +workingDirectory + + "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/SquotFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..1eaefff9e --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/methodProperties.json @@ -0,0 +1,31 @@ +{ + "class" : { + "path" : "LB 12/7/2018 18:14" }, + "instance" : { + "=" : "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", + "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 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 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 16:07", + "storeWith:" : "LB 4/27/2019 15:14", + "trackedFiles" : "LB 11/22/2018 15:46", + "trackedFiles:" : "LB 11/20/2018 15:12", + "wantsToBeInTableOfContents" : "LB 4/28/2019 11:40", + "workingDirectory" : "LB 4/27/2019 19:50" } } diff --git a/src/LBGit-Core.package/SquotFilesArtifact.class/properties.json b/src/LBGit-Core.package/SquotFilesArtifact.class/properties.json new file mode 100644 index 000000000..16e853f5e --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesArtifact.class/properties.json @@ -0,0 +1,16 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "rootDirectory", + "trackedFiles", + "objectContainer" ], + "name" : "SquotFilesArtifact", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotFilesObject.class/README.md b/src/LBGit-Core.package/SquotFilesObject.class/README.md new file mode 100644 index 000000000..c878b7e11 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesObject.class/README.md @@ -0,0 +1 @@ +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/SquotFilesObject.class/methodProperties.json b/src/LBGit-Core.package/SquotFilesObject.class/methodProperties.json new file mode 100644 index 000000000..0e4a66223 --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesObject.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + } } diff --git a/src/LBGit-Core.package/SquotFilesObject.class/properties.json b/src/LBGit-Core.package/SquotFilesObject.class/properties.json new file mode 100644 index 000000000..366e1187b --- /dev/null +++ b/src/LBGit-Core.package/SquotFilesObject.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "LB 4/28/2019 10:52", + "instvars" : [ + ], + "name" : "SquotFilesObject", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/allFiles.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/allFiles.st new file mode 100644 index 000000000..f515dee8d --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/allFiles.st @@ -0,0 +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/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/capture.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/capture.st new file mode 100644 index 000000000..d49a74223 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.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/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..3dac15edc --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,7 @@ +collecting tracked files +collectTrackedFiles + + self trackedFiles: + (((self allFiles + collect: [:each | self pathAndMetadataFor: each]) + reject: [:each | self isSquotFile: each key]) as: Dictionary) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..37f456108 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +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/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/initializeOn..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/initializeOn..st new file mode 100644 index 000000000..4b07f7998 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/initializeOn..st @@ -0,0 +1,4 @@ +as yet unclassified +initializeOn: aRecordedFilesArtifact + + self rootDirectory: (aRecordedFilesArtifact workingDirectory). \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/pathAndMetadataFor..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/pathAndMetadataFor..st new file mode 100644 index 000000000..42bdea811 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.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 -> (SquotFileMetadata new reference: aFSReference) \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..e8c277457 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,6 @@ +diffing +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" + ^ SquotFileListDiff empty \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..349fcf6de --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,5 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + self initializeOn: otherFilesArtifact. + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..bf8a7e4ad --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,4 @@ +as yet unclassified +workingDirectory + + ^ self rootDirectory \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..e632ac5b0 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/methodProperties.json @@ -0,0 +1,13 @@ +{ + "class" : { + }, + "instance" : { + "allFiles" : "LB 12/4/2018 14:53", + "capture" : "LB 12/4/2018 14:58", + "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 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/SquotLiveFilesArtifact.class/properties.json b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/properties.json new file mode 100644 index 000000000..494078ef0 --- /dev/null +++ b/src/LBGit-Core.package/SquotLiveFilesArtifact.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotLiveFilesArtifact", + "pools" : [ + ], + "super" : "SquotFilesArtifact", + "type" : "normal" } diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/README.md b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf..st new file mode 100644 index 000000000..a4b2a1641 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf..st @@ -0,0 +1,4 @@ +as yet unclassified +collectFilesOf: aGitTreeEntrySet + + ^ self collectFilesOf: aGitTreeEntrySet in: '' \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf.in..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectFilesOf.in..st new file mode 100644 index 000000000..eed2a58ac --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.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: (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/SquotTrackedFilesArtifact.class/instance/collectTrackedFiles.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectTrackedFiles.st new file mode 100644 index 000000000..1bbd3b96f --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/collectTrackedFiles.st @@ -0,0 +1,8 @@ +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) reference: (self rootDirectory resolve: key)] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/commit.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/commit.st new file mode 100644 index 000000000..4229c2495 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/commit.st @@ -0,0 +1,6 @@ +as yet unclassified +commit + + ^ self isInGit + ifTrue: [self rootDirectory fileSystem store revision] + ifFalse: [nil] \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/diffAgainst..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/diffAgainst..st new file mode 100644 index 000000000..68a9f542d --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/diffAgainst..st @@ -0,0 +1,4 @@ +diffing +diffAgainst: otherFilesArtifact + + ^ otherFilesArtifact reverseDiffAgainstRecordedFiles: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/isInGit.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/isInGit.st new file mode 100644 index 000000000..eeddb5a78 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.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/SquotTrackedFilesArtifact.class/instance/printOn..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/printOn..st new file mode 100644 index 000000000..428689848 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.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/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st new file mode 100644 index 000000000..c39fafbc3 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstLiveFiles..st @@ -0,0 +1,5 @@ +diffing +reverseDiffAgainstLiveFiles: otherFilesArtifact + + otherFilesArtifact initializeOn: self. + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st new file mode 100644 index 000000000..9a99fe28c --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/reverseDiffAgainstRecordedFiles..st @@ -0,0 +1,4 @@ +diffing +reverseDiffAgainstRecordedFiles: otherFilesArtifact + + ^ SquotFileListDiff left: otherFilesArtifact right: self \ No newline at end of file diff --git a/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/workingDirectory.st b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/workingDirectory.st new file mode 100644 index 000000000..30ba9ada5 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/instance/workingDirectory.st @@ -0,0 +1,6 @@ +as yet unclassified +workingDirectory + + ^ 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/SquotTrackedFilesArtifact.class/methodProperties.json b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/methodProperties.json new file mode 100644 index 000000000..3046950d2 --- /dev/null +++ b/src/LBGit-Core.package/SquotTrackedFilesArtifact.class/methodProperties.json @@ -0,0 +1,14 @@ +{ + "class" : { + }, + "instance" : { + "collectFilesOf:" : "LB 4/28/2019 13:21", + "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 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/LBGit-Core.package/monticello.meta/categories.st b/src/LBGit-Core.package/monticello.meta/categories.st new file mode 100644 index 000000000..e775e11d9 --- /dev/null +++ b/src/LBGit-Core.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'LBGit-Core'! diff --git a/src/LBGit-Core.package/monticello.meta/initializers.st b/src/LBGit-Core.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Core.package/properties.json b/src/LBGit-Core.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/src/LBGit-Core.package/properties.json @@ -0,0 +1,2 @@ +{ + } diff --git a/src/LBGit-Tests.package/.filetree b/src/LBGit-Tests.package/.filetree new file mode 100644 index 000000000..8998102c2 --- /dev/null +++ b/src/LBGit-Tests.package/.filetree @@ -0,0 +1,4 @@ +{ + "noMethodMetaData" : true, + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/src/LBGit-Tests.package/.squot-contents b/src/LBGit-Tests.package/.squot-contents new file mode 100644 index 000000000..239ddebb0 --- /dev/null +++ b/src/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/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/README.md b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection..st b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection..st new file mode 100644 index 000000000..97c956617 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection..st @@ -0,0 +1,4 @@ +accessing +projectSelection: anObject + + projectSelection := anObject. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection.st b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection.st new file mode 100644 index 000000000..d70ee01b9 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/instance/projectSelection.st @@ -0,0 +1,4 @@ +accessing +projectSelection + + ^ projectSelection \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/methodProperties.json new file mode 100644 index 000000000..7525613e4 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesBrowserForTests.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/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json new file mode 100644 index 000000000..6276a8e2e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesBrowserForTests.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "projectSelection" ], + "name" : "SquotFilesBrowserForTests", + "pools" : [ + ], + "super" : "SquitBrowser", + "type" : "normal" } diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/README.md b/src/LBGit-Tests.package/SquotFilesLocalTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFile.st new file mode 100644 index 000000000..fe0a748fb --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFile.st @@ -0,0 +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/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFileContent.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitAddsFileContent.st new file mode 100644 index 000000000..d591bb465 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.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/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitDeletesFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitDeletesFile.st new file mode 100644 index 000000000..830505a54 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.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/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitUpdatesFile.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitUpdatesFile.st new file mode 100644 index 000000000..04f9c7b4a --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testCommitUpdatesFile.st @@ -0,0 +1,10 @@ +tests +testCommitUpdatesFile + + self commitDummyFileAddition. + self writeToDummyFile: self dummyContents2. + self commitMessaged: '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/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st new file mode 100644 index 000000000..8618fbc69 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testInitialTrackedFilesArtifact.st @@ -0,0 +1,5 @@ +tests +testInitialTrackedFilesArtifact + + self assert: + (self workingCopy currentSnapshot artifacts anySatisfy: [:each | each isKindOf: SquotLiveFilesArtifact]). \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testSetupSuccess.st new file mode 100644 index 000000000..bbb1b7a9b --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/instance/testSetupSuccess.st @@ -0,0 +1,4 @@ +tests +testSetupSuccess + + self assert: true. \ 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 new file mode 100644 index 000000000..894aaab93 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.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 4/28/2019 17:00", + "testSetupSuccess" : "LB 12/8/2018 15:40" } } diff --git a/src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json new file mode 100644 index 000000000..31bfdffe9 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesLocalTests.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "SquotFilesLocalTests", + "pools" : [ + ], + "super" : "SquotFilesTestCase", + "type" : "normal" } diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/README.md b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/branchName.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/branchName.st new file mode 100644 index 000000000..2db9b0b59 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/branchName.st @@ -0,0 +1,4 @@ +accessing +branchName + + ^ self class name , '_' , testSelector , '_' , self token \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser..st new file mode 100644 index 000000000..27dc9bfe6 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser..st @@ -0,0 +1,4 @@ +accessing +browser: anObject + + browser := anObject. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser.st new file mode 100644 index 000000000..8a644b817 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/browser.st @@ -0,0 +1,4 @@ +accessing +browser + + ^ browser \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/commitOtherMessaged..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/commitOtherMessaged..st new file mode 100644 index 000000000..428c96d54 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/createBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/createBranch.st new file mode 100644 index 000000000..20df2ae4c --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/credentials.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/credentials.st new file mode 100644 index 000000000..ff725743f --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/credentials.st @@ -0,0 +1,5 @@ +accessing +credentials + + ^ {(SmalltalkCI getEnv: 'GITUSERNAME') ifNil: [NeedGitCredentials new signal]. + (SmalltalkCI getEnv: 'GITPASSWORD') ifNil: [NeedGitCredentials new signal]} \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/deleteBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/deleteBranch.st new file mode 100644 index 000000000..df8eef11d --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/expectedFailures.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/expectedFailures.st new file mode 100644 index 000000000..e7eae9160 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/SquotFilesRemoteTests.class/instance/generateToken.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/generateToken.st new file mode 100644 index 000000000..915c05b75 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/initialize.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/initialize.st new file mode 100644 index 000000000..9933e848a --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/initialize.st @@ -0,0 +1,6 @@ +as yet unclassified +initialize + + super initialize. + self generateToken. + self remainingAttempts: 2. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherCommit.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherCommit.st new file mode 100644 index 000000000..3de28e1a3 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherCommit.st @@ -0,0 +1,4 @@ +accessing +otherCommit + + ^ self otherWorkingCopy loadedVersion commit \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherReference.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherReference.st new file mode 100644 index 000000000..d429dc2bf --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherReference.st @@ -0,0 +1,4 @@ +accessing +otherReference + + ^ self reference , 'other' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy..st new file mode 100644 index 000000000..ec508a7d2 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy..st @@ -0,0 +1,4 @@ +accessing +otherWorkingCopy: aSquotWorkingCopy + + otherWorkingCopy := aSquotWorkingCopy. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy.st new file mode 100644 index 000000000..3e8a26865 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/otherWorkingCopy.st @@ -0,0 +1,4 @@ +accessing +otherWorkingCopy + + ^ otherWorkingCopy \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/performTest.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/performTest.st new file mode 100644 index 000000000..604086b1c --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/performTest.st @@ -0,0 +1,9 @@ +running +performTest + + [super performTest] + on: NeedGitCredentials do: [:e | e resume: self credentials] + on: ConnectionClosed do: [:e | + self remainingAttempts strictlyPositive + ifTrue: [self fail: e] + ifFalse: [self retryTest]]. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/pullOther.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/pullOther.st new file mode 100644 index 000000000..4cb49f8f5 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/push.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/push.st new file mode 100644 index 000000000..a34cb0fef --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts..st new file mode 100644 index 000000000..be5bd8c60 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts..st @@ -0,0 +1,4 @@ +accessing +remainingAttempts: anObject + + remainingAttempts := anObject. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts.st new file mode 100644 index 000000000..7910dbf67 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remainingAttempts.st @@ -0,0 +1,4 @@ +accessing +remainingAttempts + + ^ remainingAttempts \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remoteURL.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/remoteURL.st new file mode 100644 index 000000000..71482a808 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/retryTest.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/retryTest.st new file mode 100644 index 000000000..f756a9806 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/retryTest.st @@ -0,0 +1,7 @@ +running +retryTest + + 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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st new file mode 100644 index 000000000..b8f11cdfc --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUp.st @@ -0,0 +1,13 @@ +running +setUp + + super setUp. + self + setUpAdditionalWorkingCopy; + suppressProgressDisplayDuring: [self + setUpRemoteFor: self workingCopy; + setUpRemoteFor: self otherWorkingCopy; + createBranch]. + self workingCopy register. + self otherWorkingCopy register. + self browser: SquotFilesBrowserForTests new. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpAdditionalWorkingCopy.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpAdditionalWorkingCopy.st new file mode 100644 index 000000000..57fb633e1 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemoteFor..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/setUpRemoteFor..st new file mode 100644 index 000000000..c30138772 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/tearDown.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/tearDown.st new file mode 100644 index 000000000..b59c8945a --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/tearDown.st @@ -0,0 +1,8 @@ +running +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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testMergeGenerated.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testMergeGenerated.st new file mode 100644 index 000000000..f3273f26b --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testMergeGenerated.st @@ -0,0 +1,15 @@ +tests +testMergeGenerated + + + self + write: self dummyContents2 + to: self dummyFile2 + in: self otherReference. + self + commitOtherMessaged: 'Added dummy2'; + createDummyFile. + self transferMessaged: 'Added dummy1'. + self + assert: (self otherCommit tree includesEntryNamed: self dummyFile); + assert: (self otherCommit tree includesEntryNamed: self dummyFile2). \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testNoCheckoutNeeded.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testNoCheckoutNeeded.st new file mode 100644 index 000000000..52e8cd5b7 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testOnOwnBranch.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testOnOwnBranch.st new file mode 100644 index 000000000..afdc26b80 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFile.st new file mode 100644 index 000000000..aecd8e2b3 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileContent.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileContent.st new file mode 100644 index 000000000..1c229eb5a --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileInNewFolder.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileInNewFolder.st new file mode 100644 index 000000000..ff0a05d20 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileToTree.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushAddsFileToTree.st new file mode 100644 index 000000000..d33a7bf60 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushDeletedFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushDeletedFile.st new file mode 100644 index 000000000..611b9cc7d --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushImageRegression.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushImageRegression.st new file mode 100644 index 000000000..2551bf643 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushUpdatesFile.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testPushUpdatesFile.st new file mode 100644 index 000000000..1d46431b0 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testReadmeExists.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testReadmeExists.st new file mode 100644 index 000000000..f1c91b31c --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testSetupSuccess.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testSetupSuccess.st new file mode 100644 index 000000000..54e3a418e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/testSetupSuccess.st @@ -0,0 +1,5 @@ +tests +testSetupSuccess + + + self assert: true. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token..st new file mode 100644 index 000000000..b4f9d1349 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token..st @@ -0,0 +1,4 @@ +accessing +token: anObject + + token := anObject. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token.st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token.st new file mode 100644 index 000000000..3b43bb263 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/token.st @@ -0,0 +1,4 @@ +accessing +token + + ^ token \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/transferMessaged..st b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/instance/transferMessaged..st new file mode 100644 index 000000000..67aee57f1 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.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/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json new file mode 100644 index 000000000..255eba29f --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/methodProperties.json @@ -0,0 +1,44 @@ +{ + "class" : { + }, + "instance" : { + "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", + "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", + "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 17:02", + "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:48", + "setUp" : "LB 4/28/2019 16:14", + "setUpAdditionalWorkingCopy" : "LB 12/8/2018 15:24", + "setUpRemoteFor:" : "LB 12/8/2018 16:56", + "tearDown" : "LB 12/8/2018 17:35", + "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", + "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", + "token" : "LB 12/13/2018 17:34", + "token:" : "LB 12/13/2018 17:34", + "transferMessaged:" : "LB 12/8/2018 15:46" } } diff --git a/src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json new file mode 100644 index 000000000..a58c1900f --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesRemoteTests.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "otherWorkingCopy", + "browser", + "token", + "remainingAttempts" ], + "name" : "SquotFilesRemoteTests", + "pools" : [ + ], + "super" : "SquotFilesTestCase", + "type" : "normal" } diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/README.md b/src/LBGit-Tests.package/SquotFilesTestCase.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commit.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commit.st new file mode 100644 index 000000000..e5babb67b --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commit.st @@ -0,0 +1,4 @@ +accessing +commit + + ^ self workingCopy loadedVersion commit \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitDummyFileAddition.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitDummyFileAddition.st new file mode 100644 index 000000000..2a248077e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitDummyFileAddition.st @@ -0,0 +1,5 @@ +dummy files +commitDummyFileAddition + + self createDummyFile. + self commitMessaged: 'Added dummy file'. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitMessaged..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitMessaged..st new file mode 100644 index 000000000..4b96930d5 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/commitMessaged..st @@ -0,0 +1,6 @@ +actions +commitMessaged: aString + + self workingCopy + saveNewVersionMessage: aString + interactive: false. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyFile.st new file mode 100644 index 000000000..9f3dc71eb --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyFile.st @@ -0,0 +1,5 @@ +dummy files +createDummyFile + + self writeToDummyFile: self dummyContents. + \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyImage.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/createDummyImage.st new file mode 100644 index 000000000..179e15a5b --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/deleteDummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/deleteDummyFile.st new file mode 100644 index 000000000..aed7ed8ce --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/deleteDummyFile.st @@ -0,0 +1,5 @@ +dummy files +deleteDummyFile + + (self reference resolve: self dummyFile) delete. + \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents.st new file mode 100644 index 000000000..81c6308fa --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents.st @@ -0,0 +1,5 @@ +dummy files +dummyContents + + ^ 'Test + Data' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents2.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents2.st new file mode 100644 index 000000000..a2a587b2e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyContents2.st @@ -0,0 +1,6 @@ +dummy files +dummyContents2 + + ^ 'These are new + contents for the + dummy file' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile.st new file mode 100644 index 000000000..b9df60d71 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile.st @@ -0,0 +1,4 @@ +dummy files +dummyFile + + ^ 'dummy.file' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile2.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile2.st new file mode 100644 index 000000000..449ba4275 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyFile2.st @@ -0,0 +1,4 @@ +dummy files +dummyFile2 + + ^ 'dummy2.file' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImage.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImage.st new file mode 100644 index 000000000..cfd083c29 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImage.st @@ -0,0 +1,4 @@ +dummy files +dummyImage + + ^ 'dummyImage.png' \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImageContents.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/dummyImageContents.st new file mode 100644 index 000000000..ff4d1b104 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/gitReference.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/gitReference.st new file mode 100644 index 000000000..d038ac7fa --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/makeWorkingCopyAt..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/makeWorkingCopyAt..st new file mode 100644 index 000000000..a2378eb9d --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/performTest.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/performTest.st new file mode 100644 index 000000000..d2befabb6 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/performTest.st @@ -0,0 +1,3 @@ +running +performTest + self suppressProgressDisplayDuring: [^ super performTest] \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference..st new file mode 100644 index 000000000..8c1e7e098 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference..st @@ -0,0 +1,4 @@ +accessing +reference: anObject + + reference := anObject. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference.st new file mode 100644 index 000000000..50b50b32e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/reference.st @@ -0,0 +1,4 @@ +accessing +reference + + ^ reference \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/setUp.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/setUp.st new file mode 100644 index 000000000..4d34a8e88 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/suppressProgressDisplayDuring..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/suppressProgressDisplayDuring..st new file mode 100644 index 000000000..6cb64b927 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.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/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/tearDown.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/tearDown.st new file mode 100644 index 000000000..1b17db211 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/tearDown.st @@ -0,0 +1,5 @@ +running +tearDown + + self reference delete. + super tearDown. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy..st new file mode 100644 index 000000000..175b4409a --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy..st @@ -0,0 +1,4 @@ +accessing +workingCopy: aSquotWorkingCopy + + workingCopy := aSquotWorkingCopy. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy.st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy.st new file mode 100644 index 000000000..725b545b8 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/workingCopy.st @@ -0,0 +1,4 @@ +accessing +workingCopy + + ^ workingCopy \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/write.to.in..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/write.to.in..st new file mode 100644 index 000000000..557ed46f9 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/write.to.in..st @@ -0,0 +1,9 @@ +actions +write: anObject to: aString in: aReference + + | file | + file := (aReference resolve: aString). + file parent ensureDirectory. + file writeStream binary + nextPutAll: anObject asByteArray; + close. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/writeToDummyFile..st b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/writeToDummyFile..st new file mode 100644 index 000000000..184d4d680 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/instance/writeToDummyFile..st @@ -0,0 +1,7 @@ +dummy files +writeToDummyFile: anObject + + self + write: anObject + to: self dummyFile + in: self reference. \ No newline at end of file diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/methodProperties.json b/src/LBGit-Tests.package/SquotFilesTestCase.class/methodProperties.json new file mode 100644 index 000000000..cc6866e7e --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/methodProperties.json @@ -0,0 +1,28 @@ +{ + "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", + "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" : "", + "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 2/13/2019 15:02", + "writeToDummyFile:" : "LB 12/10/2018 09:45" } } diff --git a/src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json b/src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json new file mode 100644 index 000000000..d79f4d937 --- /dev/null +++ b/src/LBGit-Tests.package/SquotFilesTestCase.class/properties.json @@ -0,0 +1,17 @@ +{ + "category" : "LBGit-Tests", + "classinstvars" : [ + ], + "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "workingCopy", + "reference" ], + "name" : "SquotFilesTestCase", + "pools" : [ + ], + "super" : "TestCase", + "traitcomposition" : "TTestCaseSuppressingProgressDisplay", + "type" : "normal" } diff --git a/src/LBGit-Tests.package/monticello.meta/categories.st b/src/LBGit-Tests.package/monticello.meta/categories.st new file mode 100644 index 000000000..267a8c0c2 --- /dev/null +++ b/src/LBGit-Tests.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'LBGit-Tests'! diff --git a/src/LBGit-Tests.package/monticello.meta/initializers.st b/src/LBGit-Tests.package/monticello.meta/initializers.st new file mode 100644 index 000000000..e69de29bb diff --git a/src/LBGit-Tests.package/properties.json b/src/LBGit-Tests.package/properties.json new file mode 100644 index 000000000..f037444a7 --- /dev/null +++ b/src/LBGit-Tests.package/properties.json @@ -0,0 +1,2 @@ +{ + } 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/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/instance/captureLazySnapshot.st b/src/Squot.package/SquotFileSystemStore.class/instance/captureLazySnapshot.st index 2827e9016..f81ba33e3 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 := SquotTrackedFilesArtifact new rootDirectory: directory; yourself). - snapshot := builder buildSnapshot. - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot \ No newline at end of file + builder buildSnapshot + in: [: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 4d58e60f1..cf6c081b5 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 := SquotTrackedFilesArtifact new rootDirectory: directory; yourself). - snapshot := builder buildSnapshot. - unrecordedFiles ownerSnapshot: snapshot. - ^ snapshot \ No newline at end of file + builder buildSnapshot + in: [: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 9ab07ed4a..0308ab912 100644 --- a/src/Squot.package/SquotFileSystemStore.class/methodProperties.json +++ b/src/Squot.package/SquotFileSystemStore.class/methodProperties.json @@ -8,13 +8,13 @@ "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", "artifactsDo:" : "jr 5/9/2017 18:00", - "captureLazySnapshot" : "jr 9/23/2018 22:09", - "captureSnapshot" : "jr 9/23/2018 22:10", + "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", diff --git a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st index 85d4c0b45..181ba77fc 100644 --- a/src/Squot.package/SquotImageStore.class/instance/artifactAt..st +++ b/src/Squot.package/SquotImageStore.class/instance/artifactAt..st @@ -1,3 +1,4 @@ accessing artifactAt: path + ^ 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..f766f28ad --- /dev/null +++ b/src/Squot.package/SquotImageStore.class/instance/initializeTrackedFiles.st @@ -0,0 +1,7 @@ +initialize-release +initializeTrackedFiles + + self + 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 d5cf3feaa..e13c68c9d 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 = SquotFilesArtifact path ifTrue: + [^ (SquotLiveFilesArtifact new + objectContainer: 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/methodProperties.json b/src/Squot.package/SquotImageStore.class/methodProperties.json index 24198e4ea..1944f2120 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:" : "jr 4/7/2018 15:53", + "artifactAt:" : "LB 4/27/2019 19:08", "artifacts" : "jr 4/7/2018 15:53", "assume:toBeStoredAt:" : "jr 1/27/2017 14:33", "capture:" : "jr 7/30/2017 15:19", @@ -25,9 +25,10 @@ "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", + "initializeTrackedFiles" : "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", diff --git a/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st b/src/Squot.package/SquotImageStoreTest.class/instance/setUp.st index a23c8c5de..0afe1869f 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: 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 dc1c58545..ad1115fa3 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: 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 10446e69d..2d88fec4e 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: SquotFilesArtifact path; captureSnapshot \ No newline at end of file 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 bca632cf8..ffa75b94d 100644 --- a/src/Squot.package/SquotImageStoreTest.class/methodProperties.json +++ b/src/Squot.package/SquotImageStoreTest.class/methodProperties.json @@ -6,14 +6,14 @@ "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/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", "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/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/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/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..fd17ca9a4 --- /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: [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 83508a067..c5fcf1bd0 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 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 new file mode 100644 index 000000000..3136312e2 --- /dev/null +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/instance/initialLoadOrder.st @@ -0,0 +1,4 @@ +testing +initialLoadOrder + + ^ {SquotFilesArtifact path. '1'. '2'. } \ 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 c3328c1c3..21c21b747 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. - browser selectedObjectIndex: 2. + self assert: self initialLoadOrder equals: workingCopy loadOrder asArray. + browser selectedObjectIndex: workingCopy loadOrder size. "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: 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/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..31c09f79e 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: 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 eab1a0e5f..e038ba38c 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: 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 5d2de8e95..887d2cded 100644 --- a/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyBrowserTest.class/methodProperties.json @@ -2,9 +2,11 @@ "class" : { }, "instance" : { + "initialLoadOrder" : "LB 4/28/2019 16:11", "setUp" : "jr 10/3/2018 15:28", - "testCannotMoveDownLastObjectInLoadOrder" : "jr 10/3/2018 15:38", - "testCannotMoveUpFirstObjectInLoadOrder" : "jr 10/3/2018 15:37", + "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" : "jr 10/3/2018 15:38", - "testMoveUpInLoadOrder" : "jr 10/3/2018 15:36" } } + "testMoveDownInLoadOrder" : "LB 4/27/2019 17:44", + "testMoveUpInLoadOrder" : "LB 4/27/2019 17:43" } } 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/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 6d023d071..2f97fee35 100644 --- a/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json +++ b/src/Squot.package/SquotWorkingCopyTest.class/methodProperties.json @@ -14,11 +14,11 @@ "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", - "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",