-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Track files outside the image #228
Open
LeonBein
wants to merge
179
commits into
hpi-swa:develop
Choose a base branch
from
LeonBein:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 178 commits
Commits
Show all changes
179 commits
Select commit
Hold shift + click to select a range
e514624
U work?
LeonBein e6fc35a
Create README.md
LeonBein 052c308
Update README.md
LeonBein 49bf0ab
revert?
LeonBein 1343c8c
Update README.md
LeonBein 8a73010
Update readme again
LeonBein f787cef
Update README.md
LeonBein b4b8e07
Update foo..st
LeonBein 0ef9c52
Create newFile.txt
LeonBein 2d796c1
Update newFile.txt
LeonBein 6059aec
Create aVeryRecognizableFile.txt
LeonBein 72cdddd
Update aVeryRecognizableFile.txt
LeonBein b32469c
Create thisIsNoOverwrite.md
LeonBein 40bd1d3
Update aVeryRecognizableFile.txt
LeonBein a73794b
Commit another I want
LeonBein 249bc75
Plus commit
LeonBein 38396bd
Create cheating.package
LeonBein 8761240
Delete cheating.package
LeonBein f89a8d5
Added second test class
LeonBein a78ae6e
Added aFile.txt
LeonBein b593f68
Update aFile.txt
LeonBein 596b118
Added diff and stuff
LeonBein 4173f32
See
LeonBein e5e6e12
Errr
LeonBein 899d983
Next
LeonBein 2c497e2
Serializer
LeonBein 3db0bfb
Remove aFile
LeonBein dbfc6dd
Added bFile?
LeonBein a36b760
Added cfile
LeonBein 921cb08
Enter commit log message here
LeonBein cf44a87
Add c again
LeonBein 1dd5ef0
Update cFile.txt
LeonBein 280f3ca
Added path to shadow
LeonBein 8608c64
Update cFile.txt
LeonBein 514da1f
Difffnstuff
LeonBein 285ae99
Enter commit log message here
LeonBein 8cf8035
Update cFile.txt
LeonBein e43807a
Much stuff
LeonBein 59f09b4
Again added cfile
LeonBein c054cad
rem c
LeonBein 54c613c
add c
LeonBein 0267396
Update cFile.txt
LeonBein 444a3ec
Rem c to allow pull of rest code
LeonBein f2203fb
Readd c
LeonBein 2024f82
Several fixes
LeonBein 191f754
more
LeonBein e890a70
Update .squot
LeonBein 19e7d2e
No change
LeonBein 62f2d27
Create superduper.md
LeonBein e76ac92
Delete cFile.txt
LeonBein 08c4928
Delete properties.json
LeonBein 3a20ec6
Delete .filetree
LeonBein 386c7af
Delete initializers.st
LeonBein d5fe5b8
Delete properties.json
LeonBein 4e7fe2e
Delete methodProperties.json
LeonBein b1da220
Delete README.md
LeonBein 9cc363b
Delete .squot-contents
LeonBein 654cdf3
Delete squotShouldKeepIdentity.st
LeonBein 85f3f8c
Delete squotShadowFactory.st
LeonBein 26a5bd8
Delete squotRemoveTransientStoreInfoFrom..st
LeonBein 3b99352
Delete squotAddTransientStoreInfoTo..st
LeonBein ebbe4d9
Delete rootDirectory.st
LeonBein 3fec653
Delete rootDirectory..st
LeonBein c6d8cab
Delete path.st
LeonBein ed1aaa0
Delete path..st
LeonBein d515b02
Delete captureWithSquot.st
LeonBein 6d488c1
Delete captureWithSquot..st
LeonBein 618cfba
Delete browseFromSquot..st
LeonBein f5b9fc4
Delete thisIsNoOverwrite.md
LeonBein da3c8f5
clean
LeonBein 601cf0e
Readded code
LeonBein 3e16456
Readded working copy extension and added serializer initialization
LeonBein 812b338
Pre-Materialization commit
LeonBein 2df2138
Unstable materialization 1
LeonBein 7c2b5d9
Materialization seems to work
LeonBein 55a8a6d
Added recorded file artifact
LeonBein a5d8ad3
Working: online addition and removel of files
LeonBein d3a1c94
Rest changes
LeonBein f9ca352
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein 9eee262
Cool diffing
LeonBein c4c57df
Working!
LeonBein 2256f11
Feature complete (hopefully) (lets label it with @version 1.0.0)
LeonBein a6c00f1
Remove unused classes
LeonBein bf28532
Renamed package
LeonBein 2008a7b
Added baseline
LeonBein 8b724fa
Added extension metzhods in squot
LeonBein 89f94ce
Removed isthisevercalled
LeonBein 82da911
Removed void class
LeonBein b1b7f7a
Try to allow copy of images
LeonBein 0dad650
Create README.md
LeonBein d55cd4e
Changed readne
LeonBein ced89ee
Added first few tests
LeonBein f921951
Create .smalltalk.ston
LeonBein e1d40b1
Added tests to baseline
LeonBein 4b51f2f
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein 0fc55c5
Create .travis.yml
LeonBein 9a913bf
Update .smalltalk.ston
LeonBein 3a5f511
Fixed package structure
LeonBein dba03b0
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein af56585
Added squot installer for 5.2
LeonBein 97bdd06
Added squot as baseline dependency
LeonBein fd08444
Setting git stamp on preload
LeonBein 1049f06
Added extension and fixed preload
LeonBein 90c87f5
Replaced preload by postload
LeonBein 1bebcf5
Update baseline
LeonBein 78c4fce
Update baseline
LeonBein 94dff19
Update .travis.yml
LeonBein 0443cc2
Travis poke 1
LeonBein d7b26e7
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein fc3153a
Added compatibility for newer versions of squot
LeonBein f3466a1
Update .travis.yml
LeonBein 91e1fd4
Added real remote tests moved local test to extra class
LeonBein 9bb5ea5
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein ff7a7fc
Git credentials
LeonBein c9c9f36
Allowing backsaving ... probably
LeonBein 7792999
Added token and small fix
LeonBein 441cecb
Replaced method for the merging of two replacement diffs, it caused a…
LeonBein d09aeb4
This should fix the error of #22
LeonBein 0c7fa7c
Added merge test; modified commit dialog by adding a signal.
LeonBein 9ab536d
Update README.md
LeonBein 1540276
Try again to trigger build
LeonBein 200b908
Closes #22
LeonBein 979c621
Merge branch 'master' of https://github.com/LeonBein/SmalltalkGitTest…
LeonBein afba177
Starting attempt to minimize travis flaky tests
LeonBein f3cb7eb
Adding retry mechanism in order to dampen travis flaky tests on conne…
LeonBein 931bbce
Trying different error type
LeonBein 9ea7978
Merge remote-tracking branch 'lbgit/master' into develop
LeonBein 7879eec
(Re-)added lbgit packages to .squot
LeonBein d1cc9ae
Code merge
LeonBein 4d5444d
Moved lbgit extension code into squot main code
LeonBein 19bdff5
trying to remove empty extension package
LeonBein ebfa30d
Working on #14; need to merge fixes into this fork
LeonBein 4ac065b
Merge branch 'develop' of https://github.com/hpi-swa/Squot into develop
LeonBein e2d0f29
Merge branch 'develop' of https://github.com/hpi-swa/Squot into develop
LeonBein 902ef89
Adapted to merged pull request #215
LeonBein 7e1acb5
Fix most test errors
LeonBein 2900d69
Added lbgit to baseline
LeonBein 6cb2827
Moved lbgit to src
LeonBein dedb052
update .squot
LeonBein 51fc4c5
Added missing methods storeWith: on all file lists and asConflicts on…
LeonBein fc1312f
Live artifact now allows one case of diffing against another: if it i…
LeonBein 304dab2
Adapted tests to reflect addition of tracked files artifact
LeonBein 2345adf
Changed way how live file artifact is created: now storing dummy object
LeonBein 87a02ea
Revert change of artifact creation
LeonBein 0616d96
Adapted test to match their intent and changed way live file artifact…
LeonBein 23db545
All adding of live file artifact is now in image store
LeonBein 24bf16e
Readded tracked dummy object
LeonBein 811fa20
File list artifacts now don't error in file stores outside of git any…
LeonBein dd0448a
As now again an object is tracked we do not need the adapted collect …
LeonBein 93a036e
Fix some tests: missing metadata and missing knowledge about a file l…
LeonBein b695c18
Fixes #= on file list artifact
LeonBein 89c814a
Adapted files object class comment and renamed file metadata inst var…
LeonBein 0869dff
Minor fixes
LeonBein 63923a2
Commit missing changes from renaming ownerSnapshot to objectContainer
LeonBein 295ee46
Added warning to file list diff merge with removal
LeonBein 61a0af4
Safer usage of streams in file diff
LeonBein da8fe55
Minor changes
LeonBein 7299aa7
Remove unnecessary trait from file list diff
LeonBein 6436c3c
Optimized and cleaned collect files in recorder files artifact
LeonBein 214bafb
Shouldnotimplement on content diffs in file list diff (has no content)
LeonBein 77b34b7
Added remote tests to expected failures for now
LeonBein cef02b4
Fix critical defect: mssing brackets
LeonBein b738e01
Fix defect: missing brackets
LeonBein a9629f1
Now always allowing diff between multiple live file lists, however is…
LeonBein 3a870fc
Adapted squot file filtering mask
LeonBein 3abe9ba
Add diffing methods for unrecorded file artifact, if somebody tries t…
LeonBein 843b2a7
Renamed lbgit classes to squot classes
LeonBein 9136020
Removed lbgit baseline and renamed lbgit tests
LeonBein af7b46e
Fix obsolete class references
LeonBein 1cba414
Fix more obsolete class refs (refactoring tools seem to have failed f…
LeonBein ed07287
Fix (hopefully) last obsolete class ref
LeonBein 18b0c0e
file list diff now uses right path
LeonBein d1d4ec6
Added choice to file conflicts
LeonBein df3cc88
Added include/exclude behavior to all file diffs; tweaked conflict be…
LeonBein c0eed3c
Changed diff dispatch => no nasty typechecking anymore
LeonBein 4d9a794
Trying to apply a file addition without existing file now throws an e…
LeonBein feb3187
Deleted unused method
LeonBein edb0cf4
Remove unused SquotFileArtifact and SquotUnacquaintedFileVisitor
j4yk 879ca03
fixup! Remove unused SquotFileArtifact and SquotUnacquaintedFileVisitor
j4yk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "noMethodMetaData" : true, | ||
| "separateMethodMetaAndSource" : false, | ||
| "useCypressPropertiesFile" : true } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| SquotTrackedObjectMetadata { | ||
| #objectClassName : #PackageInfo, | ||
| #objectsReplacedByNames : true, | ||
| #serializer : #SquotCypressCodeSerializer | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "noMethodMetaData" : true, | ||
| "separateMethodMetaAndSource" : false, | ||
| "useCypressPropertiesFile" : true } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| SquotTrackedObjectMetadata { | ||
| #objectClassName : #PackageInfo, | ||
| #objectsReplacedByNames : true, | ||
| #serializer : #SquotCypressCodeSerializer | ||
| } |
Empty file.
5 changes: 5 additions & 0 deletions
5
src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/applyToContainer..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| as yet unclassified | ||
| applyToContainer: anObjectContainer | ||
| "right := right capture." | ||
| anObjectContainer removeAt: left path. | ||
| ^ anObjectContainer add: right |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotArtifactReplacementDiff.class/instance/mergeWithDiff..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| mergeWithDiff: anArtifactDiff | ||
|
|
||
| ^ anArtifactDiff inConflictWith: self |
5 changes: 5 additions & 0 deletions
5
...Git-Core.package/SquotArtifactReplacementDiff.class/instance/squotChangeAsStringOrText.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| as yet unclassified | ||
| squotChangeAsStringOrText | ||
|
|
||
| ^ 'Removed: ', right,' | ||
| added: ', left |
7 changes: 7 additions & 0 deletions
7
src/LBGit-Core.package/SquotArtifactReplacementDiff.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" } } |
14 changes: 14 additions & 0 deletions
14
src/LBGit-Core.package/SquotArtifactReplacementDiff.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "category" : "LBGit-Core", | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "", | ||
| "instvars" : [ | ||
| ], | ||
| "name" : "SquotArtifactReplacementDiff", | ||
| "pools" : [ | ||
| ], | ||
| "super" : "SquotArtifactDiff", | ||
| "type" : "normal" } |
Empty file.
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileAddition.class/instance/applyWith..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| applyWith: aFileListDiff | ||
|
|
||
| aFileListDiff createFile: self path |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileAddition.class/instance/before.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| before | ||
|
|
||
| ^ String empty |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileAddition.class/instance/title.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| title | ||
|
|
||
| ^ 'Added: ', self path |
7 changes: 7 additions & 0 deletions
7
src/LBGit-Core.package/SquotFileAddition.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" } } |
14 changes: 14 additions & 0 deletions
14
src/LBGit-Core.package/SquotFileAddition.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "category" : "LBGit-Core", | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "", | ||
| "instvars" : [ | ||
| ], | ||
| "name" : "SquotFileAddition", | ||
| "pools" : [ | ||
| ], | ||
| "super" : "SquotFileDiff", | ||
| "type" : "normal" } |
Empty file.
7 changes: 7 additions & 0 deletions
7
src/LBGit-Core.package/SquotFileConflict.class/class/left.right..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| as yet unclassified | ||
| left: leftFileDiff right: rightFileDiff | ||
|
|
||
| ^ self new | ||
| leftChange: leftFileDiff; | ||
| rightChange: rightFileDiff; | ||
| yourself |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/applyWith..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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'. |
10 changes: 10 additions & 0 deletions
10
src/LBGit-Core.package/SquotFileConflict.class/instance/asDiffNode.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| as yet unclassified | ||
| asDiffNode | ||
|
|
||
| ^ SquotMergeDiffNode | ||
| title: self title | ||
| content: self | ||
| children: #() | ||
| onInclude: [] | ||
| onExclude: [] | ||
| onReset: [] |
11 changes: 11 additions & 0 deletions
11
src/LBGit-Core.package/SquotFileConflict.class/instance/body.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
5 changes: 5 additions & 0 deletions
5
src/LBGit-Core.package/SquotFileConflict.class/instance/excludeIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| as yet unclassified | ||
| excludeIn: aSquotFileListDiff | ||
|
|
||
| super excludeIn: aSquotFileListDiff. | ||
| self leftChange includeIn: aSquotFileListDiff. |
5 changes: 5 additions & 0 deletions
5
src/LBGit-Core.package/SquotFileConflict.class/instance/includeIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| as yet unclassified | ||
| includeIn: aSquotFileListDiff | ||
|
|
||
| super excludeIn: aSquotFileListDiff. | ||
| self rightChange includeIn: aSquotFileListDiff. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/isConflict.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| isConflict | ||
|
|
||
| ^ true |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| leftChange: anObject | ||
|
|
||
| leftChange := anObject. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/leftChange.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| leftChange | ||
|
|
||
| ^ leftChange |
6 changes: 6 additions & 0 deletions
6
src/LBGit-Core.package/SquotFileConflict.class/instance/resetIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| as yet unclassified | ||
| resetIn: aSquotFileListDiff | ||
|
|
||
| self leftChange excludeIn: aSquotFileListDiff. | ||
| self rightChange excludeIn: aSquotFileListDiff. | ||
| super includeIn: aSquotFileListDiff. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| rightChange: anObject | ||
|
|
||
| rightChange := anObject. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/rightChange.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| rightChange | ||
|
|
||
| ^ rightChange |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileConflict.class/instance/title.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| title | ||
|
|
||
| ^ 'Conflicting changes for: ', self path |
16 changes: 16 additions & 0 deletions
16
src/LBGit-Core.package/SquotFileConflict.class/methodProperties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" } } |
15 changes: 15 additions & 0 deletions
15
src/LBGit-Core.package/SquotFileConflict.class/properties.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "category" : "LBGit-Core", | ||
| "classinstvars" : [ | ||
| ], | ||
| "classvars" : [ | ||
| ], | ||
| "commentStamp" : "", | ||
| "instvars" : [ | ||
| "leftChange", | ||
| "rightChange" ], | ||
| "name" : "SquotFileConflict", | ||
| "pools" : [ | ||
| ], | ||
| "super" : "SquotFileDiff", | ||
| "type" : "normal" } |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| after | ||
|
|
||
| ^ self contentsOf: (self parent rightReferenceOn: self path) |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/applyWith..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| applyWith: aFileListDiff | ||
|
|
||
| ^ self subclassResponsibility |
9 changes: 9 additions & 0 deletions
9
src/LBGit-Core.package/SquotFileDiff.class/instance/asDiffNode.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| as yet unclassified | ||
| asDiffNode | ||
|
|
||
| ^ SquotDiffNode | ||
| title: self title | ||
| content: self | ||
| children: #() | ||
| onInclude: [] | ||
| onExclude: [] |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/before.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| before | ||
|
|
||
| ^ self contentsOf: (self parent leftReferenceOn: self path) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| body | ||
|
|
||
| ^ TextDiffBuilder buildDisplayPatchFrom: self before to: self after |
7 changes: 7 additions & 0 deletions
7
src/LBGit-Core.package/SquotFileDiff.class/instance/contentsOf..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| accessing | ||
| contentsOf: aReference | ||
|
|
||
| ^ aReference readStreamDo: | ||
| [:stream | | ||
| stream binary. | ||
| stream contents] |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/excludeIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| excludeIn: aSquotFileListDiff | ||
|
|
||
| aSquotFileListDiff diffs remove: self. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/includeIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| includeIn: aSquotFileListDiff | ||
|
|
||
| aSquotFileListDiff diffs add: self. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/isConflict.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| isConflict | ||
|
|
||
| ^ false |
6 changes: 6 additions & 0 deletions
6
src/LBGit-Core.package/SquotFileDiff.class/instance/mergeWith..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| as yet unclassified | ||
| mergeWith: anotherFileDiff | ||
|
|
||
| ^ (SquotFileConflict left: self right: anotherFileDiff) | ||
| path: self path; | ||
| yourself |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/parent..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| parent: aLBGitFileListDiff | ||
|
|
||
| parent := aLBGitFileListDiff. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/parent.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| parent | ||
|
|
||
| ^ parent |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| path: anObject | ||
|
|
||
| path := anObject. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| accessing | ||
| path | ||
|
|
||
| ^ path |
5 changes: 5 additions & 0 deletions
5
src/LBGit-Core.package/SquotFileDiff.class/instance/printOn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| as yet unclassified | ||
| printOn: aStream | ||
|
|
||
| super printOn: aStream. | ||
| aStream nextPutAll: '(''', self path, ''')'. |
4 changes: 4 additions & 0 deletions
4
src/LBGit-Core.package/SquotFileDiff.class/instance/resetIn..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| as yet unclassified | ||
| resetIn: aSquotFileListDiff | ||
|
|
||
| "Per default, reset is needed only for conflicts" |
7 changes: 7 additions & 0 deletions
7
src/LBGit-Core.package/SquotFileDiff.class/instance/squotChangeAsStringOrText.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| as yet unclassified | ||
| squotChangeAsStringOrText | ||
|
|
||
| ^ | ||
| self title asText allBold, ' | ||
|
|
||
| ', self body |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What? There seems to be something fishy here. I have yet to determine the cause.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume pulling the changes from your repository got me a somehow inconsistent image store. It also did not contain the file object at first, as I already commented. Upon committing edb0cf4 I excluded the deletion of the "tracked files" and some other stuff. But I'm not sure if that is related to the problem.