hpi-swa · LeonBein · Oct 29, 2018 · Oct 29, 2018 · Oct 29, 2018 · Oct 29, 2018
diff --git 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
 }
diff --git a/src/BaselineOfLBGit.package/.filetree 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
@@ -0,0 +1,5 @@
+SquotTrackedObjectMetadata {
+	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
+	#serializer : #SquotCypressCodeSerializer
+}
diff --git a/...otUnacquaintedFileVisitor.class/README.md → ...t.package/monticello.meta/initializers.st b/...otUnacquaintedFileVisitor.class/README.md → ...t.package/monticello.meta/initializers.st
diff --git a/src/BaselineOfLBGit.package/properties.json 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,5 @@
+SquotTrackedObjectMetadata {
+	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
+	#serializer : #SquotCypressCodeSerializer
+}
diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/README.md
diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st 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
diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st b/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st
@@ -0,0 +1,4 @@
+as yet unclassified
+mergeWithDiff: anArtifactDiff
+
+	^ anArtifactDiff inConflictWith: self
diff --git a/...Git-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st b/...Git-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st
@@ -0,0 +1,5 @@
+as yet unclassified
+squotChangeAsStringOrText
+
+	^ 'Removed: ', right,'
+	added: ', left
diff --git a/src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json 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
@@ -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
diff --git a/src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st
@@ -0,0 +1,4 @@
+as yet unclassified
+applyWith: aFileListDiff
+
+	aFileListDiff createFile: self path
diff --git a/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/before.st
@@ -0,0 +1,4 @@
+as yet unclassified
+before
+
+	^ String empty
diff --git a/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st b/src/LBGit-Core.package/SquotFileAddition.class/instance/title.st
@@ -0,0 +1,4 @@
+as yet unclassified
+title
+
+	^ 'Added: ', self path
diff --git a/src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json 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
@@ -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
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st 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
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st 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'.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st 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: []
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/body.st 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
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st 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.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st 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.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st
@@ -0,0 +1,4 @@
+as yet unclassified
+isConflict 
+
+	^ true
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st
@@ -0,0 +1,4 @@
+accessing
+leftChange: anObject
+
+	leftChange := anObject.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st
@@ -0,0 +1,4 @@
+accessing
+leftChange
+
+	^ leftChange
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st 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.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st
@@ -0,0 +1,4 @@
+accessing
+rightChange: anObject
+
+	rightChange := anObject.
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st
@@ -0,0 +1,4 @@
+accessing
+rightChange
+
+	^ rightChange
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/instance/title.st b/src/LBGit-Core.package/SquotFileConflict.class/instance/title.st
@@ -0,0 +1,4 @@
+as yet unclassified
+title
+
+	^ 'Conflicting changes for: ', self path
diff --git a/src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json 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
@@ -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
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/after.st
@@ -0,0 +1,4 @@
+accessing
+after
+
+	^ self contentsOf: (self parent rightReferenceOn: self path)
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st
@@ -0,0 +1,4 @@
+as yet unclassified
+applyWith: aFileListDiff
+
+	^ self subclassResponsibility
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st 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: []
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/before.st
@@ -0,0 +1,4 @@
+accessing
+before
+
+	^ self contentsOf: (self parent leftReferenceOn: self path)
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/body.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/body.st
@@ -0,0 +1,4 @@
+accessing
+body
+
+	^ TextDiffBuilder buildDisplayPatchFrom: self before to: self after
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st
@@ -0,0 +1,7 @@
+accessing
+contentsOf: aReference
+
+	^ aReference readStreamDo: 
+		[:stream | 
+			stream binary.
+			stream contents]
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st
@@ -0,0 +1,4 @@
+as yet unclassified
+excludeIn: aSquotFileListDiff
+
+	aSquotFileListDiff diffs remove: self.
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st
@@ -0,0 +1,4 @@
+as yet unclassified
+includeIn: aSquotFileListDiff
+
+	aSquotFileListDiff diffs add: self.
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st
@@ -0,0 +1,4 @@
+as yet unclassified
+isConflict
+
+	^ false
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st 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   
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st
@@ -0,0 +1,4 @@
+accessing
+parent: aLBGitFileListDiff 
+
+	parent := aLBGitFileListDiff.
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st
@@ -0,0 +1,4 @@
+accessing
+parent
+
+	^ parent
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path..st
@@ -0,0 +1,4 @@
+accessing
+path: anObject
+
+	path := anObject.
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/path.st
@@ -0,0 +1,4 @@
+accessing
+path
+
+	^ path
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st 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, ''')'.
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st 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"
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st
@@ -0,0 +1,7 @@
+as yet unclassified
+squotChangeAsStringOrText
+
+	^ 
+self title asText allBold, '
+
+', self body
diff --git a/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st b/src/LBGit-Core.package/SquotFileDiff.class/instance/title.st
@@ -0,0 +1,4 @@
+accessing
+title
+
+	^ self subclassResponsibility