Skip to content

Commit e45e37d

Browse files
love-lingerlove-linger
committed
feature: supports sort branches by committer date (#1192)
Signed-off-by: leo <longshuang@msn.cn>
1 parent b7fa04d commit e45e37d

File tree

10 files changed

+217
-20
lines changed

10 files changed

+217
-20
lines changed

‎src/Commands/QueryBranches.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public QueryBranches(string repo)
1414
{
1515
WorkingDirectory = repo;
1616
Context = repo;
17-
Args = "branch -l --all -v --format=\"%(refname)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
17+
Args = "branch -l --all -v --format=\"%(refname)%00%(committerdate:unix)%00%(objectname)%00%(HEAD)%00%(upstream)%00%(upstream:trackshort)\"";
1818
}
1919

2020
public List<Models.Branch> Result()
@@ -49,7 +49,7 @@ public QueryBranches(string repo)
4949
private Models.Branch ParseLine(string line)
5050
{
5151
var parts = line.Split('\0');
52-
if (parts.Length != 5)
52+
if (parts.Length != 6)
5353
return null;
5454

5555
var branch = new Models.Branch();
@@ -83,12 +83,13 @@ private Models.Branch ParseLine(string line)
8383
}
8484

8585
branch.FullName = refName;
86-
branch.Head = parts[1];
87-
branch.IsCurrent = parts[2] == "*";
88-
branch.Upstream = parts[3];
86+
branch.CommitterDate = ulong.Parse(parts[1]);
87+
branch.Head = parts[2];
88+
branch.IsCurrent = parts[3] == "*";
89+
branch.Upstream = parts[4];
8990
branch.IsUpstreamGone = false;
9091

91-
if (branch.IsLocal && !string.IsNullOrEmpty(parts[4]) && !parts[4].Equals("=", StringComparison.Ordinal))
92+
if (branch.IsLocal && !string.IsNullOrEmpty(parts[5]) && !parts[5].Equals("=", StringComparison.Ordinal))
9293
branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();
9394
else
9495
branch.TrackStatus = new Models.BranchTrackStatus();

‎src/Models/Branch.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,17 @@ public override string ToString()
2323
}
2424
}
2525

26+
public enum BranchSortMode
27+
{
28+
Name = 0,
29+
CommitterDate,
30+
}
31+
2632
public class Branch
2733
{
2834
public string Name { get; set; }
2935
public string FullName { get; set; }
36+
public ulong CommitterDate { get; set; }
3037
public string Head { get; set; }
3138
public bool IsLocal { get; set; }
3239
public bool IsCurrent { get; set; }

‎src/Models/RepositorySettings.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ public bool OnlyHighlighCurrentBranchInHistories
3838
set;
3939
} = false;
4040

41+
public BranchSortMode LocalBranchSortMode
42+
{
43+
get;
44+
set;
45+
} = BranchSortMode.Name;
46+
47+
public BranchSortMode RemoteBranchSortMode
48+
{
49+
get;
50+
set;
51+
} = BranchSortMode.Name;
52+
4153
public TagSortMode TagSortMode
4254
{
4355
get;

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,9 @@
572572
<x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">Branch:</x:String>
573573
<x:String x:Key="Text.Repository.Abort" xml:space="preserve">ABORT</x:String>
574574
<x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">Auto fetching changes from remotes...</x:String>
575+
<x:String x:Key="Text.Repository.BranchSort" xml:space="preserve">Sort</x:String>
576+
<x:String x:Key="Text.Repository.BranchSort.ByCommitterDate" xml:space="preserve">By Committer Date</x:String>
577+
<x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">By Name</x:String>
575578
<x:String x:Key="Text.Repository.Clean" xml:space="preserve">Cleanup(GC &amp; Prune)</x:String>
576579
<x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">Run `git gc` command for this repository.</x:String>
577580
<x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">Clear all</x:String>
@@ -602,7 +605,7 @@
602605
<x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Open in External Tools</x:String>
603606
<x:String x:Key="Text.Repository.Refresh" xml:space="preserve">Refresh</x:String>
604607
<x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTES</x:String>
605-
<x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">ADD REMOTE</x:String>
608+
<x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">Add Remote</x:String>
606609
<x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
607610
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Author</x:String>
608611
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
@@ -615,10 +618,10 @@
615618
<x:String x:Key="Text.Repository.Skip" xml:space="preserve">SKIP</x:String>
616619
<x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistics</x:String>
617620
<x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULES</x:String>
618-
<x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">ADD SUBMODULE</x:String>
619-
<x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">UPDATE SUBMODULE</x:String>
621+
<x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">Add Submodule</x:String>
622+
<x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">Update Submodule</x:String>
620623
<x:String x:Key="Text.Repository.Tags" xml:space="preserve">TAGS</x:String>
621-
<x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">NEW TAG</x:String>
624+
<x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">New Tag</x:String>
622625
<x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">By Creator Date</x:String>
623626
<x:String x:Key="Text.Repository.Tags.OrderByNameAsc" xml:space="preserve">By Name (Ascending)</x:String>
624627
<x:String x:Key="Text.Repository.Tags.OrderByNameDes" xml:space="preserve">By Name (Descending)</x:String>
@@ -628,8 +631,8 @@
628631
<x:String x:Key="Text.Repository.ViewLogs" xml:space="preserve">View Logs</x:String>
629632
<x:String x:Key="Text.Repository.Visit" xml:space="preserve">Visit '{0}' in Browser</x:String>
630633
<x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">WORKTREES</x:String>
631-
<x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">ADD WORKTREE</x:String>
632-
<x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">PRUNE</x:String>
634+
<x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">Add Worktree</x:String>
635+
<x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">Prune</x:String>
633636
<x:String x:Key="Text.RepositoryURL" xml:space="preserve">Git Repository URL</x:String>
634637
<x:String x:Key="Text.Reset" xml:space="preserve">Reset Current Branch To Revision</x:String>
635638
<x:String x:Key="Text.Reset.Mode" xml:space="preserve">Reset Mode:</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,9 @@
576576
<x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">分支 ：</x:String>
577577
<x:String x:Key="Text.Repository.Abort" xml:space="preserve">终止合并</x:String>
578578
<x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">自动拉取远端变更中...</x:String>
579+
<x:String x:Key="Text.Repository.BranchSort" xml:space="preserve">排序方式</x:String>
580+
<x:String x:Key="Text.Repository.BranchSort.ByCommitterDate" xml:space="preserve">按提交时间</x:String>
581+
<x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">按名称</x:String>
579582
<x:String x:Key="Text.Repository.Clean" xml:space="preserve">清理本仓库(GC)</x:String>
580583
<x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">本操作将执行`git gc`命令。</x:String>
581584
<x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">清空过滤规则</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,9 @@
576576
<x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">分支:</x:String>
577577
<x:String x:Key="Text.Repository.Abort" xml:space="preserve">中止</x:String>
578578
<x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">自動提取遠端變更中...</x:String>
579+
<x:String x:Key="Text.Repository.BranchSort" xml:space="preserve">排序</x:String>
580+
<x:String x:Key="Text.Repository.BranchSort.ByCommitterDate" xml:space="preserve">依建立時間</x:String>
581+
<x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">依名稱升序</x:String>
579582
<x:String x:Key="Text.Repository.Clean" xml:space="preserve">清理本存放庫 (GC)</x:String>
580583
<x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">本操作將執行 `git gc` 命令。</x:String>
581584
<x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">清空篩選規則</x:String>

‎src/ViewModels/BranchTreeNode.cs‎

Lines changed: 86 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class BranchTreeNode : ObservableObject
1010
public string Name { get; private set; } = string.Empty;
1111
public string Path { get; private set; } = string.Empty;
1212
public object Backend { get; private set; } = null;
13+
public ulong TimeToSort { get; private set; } = 0;
1314
public int Depth { get; set; } = 0;
1415
public bool IsSelected { get; set; } = false;
1516
public List<BranchTreeNode> Children { get; private set; } = new List<BranchTreeNode>();
@@ -62,6 +63,12 @@ public class Builder
6263
public List<BranchTreeNode> Remotes => _remotes;
6364
public List<string> InvalidExpandedNodes => _invalidExpandedNodes;
6465

66+
public Builder(Models.BranchSortMode localSortMode, Models.BranchSortMode remoteSortMode)
67+
{
68+
_localSortMode = localSortMode;
69+
_remoteSortMode = remoteSortMode;
70+
}
71+
6572
public void SetExpandedNodes(List<string> expanded)
6673
{
6774
foreach (var node in expanded)
@@ -72,6 +79,7 @@ public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool
7279
{
7380
var folders = new Dictionary<string, BranchTreeNode>();
7481

82+
var fakeRemoteTime = (ulong)remotes.Count;
7583
foreach (var remote in remotes)
7684
{
7785
var path = $"refs/remotes/{remote.Name}";
@@ -81,8 +89,10 @@ public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool
8189
Path = path,
8290
Backend = remote,
8391
IsExpanded = bForceExpanded || _expanded.Contains(path),
92+
TimeToSort = fakeRemoteTime,
8493
};
8594

95+
fakeRemoteTime--;
8696
folders.Add(path, node);
8797
_remotes.Add(node);
8898
}
@@ -108,8 +118,26 @@ public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool
108118
}
109119

110120
folders.Clear();
111-
SortNodes(_locals);
112-
SortNodes(_remotes);
121+
122+
if (_localSortMode == Models.BranchSortMode.Name)
123+
{
124+
SortNodesByName(_locals);
125+
}
126+
else
127+
{
128+
SetTimeToSortRecusive(_locals);
129+
SortNodesByTime(_locals);
130+
}
131+
132+
if (_remoteSortMode == Models.BranchSortMode.Name)
133+
{
134+
SortNodesByName(_remotes);
135+
}
136+
else
137+
{
138+
SetTimeToSortRecusive(_remotes);
139+
SortNodesByTime(_remotes);
140+
}
113141
}
114142

115143
private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Dictionary<string, BranchTreeNode> folders, string prefix, bool bForceExpanded)
@@ -124,6 +152,7 @@ private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Di
124152
Path = fullpath,
125153
Backend = branch,
126154
IsExpanded = false,
155+
TimeToSort = branch.CommitterDate,
127156
});
128157
return;
129158
}
@@ -175,10 +204,11 @@ private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Di
175204
Path = fullpath,
176205
Backend = branch,
177206
IsExpanded = false,
207+
TimeToSort = branch.CommitterDate,
178208
});
179209
}
180210

181-
private void SortNodes(List<BranchTreeNode> nodes)
211+
private void SortNodesByName(List<BranchTreeNode> nodes)
182212
{
183213
nodes.Sort((l, r) =>
184214
{
@@ -192,9 +222,61 @@ private void SortNodes(List<BranchTreeNode> nodes)
192222
});
193223

194224
foreach (var node in nodes)
195-
SortNodes(node.Children);
225+
SortNodesByName(node.Children);
226+
}
227+
228+
private void SortNodesByTime(List<BranchTreeNode> nodes)
229+
{
230+
nodes.Sort((l, r) =>
231+
{
232+
if (l.Backend is Models.Branch { IsDetachedHead: true })
233+
return -1;
234+
235+
if (l.Backend is Models.Branch)
236+
{
237+
if (r.Backend is Models.Branch)
238+
return r.TimeToSort == l.TimeToSort ? Models.NumericSort.Compare(l.Name, r.Name) : r.TimeToSort.CompareTo(l.TimeToSort);
239+
else
240+
return 1;
241+
}
242+
243+
if (r.Backend is Models.Branch)
244+
return -1;
245+
246+
if (r.TimeToSort == l.TimeToSort)
247+
return Models.NumericSort.Compare(l.Name, r.Name);
248+
249+
return r.TimeToSort.CompareTo(l.TimeToSort);
250+
});
251+
252+
foreach (var node in nodes)
253+
SortNodesByTime(node.Children);
254+
}
255+
256+
private ulong SetTimeToSortRecusive(List<BranchTreeNode> nodes)
257+
{
258+
var recent = (ulong)0;
259+
260+
foreach (var node in nodes)
261+
{
262+
if (node.Backend is Models.Branch)
263+
{
264+
recent = Math.Max(recent, node.TimeToSort);
265+
continue;
266+
}
267+
268+
var time = SetTimeToSortRecusive(node.Children);
269+
recent = Math.Max(recent, time);
270+
271+
if (node.Backend is not Models.Remote)
272+
node.TimeToSort = time;
273+
}
274+
275+
return recent;
196276
}
197277

278+
private readonly Models.BranchSortMode _localSortMode = Models.BranchSortMode.Name;
279+
private readonly Models.BranchSortMode _remoteSortMode = Models.BranchSortMode.Name;
198280
private readonly List<BranchTreeNode> _locals = new List<BranchTreeNode>();
199281
private readonly List<BranchTreeNode> _remotes = new List<BranchTreeNode>();
200282
private readonly List<string> _invalidExpandedNodes = new List<string>();

‎src/ViewModels/Repository.cs‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2229,6 +2229,51 @@ public ContextMenu CreateContextMenuForTag(Models.Tag tag)
22292229
return menu;
22302230
}
22312231

2232+
public ContextMenu CreateContextMenuForBranchSortMode(bool local)
2233+
{
2234+
var mode = local ? _settings.LocalBranchSortMode : _settings.RemoteBranchSortMode;
2235+
var changeMode = new Action<Models.BranchSortMode>(m =>
2236+
{
2237+
if (local)
2238+
_settings.LocalBranchSortMode = m;
2239+
else
2240+
_settings.RemoteBranchSortMode = m;
2241+
2242+
var builder = BuildBranchTree(_branches, _remotes);
2243+
LocalBranchTrees = builder.Locals;
2244+
RemoteBranchTrees = builder.Remotes;
2245+
});
2246+
2247+
var byNameAsc = new MenuItem();
2248+
byNameAsc.Header = App.Text("Repository.BranchSort.ByName");
2249+
if (mode == Models.BranchSortMode.Name)
2250+
byNameAsc.Icon = App.CreateMenuIcon("Icons.Check");
2251+
byNameAsc.Click += (_, ev) =>
2252+
{
2253+
if (mode != Models.BranchSortMode.Name)
2254+
changeMode(Models.BranchSortMode.Name);
2255+
2256+
ev.Handled = true;
2257+
};
2258+
2259+
var byCommitterDate = new MenuItem();
2260+
byCommitterDate.Header = App.Text("Repository.BranchSort.ByCommitterDate");
2261+
if (mode == Models.BranchSortMode.CommitterDate)
2262+
byCommitterDate.Icon = App.CreateMenuIcon("Icons.Check");
2263+
byCommitterDate.Click += (_, ev) =>
2264+
{
2265+
if (mode != Models.BranchSortMode.CommitterDate)
2266+
changeMode(Models.BranchSortMode.CommitterDate);
2267+
2268+
ev.Handled = true;
2269+
};
2270+
2271+
var menu = new ContextMenu();
2272+
menu.Items.Add(byNameAsc);
2273+
menu.Items.Add(byCommitterDate);
2274+
return menu;
2275+
}
2276+
22322277
public ContextMenu CreateContextMenuForTagSortMode()
22332278
{
22342279
var mode = _settings.TagSortMode;
@@ -2398,7 +2443,7 @@ private LauncherPage GetOwnerPage()
23982443

23992444
private BranchTreeNode.Builder BuildBranchTree(List<Models.Branch> branches, List<Models.Remote> remotes)
24002445
{
2401-
var builder = new BranchTreeNode.Builder();
2446+
var builder = new BranchTreeNode.Builder(_settings.LocalBranchSortMode, _settings.RemoteBranchSortMode);
24022447
if (string.IsNullOrEmpty(_filter))
24032448
{
24042449
builder.SetExpandedNodes(_settings.ExpandedBranchNodesInSideBar);

‎src/Views/Repository.axaml‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,20 @@
202202
<Grid Grid.Row="2" x:Name="LeftSidebarGroups" Margin="0,4,0,0" RowDefinitions="28,Auto,28,Auto,28,Auto,28,Auto,28,Auto" SizeChanged="OnLeftSidebarSizeChanged">
203203
<!-- Local Branches -->
204204
<ToggleButton Grid.Row="0" Classes="group_expander" IsChecked="{Binding IsLocalBranchGroupExpanded, Mode=TwoWay}">
205-
<Grid ColumnDefinitions="16,*">
205+
<Grid ColumnDefinitions="16,*,Auto,Auto">
206206
<Path Grid.Column="0" Width="11" Height="11" HorizontalAlignment="Left" Data="{StaticResource Icons.Local}" Fill="{DynamicResource Brush.FG2}"/>
207207
<TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.LocalBranches}"/>
208+
<Button Grid.Column="2"
209+
Classes="icon_button"
210+
Width="14"
211+
Margin="8,0,0,0"
212+
Click="OnOpenSortLocalBranchMenu"
213+
ToolTip.Tip="{DynamicResource Text.Repository.BranchSort}">
214+
<Path Width="12" Height="12" Data="{StaticResource Icons.Order}"/>
215+
</Button>
216+
<Button Grid.Column="3" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding CreateNewBranch}" ToolTip.Tip="{DynamicResource Text.Repository.NewBranch}">
217+
<Path Width="12" Height="12" Data="{StaticResource Icons.Branch.Add}"/>
218+
</Button>
208219
</Grid>
209220
</ToggleButton>
210221
<v:BranchTree Grid.Row="1"
@@ -218,10 +229,18 @@
218229

219230
<!-- Remotes -->
220231
<ToggleButton Grid.Row="2" Classes="group_expander" IsChecked="{Binding IsRemoteGroupExpanded, Mode=TwoWay}">
221-
<Grid ColumnDefinitions="16,*,Auto">
232+
<Grid ColumnDefinitions="16,*,Auto,Auto">
222233
<Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Data="{StaticResource Icons.Remotes}" Fill="{DynamicResource Brush.FG2}"/>
223234
<TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Remotes}"/>
224-
<Button Grid.Column="2" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding AddRemote}" ToolTip.Tip="{DynamicResource Text.Repository.Remotes.Add}">
235+
<Button Grid.Column="2"
236+
Classes="icon_button"
237+
Width="14"
238+
Margin="8,0,0,0"
239+
Click="OnOpenSortRemoteBranchMenu"
240+
ToolTip.Tip="{DynamicResource Text.Repository.BranchSort}">
241+
<Path Width="12" Height="12" Data="{StaticResource Icons.Order}"/>
242+
</Button>
243+
<Button Grid.Column="3" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding AddRemote}" ToolTip.Tip="{DynamicResource Text.Repository.Remotes.Add}">
225244
<Path Width="12" Height="12" Data="{StaticResource Icons.Remote.Add}"/>
226245
</Button>
227246
</Grid>

0 commit comments

Comments
 (0)