-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Expose assets instead of asset files in workspace
- Loading branch information
Showing
4 changed files
with
6 additions
and
7 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
src/GitS-Core.package/GSAssetChange.class/instance/workspaceBindings.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 |
---|---|---|
@@ -1,6 +1,6 @@ | ||
workspace | ||
workspaceBindings | ||
^ Dictionary newFrom: { | ||
^ (Dictionary newFrom: { | ||
'old' -> self from. | ||
'new' -> self to. | ||
} | ||
}) collect: [:each | each ifNotNil: #asset] |
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
5 changes: 2 additions & 3 deletions
5
src/GitS-Core.package/GSConflictingAssetChange.class/instance/workspaceBindings.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 |
---|---|---|
@@ -1,9 +1,8 @@ | ||
workspace | ||
workspaceBindings | ||
^ Dictionary newFrom: { | ||
^ (Dictionary newFrom: { | ||
'current' -> self left. | ||
'incoming' -> self right. | ||
'base' -> self base. | ||
'resolution' -> self resolution. | ||
} | ||
|
||
}) collect: [:each | each ifNotNil: #asset] |
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