Skip to content

experimental: indicate branches with stashes in git browser's commit list #393

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.

Sign up for GitHub

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

Draft
LinqLover wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −1
Draft

experimental: indicate branches with stashes in git browser's commit list #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Squit.package/SquitBrowser.class/instance/branchListIconAt..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ branchListIconAt: anIndex
anIndex > 1 ifFalse: [^ nil].
anIndex = indexOfActiveHistorianInBranchList
ifTrue: [^ ToolIcons testGreen].
(self projectSelection repository historianForTemporaryVersionsOn: (self projectSelection repository historianNamed: (self branchList at: anIndex))) ifNotNil: [:temporaryHistorian |
temporaryHistorian version ifNotNil: [:temporaryVersion |
(temporaryVersion parents notEmpty and: [(temporaryVersion patchRelativeToBase: temporaryVersion parents first) diffs notEmpty])
ifTrue: [^ ToolIcons testOrange]]].
anIndex > (indexOfFirstRemoteTrackingBranch ifNil: [self branchList size])
ifTrue: [^ ToolIcons arrowUp].
^ ToolIcons blank
2 changes: 1 addition & 1 deletion src/Squit.package/SquitBrowser.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"addProjectIfCanceled:" : "jr 11/18/2021 22:49",
"branchButtonHelpText" : "jr 12/22/2021 21:09",
"branchList" : "jr 12/22/2021 23:46",
"branchListIconAt:" : "jr 5/14/2021 22:57",
"branchListIconAt:" : "ct 10/4/2022 21:04",
"branchListIfRepositoryDoesNotExist" : "jr 12/22/2021 23:45",
"branchListMenu:shifted:" : "jr 1/13/2018 00:31",
"branchSelection" : "jr 6/27/2020 09:50",
Expand Down