Add remote branch sorting menu

[hosaka]

• PR Description

Continuation of #3158 discussion, fixes #1412. Implemented using AppState rather than a new config prop. Remote branch order can be changed at runtime via the s keybinding and changes are stored in state.yml.

Function to create the sort menu was placed in refs_helper.go in the hopes of it being re-used for sorting other refs (local branches, maybe tags) in the future. I've added localization strings for the languages I can speak.

• Please check if the PR fulfills these requirements

• Cheatsheets are up-to-date (run go generate ./...)
• Code has been formatted (see here)
• Tests have been added/updated (see here for the integration test guide)
• Text is internationalised (see here)
• Docs (specifically docs/Config.md) have been updated if necessary
• You've read through your own file changes for silly mistakes etc

[hosaka]

@stefanhaller, any suggestions would be appreciated!

[stefanhaller]

Great work! Very useful feature, I'm already using it locally. 😄

I took the liberty of pushing a commit that adds an integration test.

A few thoughts below (some of which may be a matter of taste).

[hosaka]

Thanks for the suggestions! I've added more changes that address the points you made, AppState.RemoteBranchSortOrder is now an "enum" that takes alphabetical|date values. The remote_loader.go::getRemoteBranchesByRemoteName() will default to refname sort.

[stefanhaller]

Very nice, thanks for addressing everything thoroughly.

I'm a big fan of clean commit histories, so I force-pushed to replace your new commit with three fixup commits (code is unchanged), please have a look for next time. Feel free to squash them in. Don't hesitate to ask if you're not sure what this all means.

Two more very small things below.

[hosaka]

Should I squash down all the commits or just the fixups? Not sure what the preferred method is :)

[stefanhaller]

Just the fixups! Easy to do by selecting the first commit of your branch, and pressing Shift-S (for "Squash all 'fixup!' commits above selected commit (autosquash)")

Sometimes it's a matter of taste how to structure the commits (as with code). For example, you could consider squashing my test into your second commit, this would make sense. (Your choice.)

[stefanhaller]

@mark2185 Do you have any thoughts on this? I think I'd be comfortable enough merging this without Jesse's review.

[hosaka]

Squashed into the implementation and testing commits.

[stefanhaller]

Squashed into the implementation and testing commits.

Um, is that really what you wanted to do? Now you squashed your two initial commits, but left the test commit separate. I thought it made more sense to keep your initial commits separate, and (maybe) squash the test commit into the second of those.

[hosaka]

First two commits logically belong together part of the same implementation, I am okay them being bundled up into one commit. I kept the test commit separate as it attributes you, rather than me (if I understand the state after squash correctly :))

[stefanhaller]

OK, happy with that too, all good. :)

[mark2185]

@mark2185 Do you have any thoughts on this? I think I'd be comfortable enough merging this without Jesse's review.

Actually I don't, I'm usually not using the feature so I don't have anything to weight in on. The code looks pretty tame, and the tests pass.