From d746e352a7911d791dcf727d917ae00d7b3bf8bd Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 2 Oct 2024 15:13:27 +0800
Subject: [PATCH] feature: supports to set default remote to push local
 branches without any tracking remotes (#534)

---
 src/Models/RepositorySettings.cs      |  6 +++++
 src/Resources/Locales/en_US.axaml     |  1 +
 src/Resources/Locales/zh_CN.axaml     |  1 +
 src/Resources/Locales/zh_TW.axaml     |  1 +
 src/ViewModels/Push.cs                | 10 ++++++--
 src/ViewModels/RepositoryConfigure.cs | 22 +++++++++++++++++
 src/Views/RepositoryConfigure.axaml   | 35 +++++++++++++++++++++------
 7 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 244fc673..4fb96efa 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -4,6 +4,12 @@ namespace SourceGit.Models
 {
     public class RepositorySettings
     {
+        public string DefaultRemote
+        {
+            get;
+            set;
+        } = string.Empty;
+        
         public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
         {
             get;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 434b3b1a..8f6fac9f 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -138,6 +138,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Fetch remotes automatically</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(s)</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Default Remote</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE TRACKER</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">Add Sample Github Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Add Sample Jira Rule</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index f26d3e3c..bb39f0f3 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -141,6 +141,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT配置</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">启用定时自动拉取远程更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分钟</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">默认远程</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE追踪</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增匹配Github Issue规则</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">新增匹配Jira规则</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index ffc46895..ad8f7746 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -141,6 +141,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">Git 設定</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">啟用定時自動提取 (fetch) 遠端更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分鐘</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">預設遠端存放庫</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">Issue 追蹤</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleGithub" xml:space="preserve">新增符合 GitHub Issue 規則</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">新增符合 Jira 規則</x:String>
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index b3ef694b..acbb1b1d 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -137,9 +137,15 @@ namespace SourceGit.ViewModels
                 }
             }
 
-            // Set default remote to the first if haven't been set.
+            // Set default remote to the first if it has not been set.
             if (_selectedRemote == null)
-                _selectedRemote = repo.Remotes[0];
+            {
+                var remote = null as Models.Remote;
+                if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
+                    remote = repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);
+
+                _selectedRemote = remote ?? repo.Remotes[0];
+            }
 
             // Auto select preferred remote branch.
             AutoSelectBranchByRemote();
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index fe5b1a2f..1f490316 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -18,6 +18,24 @@ namespace SourceGit.ViewModels
             set;
         }
 
+        public List<string> Remotes
+        {
+            get;
+        }
+
+        public string DefaultRemote
+        {
+            get => _repo.Settings.DefaultRemote;
+            set
+            {
+                if (_repo.Settings.DefaultRemote != value)
+                {
+                    _repo.Settings.DefaultRemote = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool GPGCommitSigningEnabled
         {
             get;
@@ -88,6 +106,10 @@ namespace SourceGit.ViewModels
         {
             _repo = repo;
 
+            Remotes = new List<string>();
+            foreach (var remote in _repo.Remotes)
+                Remotes.Add(remote.Name);
+
             _cached = new Commands.Config(repo.FullPath).ListAll();
             if (_cached.TryGetValue("user.name", out var name))
                 UserName = name;
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 8d03c0bb..df2ad414 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -51,7 +51,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.Git}"/>
         </TabItem.Header>
 
-        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -72,12 +72,31 @@
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Configure.Email.Placeholder}"
                    Text="{Binding UserEmail, Mode=TwoWay}"/>
-
+          
           <TextBlock Grid.Row="2" Grid.Column="0"
+                     HorizontalAlignment="Right" VerticalAlignment="Center"
+                     Margin="0,0,8,0"
+                     Text="{DynamicResource Text.Configure.Git.DefaultRemote}"/>
+          <ComboBox Grid.Row="2" Grid.Column="1"
+                    Height="28" Padding="8,0"
+                    VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                    ItemsSource="{Binding Remotes}"
+                    SelectedItem="{Binding DefaultRemote, Mode=TwoWay}">
+            <ComboBox.ItemTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
+                  <Path Margin="0,6,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
+                  <TextBlock Text="{Binding}"/>
+                </StackPanel>
+              </DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+
+          <TextBlock Grid.Row="3" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Configure.Proxy}"/>
-          <TextBox Grid.Row="2" Grid.Column="1"
+          <TextBox Grid.Row="3" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Configure.Proxy.Placeholder}"
@@ -89,25 +108,25 @@
             </TextBox.InnerRightContent>
           </TextBox>
 
-          <TextBlock Grid.Row="3" Grid.Column="0"
+          <TextBlock Grid.Row="4" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
                      Text="{DynamicResource Text.Preference.GPG.UserKey}"/>
-          <TextBox Grid.Row="3" Grid.Column="1"
+          <TextBox Grid.Row="4" Grid.Column="1"
                    Height="28"
                    CornerRadius="3"
                    Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="4" Grid.Column="1"
+          <CheckBox Grid.Row="5" Grid.Column="1"
                     Content="{DynamicResource Text.Preference.GPG.CommitEnabled}"
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="5" Grid.Column="1"
+          <CheckBox Grid.Row="6" Grid.Column="1"
                     Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>