Skip to content

Commit b0c0c46

Browse files
love-lingerlove-linger
committed
feature: supports to de-initialize a submodule (#1272)
Signed-off-by: leo <[email protected]>
1 parent 1fef7a7 commit b0c0c46

File tree

9 files changed

+139
-13
lines changed

9 files changed

+139
-13
lines changed

‎src/Commands/Submodule.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ public bool Update(List<string> modules, bool init, bool recursive, bool useRemo
5151
return Exec();
5252
}
5353

54-
public bool Delete(string relativePath)
54+
public bool Deinit(string module, bool force)
5555
{
56-
Args = $"submodule deinit -f \"{relativePath}\"";
57-
if (!Exec())
58-
return false;
56+
Args = force ? $"submodule deinit -f -- \"{module}\"" : $"submodule deinit -- \"{module}\"";
57+
return Exec();
58+
}
5959

60-
Args = $"rm -rf \"{relativePath}\"";
60+
public bool Delete(string module)
61+
{
62+
Args = $"rm -rf \"{module}\"";
6163
return Exec();
6264
}
6365
}

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@
231231
<x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">lightweight</x:String>
232232
<x:String x:Key="Text.CtrlClickTip" xml:space="preserve">Hold Ctrl to start directly</x:String>
233233
<x:String x:Key="Text.Cut" xml:space="preserve">Cut</x:String>
234+
<x:String x:Key="Text.DeinitSubmodule" xml:space="preserve">De-initialize Submodule</x:String>
235+
<x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Force de-init event if it contains local changes.</x:String>
236+
<x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodule:</x:String>
234237
<x:String x:Key="Text.DeleteBranch" xml:space="preserve">Delete Branch</x:String>
235238
<x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
236239
<x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">You are about to delete a remote branch!!!</x:String>
@@ -266,6 +269,7 @@
266269
<x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Show hidden symbols</x:String>
267270
<x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Side-By-Side Diff</x:String>
268271
<x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMODULE</x:String>
272+
<x:String x:Key="Text.Diff.Submodule.Deleted" xml:space="preserve">DELETED</x:String>
269273
<x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">NEW</x:String>
270274
<x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Swap</x:String>
271275
<x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax Highlighting</x:String>
@@ -708,6 +712,7 @@
708712
<x:String x:Key="Text.Submodule" xml:space="preserve">SUBMODULES</x:String>
709713
<x:String x:Key="Text.Submodule.Add" xml:space="preserve">Add Submodule</x:String>
710714
<x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Copy Relative Path</x:String>
715+
<x:String x:Key="Text.Submodule.Deinit" xml:space="preserve">De-initialize Submodule</x:String>
711716
<x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">Fetch nested submodules</x:String>
712717
<x:String x:Key="Text.Submodule.Open" xml:space="preserve">Open Submodule Repository</x:String>
713718
<x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">Relative Path:</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
<x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">轻量标签</x:String>
236236
<x:String x:Key="Text.CtrlClickTip" xml:space="preserve">按住Ctrl键点击将以默认参数运行</x:String>
237237
<x:String x:Key="Text.Cut" xml:space="preserve">剪切</x:String>
238+
<x:String x:Key="Text.DeinitSubmodule" xml:space="preserve">取消初始化子模块</x:String>
239+
<x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">强制取消，即使包含本地变更</x:String>
240+
<x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模块 ：</x:String>
238241
<x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
239242
<x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
240243
<x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
@@ -270,6 +273,7 @@
270273
<x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">显示隐藏符号</x:String>
271274
<x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">分列对比</x:String>
272275
<x:String x:Key="Text.Diff.Submodule" xml:space="preserve">子模块</x:String>
276+
<x:String x:Key="Text.Diff.Submodule.Deleted" xml:space="preserve">删除</x:String>
273277
<x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">新增</x:String>
274278
<x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">交换比对双方</x:String>
275279
<x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">语法高亮</x:String>
@@ -712,6 +716,7 @@
712716
<x:String x:Key="Text.Submodule" xml:space="preserve">子模块</x:String>
713717
<x:String x:Key="Text.Submodule.Add" xml:space="preserve">添加子模块</x:String>
714718
<x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">复制路径</x:String>
719+
<x:String x:Key="Text.Submodule.Deinit" xml:space="preserve">取消初始化</x:String>
715720
<x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">拉取子孙模块</x:String>
716721
<x:String x:Key="Text.Submodule.Open" xml:space="preserve">打开仓库</x:String>
717722
<x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">相对仓库路径 ：</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
<x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">輕量標籤</x:String>
236236
<x:String x:Key="Text.CtrlClickTip" xml:space="preserve">按住 Ctrl 鍵將直接以預設參數執行</x:String>
237237
<x:String x:Key="Text.Cut" xml:space="preserve">剪下</x:String>
238+
<x:String x:Key="Text.DeinitSubmodule" xml:space="preserve">取消初始化子模組</x:String>
239+
<x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">強制取消，即使它包含本地變更</x:String>
240+
<x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模組 ：</x:String>
238241
<x:String x:Key="Text.DeleteBranch" xml:space="preserve">刪除分支確認</x:String>
239242
<x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名稱:</x:String>
240243
<x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在刪除遠端上的分支，請務必小心!</x:String>
@@ -270,6 +273,7 @@
270273
<x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">顯示隱藏符號</x:String>
271274
<x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">並排對比</x:String>
272275
<x:String x:Key="Text.Diff.Submodule" xml:space="preserve">子模組</x:String>
276+
<x:String x:Key="Text.Diff.Submodule.Deleted" xml:space="preserve">已刪除</x:String>
273277
<x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">新增</x:String>
274278
<x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">交換比對雙方</x:String>
275279
<x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">語法上色</x:String>
@@ -712,6 +716,7 @@
712716
<x:String x:Key="Text.Submodule" xml:space="preserve">子模組</x:String>
713717
<x:String x:Key="Text.Submodule.Add" xml:space="preserve">新增子模組</x:String>
714718
<x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">複製路徑</x:String>
719+
<x:String x:Key="Text.Submodule.Deinit" xml:space="preserve">取消初始化</x:String>
715720
<x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">提取子模組</x:String>
716721
<x:String x:Key="Text.Submodule.Open" xml:space="preserve">開啟存放庫</x:String>
717722
<x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">相對存放庫路徑:</x:String>

‎src/ViewModels/DeinitSubmodule.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System.Threading.Tasks;
2+
3+
namespace SourceGit.ViewModels
4+
{
5+
public class DeinitSubmodule : Popup
6+
{
7+
public string Submodule
8+
{
9+
get;
10+
private set;
11+
}
12+
13+
public bool Force
14+
{
15+
get;
16+
set;
17+
}
18+
19+
public DeinitSubmodule(Repository repo, string submodule)
20+
{
21+
_repo = repo;
22+
Submodule = submodule;
23+
Force = false;
24+
}
25+
26+
public override Task<bool> Sure()
27+
{
28+
_repo.SetWatcherEnabled(false);
29+
ProgressDescription = "De-initialize Submodule";
30+
31+
var log = _repo.CreateLog("De-initialize Submodule");
32+
Use(log);
33+
34+
return Task.Run(() =>
35+
{
36+
var succ = new Commands.Submodule(_repo.FullPath).Use(log).Deinit(Submodule, false);
37+
log.Complete();
38+
CallUIThread(() => _repo.SetWatcherEnabled(true));
39+
return succ;
40+
});
41+
}
42+
43+
private Repository _repo;
44+
}
45+
}

‎src/ViewModels/Repository.cs‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,12 +2432,14 @@ public ContextMenu CreateContextMenuForSubmodule(Models.Submodule submodule)
24322432
ev.Handled = true;
24332433
};
24342434

2435-
var copy = new MenuItem();
2436-
copy.Header = App.Text("Submodule.CopyPath");
2437-
copy.Icon = App.CreateMenuIcon("Icons.Copy");
2438-
copy.Click += (_, ev) =>
2435+
var deinit = new MenuItem();
2436+
deinit.Header = App.Text("Submodule.Deinit");
2437+
deinit.Icon = App.CreateMenuIcon("Icons.Undo");
2438+
deinit.IsEnabled = submodule.Status != Models.SubmoduleStatus.NotInited;
2439+
deinit.Click += (_, ev) =>
24392440
{
2440-
App.CopyText(submodule.Path);
2441+
if (CanCreatePopup())
2442+
ShowPopup(new DeinitSubmodule(this, submodule.Path));
24412443
ev.Handled = true;
24422444
};
24432445

@@ -2451,10 +2453,22 @@ public ContextMenu CreateContextMenuForSubmodule(Models.Submodule submodule)
24512453
ev.Handled = true;
24522454
};
24532455

2456+
var copy = new MenuItem();
2457+
copy.Header = App.Text("Submodule.CopyPath");
2458+
copy.Icon = App.CreateMenuIcon("Icons.Copy");
2459+
copy.Click += (_, ev) =>
2460+
{
2461+
App.CopyText(submodule.Path);
2462+
ev.Handled = true;
2463+
};
2464+
24542465
var menu = new ContextMenu();
24552466
menu.Items.Add(open);
2456-
menu.Items.Add(copy);
2467+
menu.Items.Add(new MenuItem() { Header = "-" });
2468+
menu.Items.Add(deinit);
24572469
menu.Items.Add(rm);
2470+
menu.Items.Add(new MenuItem() { Header = "-" });
2471+
menu.Items.Add(copy);
24582472
return menu;
24592473
}
24602474

‎src/Views/DeinitSubmodule.axaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<UserControl xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:vm="using:SourceGit.ViewModels"
6+
xmlns:v="using:SourceGit.Views"
7+
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
8+
x:Class="SourceGit.Views.DeinitSubmodule"
9+
x:DataType="vm:DeinitSubmodule">
10+
<StackPanel Orientation="Vertical" Margin="8,0">
11+
<TextBlock FontSize="18"
12+
Classes="bold"
13+
Text="{DynamicResource Text.DeinitSubmodule}"/>
14+
15+
<Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
16+
<TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeinitSubmodule.Path}"/>
17+
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
18+
<Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Submodule}"/>
19+
<TextBlock Text="{Binding Submodule}"/>
20+
</StackPanel>
21+
22+
<CheckBox Grid.Row="1" Grid.Column="1"
23+
Content="{DynamicResource Text.DeinitSubmodule.Force}"
24+
IsChecked="{Binding Force, Mode=TwoWay}"
25+
ToolTip.Tip="--force"/>
26+
</Grid>
27+
</StackPanel>
28+
</UserControl>

‎src/Views/DeinitSubmodule.axaml.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Avalonia.Controls;
2+
3+
namespace SourceGit.Views
4+
{
5+
public partial class DeinitSubmodule : UserControl
6+
{
7+
public DeinitSubmodule()
8+
{
9+
InitializeComponent();
10+
}
11+
}
12+
}

‎src/Views/DiffView.axaml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,18 @@
279279

280280
<Path Width="16" Height="16" Data="{StaticResource Icons.DoubleDown}" HorizontalAlignment="Center" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}"/>
281281

282-
<Border Margin="0,8,0,0" BorderThickness="1" BorderBrush="Green" Background="{DynamicResource Brush.Window}">
283-
<v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding New.Commit}" FullMessage="{Binding New.FullMessage}"/>
282+
<Border Margin="0,8,0,0" BorderThickness="1" BorderBrush="Green" Background="{DynamicResource Brush.Window}" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
283+
<ContentControl Content="{Binding New}">
284+
<ContentControl.DataTemplates>
285+
<DataTemplate DataType="m:RevisionSubmodule">
286+
<v:CommitBaseInfo MaxHeight="256" Margin="0,0,0,4" Content="{Binding Commit}" FullMessage="{Binding FullMessage}"/>
287+
</DataTemplate>
288+
</ContentControl.DataTemplates>
289+
</ContentControl>
290+
</Border>
291+
292+
<Border Margin="0,8,0,0" Height="16" HorizontalAlignment="Center" Background="Red" CornerRadius="8" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNull}}">
293+
<TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Submodule.Deleted}" Margin="8,0" FontSize="10"/>
284294
</Border>
285295
</StackPanel>
286296
</ScrollViewer>

0 commit comments

Comments
 (0)