Skip to content

Commit 61bb0f7

Browse files
love-lingerlove-linger
committed
feature: show submodule's URL in tooltip (#1307)
1 parent 20a2396 commit 61bb0f7

File tree

7 files changed

+82
-16
lines changed

7 files changed

+82
-16
lines changed

‎src/Commands/QuerySubmodules.cs‎

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public partial class QuerySubmodules : Command
1111
private static partial Regex REG_FORMAT_STATUS();
1212
[GeneratedRegex(@"^\s?[\w\?]{1,4}\s+(.+)$")]
1313
private static partial Regex REG_FORMAT_DIRTY();
14+
[GeneratedRegex(@"^submodule\.(\S*)\.(\w+)=(.*)$")]
15+
private static partial Regex REG_FORMAT_MODULE_INFO();
1416

1517
public QuerySubmodules(string repo)
1618
{
@@ -25,7 +27,8 @@ public QuerySubmodules(string repo)
2527
var rs = ReadToEnd();
2628

2729
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
28-
var needCheckLocalChanges = new Dictionary<string, Models.Submodule>();
30+
var map = new Dictionary<string, Models.Submodule>();
31+
var needCheckLocalChanges = false;
2932
foreach (var line in lines)
3033
{
3134
var match = REG_FORMAT_STATUS().Match(line);
@@ -49,22 +52,64 @@ public QuerySubmodules(string repo)
4952
break;
5053
default:
5154
module.Status = Models.SubmoduleStatus.Normal;
52-
needCheckLocalChanges.Add(path, module);
55+
needCheckLocalChanges = true;
5356
break;
5457
}
5558

59+
map.Add(path, module);
5660
submodules.Add(module);
5761
}
5862
}
5963

60-
if (needCheckLocalChanges.Count > 0)
64+
if (submodules.Count > 0)
65+
{
66+
Args = "config --file .gitmodules --list";
67+
rs = ReadToEnd();
68+
if (rs.IsSuccess)
69+
{
70+
var modules = new Dictionary<string, ModuleInfo>();
71+
lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
72+
foreach (var line in lines)
73+
{
74+
var match = REG_FORMAT_MODULE_INFO().Match(line);
75+
if (match.Success)
76+
{
77+
var name = match.Groups[1].Value;
78+
var key = match.Groups[2].Value;
79+
var val = match.Groups[3].Value;
80+
81+
if (!modules.TryGetValue(name, out var m))
82+
{
83+
m = new ModuleInfo();
84+
modules.Add(name, m);
85+
}
86+
87+
if (key.Equals("path", StringComparison.Ordinal))
88+
m.Path = val;
89+
else if (key.Equals("url", StringComparison.Ordinal))
90+
m.URL = val;
91+
}
92+
}
93+
94+
foreach (var kv in modules)
95+
{
96+
if (map.TryGetValue(kv.Value.Path, out var m))
97+
m.URL = kv.Value.URL;
98+
}
99+
}
100+
}
101+
102+
if (needCheckLocalChanges)
61103
{
62104
var builder = new StringBuilder();
63-
foreach (var kv in needCheckLocalChanges)
105+
foreach (var kv in map)
64106
{
65-
builder.Append('"');
66-
builder.Append(kv.Key);
67-
builder.Append("\" ");
107+
if (kv.Value.Status == Models.SubmoduleStatus.Normal)
108+
{
109+
builder.Append('"');
110+
builder.Append(kv.Key);
111+
builder.Append("\" ");
112+
}
68113
}
69114

70115
Args = $"--no-optional-locks status -uno --porcelain -- {builder}";
@@ -79,13 +124,19 @@ public QuerySubmodules(string repo)
79124
if (match.Success)
80125
{
81126
var path = match.Groups[1].Value;
82-
if (needCheckLocalChanges.TryGetValue(path, out var m))
127+
if (map.TryGetValue(path, out var m))
83128
m.Status = Models.SubmoduleStatus.Modified;
84129
}
85130
}
86131
}
87132

88133
return submodules;
89134
}
135+
136+
private class ModuleInfo
137+
{
138+
public string Path { get; set; } = string.Empty;
139+
public string URL { get; set; } = string.Empty;
140+
}
90141
}
91142
}

‎src/Models/Submodule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class Submodule
1313
{
1414
public string Path { get; set; } = string.Empty;
1515
public string SHA { get; set; } = string.Empty;
16+
public string URL { get; set; } = string.Empty;
1617
public SubmoduleStatus Status { get; set; } = SubmoduleStatus.Normal;
1718
public bool IsDirty => Status > SubmoduleStatus.NotInited;
1819
}

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@
709709
<x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">not initialized</x:String>
710710
<x:String x:Key="Text.Submodule.Status.RevisionChanged" xml:space="preserve">revision changed</x:String>
711711
<x:String x:Key="Text.Submodule.Status.Unmerged" xml:space="preserve">unmerged</x:String>
712+
<x:String x:Key="Text.Submodule.URL" xml:space="preserve">URL</x:String>
712713
<x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
713714
<x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copy Tag Name</x:String>
714715
<x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">Copy Tag Message</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@
713713
<x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">未初始化</x:String>
714714
<x:String x:Key="Text.Submodule.Status.RevisionChanged" xml:space="preserve">SHA变更</x:String>
715715
<x:String x:Key="Text.Submodule.Status.Unmerged" xml:space="preserve">未解决冲突</x:String>
716+
<x:String x:Key="Text.Submodule.URL" xml:space="preserve">仓库</x:String>
716717
<x:String x:Key="Text.Sure" xml:space="preserve">确 定</x:String>
717718
<x:String x:Key="Text.TagCM.Copy" xml:space="preserve">复制标签名</x:String>
718719
<x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">复制标签信息</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@
713713
<x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">未初始化</x:String>
714714
<x:String x:Key="Text.Submodule.Status.RevisionChanged" xml:space="preserve">SHA 變更</x:String>
715715
<x:String x:Key="Text.Submodule.Status.Unmerged" xml:space="preserve">未解決的衝突</x:String>
716+
<x:String x:Key="Text.Submodule.URL" xml:space="preserve">存放庫</x:String>
716717
<x:String x:Key="Text.Sure" xml:space="preserve">確 定</x:String>
717718
<x:String x:Key="Text.TagCM.Copy" xml:space="preserve">複製標籤名稱</x:String>
718719
<x:String x:Key="Text.TagCM.CopyMessage" xml:space="preserve">複製標籤訊息</x:String>

‎src/Views/Repository.axaml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,30 @@
356356
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Text="{Binding Path}"/>
357357
</StackPanel>
358358

359-
<Grid RowDefinitions="24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
359+
<Grid RowDefinitions="24,24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
360360
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.SHA}" VerticalAlignment="Center"/>
361-
<TextBlock Grid.Row="0" Grid.Column="1" Margin="8,0,0,0" Text="{Binding SHA}" VerticalAlignment="Center"/>
362-
363-
<TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.Submodule.Status}" VerticalAlignment="Center"/>
364-
<Path Grid.Row="1" Grid.Column="1"
361+
<TextBlock Grid.Row="0" Grid.Column="1"
362+
Margin="8,0,0,0"
363+
Text="{Binding SHA}"
364+
Foreground="DarkOrange"
365+
VerticalAlignment="Center"/>
366+
367+
<TextBlock Grid.Row="1" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.Submodule.URL}" VerticalAlignment="Center"/>
368+
<TextBlock Grid.Row="1" Grid.Column="1"
369+
Margin="8,0,0,0"
370+
Text="{Binding URL}"
371+
Foreground="{DynamicResource Brush.Link}"
372+
VerticalAlignment="Center"/>
373+
374+
<TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.Submodule.Status}" VerticalAlignment="Center"/>
375+
<Path Grid.Row="2" Grid.Column="1"
365376
Margin="8,0,0,0"
366377
HorizontalAlignment="Left" VerticalAlignment="Center"
367378
Width="12" Height="12"
368379
Data="{StaticResource Icons.Check}"
369380
Fill="Green"
370381
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Normal}}"/>
371-
<Border Grid.Row="1" Grid.Column="1"
382+
<Border Grid.Row="2" Grid.Column="1"
372383
Height="16"
373384
Margin="8,0,0,0" Padding="4,0"
374385
HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -393,7 +404,7 @@
393404
Foreground="White"
394405
IsVisible="{Binding Status, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:SubmoduleStatus.Unmerged}}"/>
395406
</Grid>
396-
</Border>
407+
</Border>
397408
</Grid>
398409
</StackPanel>
399410
</ToolTip.Tip>

‎src/Views/Repository.axaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArg
192192

193193
private void OnDoubleTappedSubmodule(object sender, TappedEventArgs e)
194194
{
195-
if (sender is ListBox { SelectedItem: Models.Submodule submodule } &&
195+
if (sender is ListBox { SelectedItem: Models.Submodule submodule } &&
196196
submodule.Status != Models.SubmoduleStatus.NotInited &&
197197
DataContext is ViewModels.Repository repo)
198198
{

0 commit comments

Comments
 (0)