Skip to content

Comments

Bold current branch and remote#64

Merged
jorio merged 3 commits intojorio:masterfrom
lynn:lynn/bold-current
Sep 7, 2025
Merged

Bold current branch and remote#64
jorio merged 3 commits intojorio:masterfrom
lynn:lynn/bold-current

Conversation

@lynn
Copy link
Contributor

@lynn lynn commented Sep 3, 2025

Closes #60. I think it looks pretty good!

image

@jorio
Copy link
Owner

jorio commented Sep 3, 2025

It does look good! I was planning to address your issue in the next version that's just around the corner, but you beat me to it 😄

A few thoughts on UI design:

  • It'd make sense to bold SidebarItem.DetachedHead as well.
  • Bolding an upstream might be confusing if it's not up-to-date with the checked-out branch.
  • Even if we check that the upstream is up-to-date, I'm on the fence about bolding remotes at all. In GraphView, bold already means "checked-out"; and your PR is reinforcing the "checked-out" meaning in the Local Branches section of the sidebar. However, since you can't check out a remote branch directly, bolding an upstream would break the "checked-out" pattern.

What do you think?

(PS: Please try the included test.py - Removing the italics from the upstream font will break a few unit tests.)

@lynn
Copy link
Contributor Author

lynn commented Sep 4, 2025

  • It'd make sense to bold SidebarItem.DetachedHead as well.

Yes, great idea.

  • Bolding an upstream might be confusing if it's not up-to-date with the checked-out branch.

  • Even if we check that the upstream is up-to-date, I'm on the fence about bolding remotes at all. In GraphView, bold already means "checked-out"; and your PR is reinforcing the "checked-out" meaning in the Local Branches section of the sidebar. However, since you can't check out a remote branch directly, bolding an upstream would break the "checked-out" pattern.

Hmm, I get what you mean, but I don't feel the same way. Maybe how I think about it is: precisely because you can't check out a remote branch directly, there is no confusion, no chance of it breaking the pattern. Or: it's bold because it's the upstream of the checked-out branch, so it fits the pattern. And rather than up-to-dateness, I just think of it as communicating: here's where my pushes will go.

Removing the italics from the upstream font will break a few unit tests.

Oops! Fixing them now :)

@jorio jorio merged commit 3742938 into jorio:master Sep 7, 2025
@jorio
Copy link
Owner

jorio commented Sep 7, 2025

After sleeping on it, I agree with you. Thank you for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bold the currently checked-out branch

2 participants