Skip to content

[swa-ui] Fix: menu ceased to work if nil was supplied as help text #395

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

Open
LinqLover wants to merge 1 commit into
base: swa-ui
Choose a base branch
from
+7 −7
Open

[swa-ui] Fix: menu ceased to work if nil was supplied as help text #395

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
8 changes: 4 additions & 4 deletions src/Squit.package/SquitBrowser.class/instance/menuBranchListHook..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ menuBranchListHook: aMenu
{{'Switch to this branch'. #actionBranchSwitch. 'Stash uncommitted changes on the active branch, then checkout the selected branch.'. onlyLocal & onlyInactive}.
{'Switch, but keep uncommitted changes'. #actionBranchSwitchMoveOver. 'Checkout the selected branch and try to move over uncommitted changes to it.'. onlyLocal & onlyInactive}.
{'Create a new branch and switch to it'. #actionBranchCreateAndSwitch. 'Create a new branch at the same commit as this branch and switch to the new branch'. onlyRemote}.
{'Discard uncommitted changes'. #actionBranchResetToTip. nil. onlyActive}.
{'Discard uncommitted changes'. #actionBranchResetToTip. 'Replace any changes in your working copy with the state of the tip of the active branch.'. onlyActive}.
{'Merge into ', activeBranchName. #actionBranchMerge. 'Merge this branch into your active branch ', activeBranchName. onlyInactive}.
'-'.
{'Push'. #actionBranchPush. nil. onlyLocal}}.
{'Push'. #actionBranchPush. 'Push this branch to its upstream remote'. onlyLocal}}.
(onlyLocal and: [hasRemotes]) ifTrue:
[aMenu add: 'Push to' subMenu: self remotesPushSubMenu].
self buildMenu: aMenu from:
{{'Set upstream branch'. #actionSetUpstreamBranch. nil. onlyLocal}.
{{'Set upstream branch'. #actionSetUpstreamBranch. 'Configure the upstream remote of this branch.'. onlyLocal}.
{'Remove upstream branch at the remote'. #actionBranchRemoveUpstream. 'Push the deletion of the remote branch'. onlyWithUpstream}.
'-'.
{'Rename'. #actionBranchRename. nil. onlyLocal}.
{'Rename'. #actionBranchRename. 'Rename this branch'. onlyLocal}.
{'Remove'. #actionBranchRemove}.
'-'.
{'Compare with working copy'. #actionBranchDiffWithWorkingCopy}}].
Expand Down
6 changes: 3 additions & 3 deletions src/Squit.package/SquitBrowser.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@
"loadBranchList" : "jr 5/14/2021 22:56",
"loadCommitList" : "jr 9/5/2020 17:32",
"loadedSelectedObject" : "jr 5/13/2017 19:40",
"menuBranchListHook:" : "jr 3/7/2020 00:37",
"menuCommitListHook:" : "jr 3/5/2020 00:27",
"menuObjectListGeneral:" : "jr 11/3/2020 14:36",
"menuBranchListHook:" : "jr 7/17/2022 19:00",
"menuCommitListHook:" : "jr 1/22/2022 21:35",
"menuObjectListGeneral:" : "jr 7/6/2022 22:30",
"menuObjectListVersionObjectEdition:" : "jr 11/3/2020 14:41",
"menuObjectListWorkingCopyObject:" : "jr 11/3/2020 14:45",
"menuProjectListHook:" : "jr 10/17/2018 13:31",
Expand Down