sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
276 stars 14 forks source link

Indicate all references (local/remote branches and tags) for the visible branch #1064

Open csk-ableton opened 3 years ago

csk-ableton commented 3 years ago

Problem description

I want to identify immediately how my current branch relates to its remote branch(es) and local references (branches and tags). This has a couple of reasons:

I usually hide all but my current branch in the repo, because it has hundreds of branches and the graph isn't useful to me without doing so. However it's painful to lose the context around my branch.

Preferred solution

When calling "Hide All Branches Except ..." I want to see only the commits of this branch but I want to see a label for all other references in the repository in addition. This is the default behavior of gitk which I still miss a lot.

This is an extension to the request https://github.com/sublimehq/sublime_merge/issues/933.

Alternatives

It would already be an improvement if I can "Hide all branches except" but still show the related remote branch automatically without having to turn it on manually.

Screenshots

This is the default of showing all branches and it's hard to understand what's going on (at least for me):

Screenshot 2021-02-19 at 15 39 31

This is what I get after "Hide All Branches Except..."

Screenshot 2021-02-19 at 15 39 45

This is what I would like to have. I can see that my branch is pushed and it is based on the branch main but not on origin/main:

Screenshot 2021-02-19 at 15 41 50
srbs commented 3 years ago

related: #220

dpjohnst commented 3 years ago

Hi @csk-ableton,

Thank you for sharing this feedback with the team. If I understand correctly, a command such as Hide all except reachable branches for a commit would do the trick for you - is this correct?

Kind regards, - Dylan

csk-ableton commented 3 years ago

Hi Dylan,

Thank you for your quick response.

If I understand correctly this command would take a commit or branch as an argument to decide what's reachable? Or does it use the currently visible commits for deciding what is reachable? Both would be fine for me but I would prefer the former. I would otherwise have to call two commands for my common use-case of showing the currently checked out branch + all reachable branches.

I would appreciate to see reachable tags as well. However the suggested command would be a huge improvement for me.

Best, Chris

vladimir-bebeshko commented 3 years ago

It would be nice to see in the default view the same references as in the output of git log --graph --oneline command. And after switching to another branch the information should update automatically without having to call Hide all except reachable branches again.