Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Sort branch lists alphabetically #1576

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

Merged
danirabbit merged 3 commits into from
May 28, 2025
Merged

Sort branch lists alphabetically #1576

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c76aee7
Sort branch lists alphabetically
jeremypw May 27, 2025
6d7a80a
Use string.collate
jeremypw May 28, 2025
b6dab7b
Merge branch 'master' into jeremypw/remote-branches/sort
danirabbit May 28, 2025
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
12 changes: 10 additions & 2 deletions src/Services/MonitoredRepository.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,17 @@ namespace Scratch.Services {
return "";
}

//Returns an alphabetically sorted list of local branch names
public unowned List<string> get_local_branches () {
unowned List<string> branches = null;
try {
var branch_enumerator = git_repo.enumerate_branches (Ggit.BranchType.LOCAL);
foreach (Ggit.Ref branch_ref in branch_enumerator) {
if (branch_ref is Ggit.Branch) {
branches.append (((Ggit.Branch)branch_ref).get_name ());
branches.insert_sorted (
((Ggit.Branch)branch_ref).get_name (),
string.collate
);
}
}
} catch (Error e) {
Expand All @@ -173,6 +177,7 @@ namespace Scratch.Services {
return branches;
}

//Returns an alphabetically sorted list of remote branch names
public unowned List<string> get_remote_branches () {
unowned List<string> branch_names = null;
try {
Expand All @@ -183,7 +188,10 @@ namespace Scratch.Services {
if (!remote_name.has_suffix ("HEAD") &&
!has_local_branch_name (remote_name.substring (ORIGIN_PREFIX.length))) {

branch_names.append (branch_ref.get_shorthand ());
branch_names.insert_sorted (
branch_ref.get_shorthand (),
string.collate
);
}

remote_branch_ref_list.append (branch_ref);
Expand Down