Jesse Duffield 017367f940 Show commit merged/push statuses against branches ...

When viewing branches in an enlargened window, we now colour the commit shas based on
whether the branch has been merged to a main branch and whether it's been pushed to
the upstream.

This isn't using the exact same code as we use for commits, so it's possible we'll get
a colour mismatch when the user checks out a branch and views the commits in the commits
view, but if we come across that situation we'll just need to fix it.

2023-10-11 15:51:58 +11:00

..

helpers

Show commit merged/push statuses against branches

2023-10-11 15:51:58 +11:00

attach.go

…

base_controller.go

…

basic_commits_controller.go

fix: use Error method to handle the commit url copy from unknown service

2023-09-12 19:06:08 +02:00

bisect_controller.go

…

branches_controller.go

Disallow checking out another branch while the current one is being pulled

2023-10-08 18:45:36 +02:00

command_log_controller.go

…

commit_description_controller.go

Add key binding for switching from the commit message panel to an editor

2023-08-21 10:03:34 +02:00

commit_message_controller.go

Add key binding for switching from the commit message panel to an editor

2023-08-21 10:03:34 +02:00

commits_files_controller.go

Don't pass ignoreWhitespace to git commands

2023-09-04 17:50:49 +02:00

common.go

…

confirmation_controller.go

…

context_lines_controller.go

Move diff context size from UserConfig to AppState

2023-09-05 13:55:30 +02:00

custom_command_action.go

Standardise on using lo for slice functions

2023-07-30 18:51:23 +10:00

custom_patch_options_menu_action.go

…

diffing_menu_action.go

…

files_controller.go

Use WithWaitingStatus instead of WithLoaderPanel for pull/push/fetch

2023-09-20 13:30:49 +02:00

files_remove_controller.go

Support custom keybindings for confirm discard

2023-08-25 08:50:05 -05:00

filter_controller.go

…

filtering_menu_action.go

…

git_flow_controller.go

…

global_controller.go

…

jump_to_side_window_controller.go

…

list_controller.go

Add a mechanism to insert non-model items into list contexts

2023-08-29 08:04:47 +02:00

local_commits_controller.go

Disabled paste when there are no copied commits

2023-09-18 10:20:23 +02:00

menu_controller.go

Add DisabledReason field to MenuItem

2023-09-18 10:15:11 +02:00

merge_conflicts_controller.go

Moves log related translations into its own Tr.Log. namespace

2023-07-31 19:42:41 -04:00

options_menu_action.go

Add Enabled func to Binding

2023-09-18 10:20:23 +02:00

patch_building_controller.go

…

patch_explorer_controller.go

Pass UserConfig to checkScrollUp/Down instead of just the scrollOffMargin

2023-08-21 08:10:28 +02:00

quit_actions.go

Update repo switch logic

2023-07-30 18:35:23 +10:00

reflog_commits_controller.go

Don't pass ignoreWhitespace to git commands

2023-09-04 17:50:49 +02:00

remote_branches_controller.go

Allow deleting remote tags/branches from local tag/branch views (#2738)

2023-08-10 17:39:26 +10:00

remotes_controller.go

feat: add jump-to-panel label setting

2023-09-09 09:45:08 +02:00

screen_mode_actions.go

…

scroll_off_margin_test.go

Add tests for scroll-off margin of zero

2023-08-21 08:10:28 +02:00

scroll_off_margin.go

Add scrollOffEnabled config

2023-08-21 09:03:45 +02:00

search_controller.go

…

search_prompt_controller.go

Add search history

2023-09-20 08:35:41 +03:00

side_window_controller.go

…

snake_controller.go

…

staging_controller.go

…

stash_controller.go

Don't pass ignoreWhitespace to git commands

2023-09-04 17:50:49 +02:00

status_controller.go

Add inline status for pushing/pulling/fast-forwarding branches

2023-10-08 18:45:36 +02:00

sub_commits_controller.go

Don't pass ignoreWhitespace to git commands

2023-09-04 17:50:49 +02:00

submodules_controller.go

Don't pass ignoreWhitespace to git commands

2023-09-04 17:50:49 +02:00

suggestions_controller.go

…

switch_to_diff_files_controller.go

feat: add jump-to-panel label setting

2023-09-09 09:45:08 +02:00

switch_to_sub_commits_controller.go

Add "Show divergence from upstream" entry to Upstream menu in branches panel

2023-08-29 08:16:40 +02:00

sync_controller.go

Disallow pulling/pushing a branch while the branch is pushed or pulled

2023-10-08 18:45:36 +02:00

tags_controller.go

Add inline status for pushing tags and deleting remote tags

2023-10-08 18:45:36 +02:00

toggle_whitespace_action.go

Extract a SaveAppStateAndLogError function

2023-09-04 17:50:49 +02:00

types.go

…

undo_controller.go

…

vertical_scroll_controller.go

…

workspace_reset_controller.go

Reset origin when clearing view

2023-08-08 22:01:43 +10:00

worktree_options_controller.go

Support creating worktrees from refs

2023-07-30 18:35:22 +10:00

worktrees_controller.go

Use fields rather than methods on worktrees

2023-07-30 18:35:24 +10:00