-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
71 additions
and
21 deletions.
There are no files selected for viewing
30 changes: 24 additions & 6 deletions
30
src/GitS-Core.package/GSGitWorkingCopy.class/instance/addOtherRefsRootTo.references..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,13 +1,31 @@ | ||
ref-tree | ||
addOtherRefsRootTo: aRefTree references: aCollection | ||
| other | | ||
other := aRefTree ensureDirectory: '' label: 'other refs'. | ||
other := aRefTree | ||
ensureDirectory: '' | ||
label: 'other refs' | ||
tooltip: 'Everything that does not fit into the descriptions above.'. | ||
((aCollection | ||
select: [:each | each beginsWith: 'refs/squeak/']) | ||
collect: [:each | (((each splitBy: '/') first: 3) joinSeparatedBy: '/'), $/]) | ||
asSet do: [:imageRef | | image | | ||
image := other | ||
ensureDirectory: imageRef | ||
label: (imageRef = self refsBaseName ifTrue: ['this image'] ifFalse: ['a different image']). | ||
asSet do: [:imageRef | | ||
imageRef = self refsBaseName | ||
ifFalse: [image ensureDirectory: imageRef, 'heads/' label: 'local branches']]. | ||
ifTrue: [ | ||
other | ||
ensureDirectory: imageRef | ||
label: 'this image' | ||
tooltip: 'Other refs associated with this image. | ||
There may be other images that use the same repository on disk. | ||
Refs associated with them will not be listed here, but in their own directories.' | ||
withoutLineEndings withBlanksCondensed] | ||
ifFalse: [ | image | | ||
image := other | ||
ensureDirectory: imageRef | ||
label: 'a different image' | ||
tooltip: 'There is another image that uses the same repository on disk. | ||
The refs listed here are associated with that image.' | ||
withoutLineEndings withBlanksCondensed. | ||
image | ||
ensureDirectory: imageRef, 'heads/' | ||
label: 'local branches' | ||
tooltip: 'Local branches of the other image.']]. |
26 changes: 22 additions & 4 deletions
26
src/GitS-Core.package/GSGitWorkingCopy.class/instance/addRefTreeRootsTo.references..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,11 +1,29 @@ | ||
ref-tree | ||
addRefTreeRootsTo: aRefTree references: aCollection | ||
aRefTree ensureDirectory: self branchesBaseName label: 'local branches'. | ||
aRefTree | ||
ensureDirectory: self branchesBaseName | ||
label: 'local branches' | ||
tooltip: 'Local branches are those that exist in this image. | ||
They are not visible from your system''s git unless you make them available | ||
as a separate external branch via the context menu.' | ||
withoutLineEndings withBlanksCondensed. | ||
self remoteNames do: [:each | | ||
aRefTree | ||
ensureDirectory: self remoteRefBaseName, each, $/ | ||
label: ('remote branches on {1}' format: {each printString})]. | ||
label: ('remote branches on {1}' format: {each printString}) | ||
tooltip: 'These branches exist on the remote. | ||
You cannot directly change these branches, | ||
but you can create local branches from them via the context menu | ||
and then push your new commits to the remote.' | ||
withoutLineEndings withBlanksCondensed]. | ||
aRefTree | ||
ensureDirectory: self gitBranchesBaseName label: 'external branches'; | ||
ensureDirectory: 'refs/tags/' label: 'tags'. | ||
ensureDirectory: self gitBranchesBaseName | ||
label: 'external branches' | ||
tooltip: 'External branches are those available via your system''s git. | ||
You can create local branches from these to edit in the image | ||
or merge these into your local branches.' | ||
withoutLineEndings withBlanksCondensed; | ||
ensureDirectory: 'refs/tags/' | ||
label: 'tags' | ||
tooltip: 'Tags are immovable references to commits.'. | ||
self addOtherRefsRootTo: aRefTree references: aCollection. |
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
3 changes: 3 additions & 0 deletions
3
src/GitS-Core.package/GSRefTree.class/instance/balloonText.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,3 @@ | ||
accessing | ||
balloonText | ||
^ self tooltip ifNil: [super balloonText] |
6 changes: 0 additions & 6 deletions
6
src/GitS-Core.package/GSRefTree.class/instance/ensureDirectory.label..st
This file was deleted.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
src/GitS-Core.package/GSRefTree.class/instance/ensureDirectory.label.tooltip..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 @@ | ||
adding | ||
ensureDirectory: refString label: labelString tooltip: tooltipString | ||
^ (self ensureTree: refString) | ||
compressible: false; | ||
label: labelString; | ||
tooltip: tooltipString; | ||
yourself |
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,3 @@ | ||
accessing | ||
tooltip: aString | ||
tooltip := aString |
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,3 @@ | ||
accessing | ||
tooltip | ||
^ tooltip |
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