Skip to content

Commit 7bfb684

Browse files
love-lingerlove-linger
committed
refactor: update submodule (#287)
1 parent 58c6856 commit 7bfb684

File tree

7 files changed

+127
-17
lines changed

7 files changed

+127
-17
lines changed

‎src/Commands/Submodule.cs‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,46 @@ public Submodule(string repo)
1313
public bool Add(string url, string relativePath, bool recursive, Action<string> outputHandler)
1414
{
1515
_outputHandler = outputHandler;
16-
Args = $"submodule add {url} {relativePath}";
16+
Args = $"submodule add {url} \"{relativePath}\"";
1717
if (!Exec())
1818
return false;
1919

2020
if (recursive)
2121
{
22-
Args = $"submodule update --init --recursive -- {relativePath}";
22+
Args = $"submodule update --init --recursive -- \"{relativePath}\"";
2323
return Exec();
2424
}
2525
else
2626
{
27-
Args = $"submodule update --init -- {relativePath}";
27+
Args = $"submodule update --init -- \"{relativePath}\"";
2828
return true;
2929
}
3030
}
3131

32-
public bool Update(Action<string> outputHandler)
32+
public bool Update(string module, bool init, bool recursive, bool useRemote, Action<string> outputHandler)
3333
{
34-
Args = $"submodule update --rebase --remote";
34+
Args = "submodule update";
35+
36+
if (init)
37+
Args += " --init";
38+
if (recursive)
39+
Args += " --recursive";
40+
if (useRemote)
41+
Args += " --remote";
42+
if (!string.IsNullOrEmpty(module))
43+
Args += $" -- \"{module}\"";
44+
3545
_outputHandler = outputHandler;
3646
return Exec();
3747
}
3848

3949
public bool Delete(string relativePath)
4050
{
41-
Args = $"submodule deinit -f {relativePath}";
51+
Args = $"submodule deinit -f \"{relativePath}\"";
4252
if (!Exec())
4353
return false;
4454

45-
Args = $"rm -rf {relativePath}";
55+
Args = $"rm -rf \"{relativePath}\"";
4656
return Exec();
4757
}
4858

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,11 @@
545545
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
546546
<x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
547547
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Update Submodules</x:String>
548-
<x:String x:Key="Text.UpdateSubmodules.Tip" xml:space="preserve">Run `submodule update` command for this repository.</x:String>
548+
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">All submodules</x:String>
549+
<x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialize as needed</x:String>
550+
<x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Recursively</x:String>
551+
<x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodule:</x:String>
552+
<x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Use --remote option</x:String>
549553
<x:String x:Key="Text.Warn" xml:space="preserve">Warning</x:String>
550554
<x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Create Group</x:String>
551555
<x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">Create Sub-Group</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,11 @@
547547
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
548548
<x:String x:Key="Text.URL" xml:space="preserve">仓库地址 ：</x:String>
549549
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模块</x:String>
550-
<x:String x:Key="Text.UpdateSubmodules.Tip" xml:space="preserve">为此仓库执行`submodule update`命令，更新所有的子模块。</x:String>
550+
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">更新所有子模块</x:String>
551+
<x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">启用 '--init'</x:String>
552+
<x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">启用 '--recursive'</x:String>
553+
<x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">子模块 ：</x:String>
554+
<x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">启用 '--remote'</x:String>
551555
<x:String x:Key="Text.Warn" xml:space="preserve">警告</x:String>
552556
<x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">新建分组</x:String>
553557
<x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">新建子分组</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,11 @@
547547
<x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送 ${0}$...</x:String>
548548
<x:String x:Key="Text.URL" xml:space="preserve">倉庫地址 ：</x:String>
549549
<x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模組</x:String>
550-
<x:String x:Key="Text.UpdateSubmodules.Tip" xml:space="preserve">本操作將執行 `submodule update` 。</x:String>
550+
<x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">更新所有子模組</x:String>
551+
<x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">啟用『--init』選項</x:String>
552+
<x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">啟用『--recursive』選項</x:String>
553+
<x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">子模組 ：</x:String>
554+
<x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">啟用『--remote』選項</x:String>
551555
<x:String x:Key="Text.Warn" xml:space="preserve">警告</x:String>
552556
<x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">新建分組</x:String>
553557
<x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">新建子分組</x:String>

‎src/ViewModels/Repository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ public void AddSubmodule()
863863
public void UpdateSubmodules()
864864
{
865865
if (PopupHost.CanCreatePopup())
866-
PopupHost.ShowAndStartPopup(new UpdateSubmodules(this));
866+
PopupHost.ShowPopup(new UpdateSubmodules(this));
867867
}
868868

869869
public void OpenSubmodule(string submodule)

‎src/ViewModels/UpdateSubmodules.cs‎

Lines changed: 57 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,82 @@
1-
using System.Threading.Tasks;
1+
using System.Collections.Generic;
2+
using System.Threading.Tasks;
23

34
namespace SourceGit.ViewModels
45
{
56
public class UpdateSubmodules : Popup
67
{
8+
public List<string> Submodules
9+
{
10+
get => _repo.Submodules;
11+
}
12+
13+
public string SelectedSubmodule
14+
{
15+
get;
16+
set;
17+
}
18+
19+
public bool UpdateAll
20+
{
21+
get => _updateAll;
22+
set => SetProperty(ref _updateAll, value);
23+
}
24+
25+
public bool EnableInit
26+
{
27+
get;
28+
set;
29+
} = true;
30+
31+
public bool EnableRecursive
32+
{
33+
get;
34+
set;
35+
} = true;
36+
37+
public bool EnableRemote
38+
{
39+
get;
40+
set;
41+
} = false;
42+
743
public UpdateSubmodules(Repository repo)
844
{
945
_repo = repo;
46+
SelectedSubmodule = repo.Submodules.Count > 0 ? repo.Submodules[0] : string.Empty;
1047
View = new Views.UpdateSubmodules() { DataContext = this };
1148
}
1249

1350
public override Task<bool> Sure()
1451
{
1552
_repo.SetWatcherEnabled(false);
16-
ProgressDescription = "Updating submodules ...";
53+
54+
string target = string.Empty;
55+
if (_updateAll)
56+
{
57+
ProgressDescription = "Updating submodules ...";
58+
}
59+
else
60+
{
61+
target = SelectedSubmodule;
62+
ProgressDescription = $"Updating submodule {target} ...";
63+
}
1764

1865
return Task.Run(() =>
1966
{
20-
new Commands.Submodule(_repo.FullPath).Update(SetProgressDescription);
67+
new Commands.Submodule(_repo.FullPath).Update(
68+
target,
69+
EnableInit,
70+
EnableRecursive,
71+
EnableRemote,
72+
SetProgressDescription);
73+
2174
CallUIThread(() => _repo.SetWatcherEnabled(true));
2275
return true;
2376
});
2477
}
2578

2679
private readonly Repository _repo = null;
80+
private bool _updateAll = true;
2781
}
2882
}

‎src/Views/UpdateSubmodules.axaml‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,42 @@
1010
<TextBlock FontSize="18"
1111
Classes="bold"
1212
Text="{DynamicResource Text.UpdateSubmodules}"/>
13-
<TextBlock Text="{DynamicResource Text.UpdateSubmodules.Tip}"
14-
Margin="0,16,0,0"
15-
HorizontalAlignment="Center"/>
13+
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32" ColumnDefinitions="120,*">
14+
<TextBlock Grid.Row="0" Grid.Column="0"
15+
HorizontalAlignment="Right" VerticalAlignment="Center"
16+
Margin="0,0,8,0"
17+
Text="{DynamicResource Text.UpdateSubmodules.Target}"/>
18+
<ComboBox Grid.Row="0" Grid.Column="1"
19+
Height="28" Padding="8,0"
20+
VerticalAlignment="Center" HorizontalAlignment="Stretch"
21+
ItemsSource="{Binding Submodules}"
22+
SelectedItem="{Binding SelectedSubmodule, Mode=TwoWay}"
23+
IsEnabled="{Binding !UpdateAll}">
24+
<ComboBox.ItemTemplate>
25+
<DataTemplate x:DataType="x:String">
26+
<StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
27+
<Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Submodule}"/>
28+
<TextBlock Text="{Binding}"/>
29+
</StackPanel>
30+
</DataTemplate>
31+
</ComboBox.ItemTemplate>
32+
</ComboBox>
33+
34+
<CheckBox Grid.Row="1" Grid.Column="1"
35+
Content="{DynamicResource Text.UpdateSubmodules.All}"
36+
IsChecked="{Binding UpdateAll, Mode=TwoWay}"/>
37+
38+
<CheckBox Grid.Row="2" Grid.Column="1"
39+
Content="{DynamicResource Text.UpdateSubmodules.Init}"
40+
IsChecked="{Binding EnableInit, Mode=TwoWay}"/>
41+
42+
<CheckBox Grid.Row="3" Grid.Column="1"
43+
Content="{DynamicResource Text.UpdateSubmodules.Recursive}"
44+
IsChecked="{Binding EnableRecursive, Mode=TwoWay}"/>
45+
46+
<CheckBox Grid.Row="4" Grid.Column="1"
47+
Content="{DynamicResource Text.UpdateSubmodules.UseRemote}"
48+
IsChecked="{Binding EnableRemote, Mode=TwoWay}"/>
49+
</Grid>
1650
</StackPanel>
1751
</UserControl>

0 commit comments

Comments
 (0)