From bf965e8fb1f28d91457678c04624c45765045d36 Mon Sep 17 00:00:00 2001
From: "East.Shang" <East.Shang@jonckers.com>
Date: Fri, 4 Oct 2024 14:35:55 +0800
Subject: [PATCH] new feature: push new branch to remote ,just click new branch
 checkbox

---
 src/Resources/Locales/de_DE.axaml |  2 ++
 src/Resources/Locales/en_US.axaml |  2 ++
 src/Resources/Locales/fr_FR.axaml |  2 ++
 src/Resources/Locales/pt_BR.axaml |  2 ++
 src/Resources/Locales/ru_RU.axaml |  2 ++
 src/Resources/Locales/zh_CN.axaml |  2 ++
 src/Resources/Locales/zh_TW.axaml |  2 ++
 src/ViewModels/Push.cs            | 17 +++++++++++++++++
 src/Views/Push.axaml              | 31 +++++++++++++++++++++++--------
 9 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 8ec97547..58d6ce29 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -454,6 +454,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Remote-Branch:</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Remote-Branch verfolgen</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">Neuer Zweig:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">Neuer Zweig</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Alle Tags pushen</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Tag zum Remote pushen</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Zu allen Remotes pushen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index e9717845..d15100c7 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -456,6 +456,8 @@
   <x:String x:Key="Text.Push.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push Changes To Remote</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Remote Branch:</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">NewBranch:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">NewBranch</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Set as tracking branch</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Push all tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Push Tag To Remote</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 40df6d99..7735a8d7 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -441,6 +441,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Push Changes To Remote</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Remote Branch:</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Set as tracking branch</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">Nouvelle branche:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">Nouvelle branche</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Push all tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Push Tag To Remote</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Push to all remotes</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 96cdda3e..22cc8a00 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -434,6 +434,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Empurrar Alterações para o Remoto</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Branch Remoto:</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Definir como branch de rastreamento</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">Novo ramo:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">Novo ramo</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Empurrar todas as tags</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Empurrar Tag para o Remoto</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Empurrar para todos os remotos</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 56b01b0b..adbcb6dc 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -457,6 +457,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">Выложить изменения на внешнее хранилище</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">Ветка внешнего хранилища:</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">Установить в качестве ветки отслеживания</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">Новая ветвь: </x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">Новая ветвь </x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">Выложить все теги</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">Выложить тег на внешнее хранилище</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Выложить на все внешние хранилища</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 6d3474b6..59df8d48 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -456,6 +456,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">推送到远程仓库</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">远程分支 ：</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">跟踪远程分支</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">新分支:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">新分支</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">同时推送标签</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">推送标签到远程仓库</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">推送到所有远程仓库</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 7d31e33e..f55030c9 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -460,6 +460,8 @@
   <x:String x:Key="Text.Push.Title" xml:space="preserve">推送到遠端存放庫</x:String>
   <x:String x:Key="Text.Push.To" xml:space="preserve">遠端分支:</x:String>
   <x:String x:Key="Text.Push.Tracking" xml:space="preserve">追蹤遠端分支</x:String>
+  <x:String x:Key="Text.Push.IsNewBranch" xml:space="preserve">新分支:</x:String>
+  <x:String x:Key="Text.Push.NewBranch" xml:space="preserve">新分支</x:String>
   <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">同時推送標籤</x:String>
   <x:String x:Key="Text.PushTag" xml:space="preserve">推送標籤到遠端存放庫</x:String>
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">推送到所有遠端存放庫</x:String>
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index b3ef694b..0f6e835e 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -74,6 +74,17 @@ namespace SourceGit.ViewModels
             set;
         } = true;
 
+        public bool IsNewBranch
+        {
+            get=> _isNewBranch;
+            set=> SetProperty(ref _isNewBranch, value);
+        } 
+        public Models.Branch NewBranch
+        {
+            get => _newBranch;
+            private set => SetProperty(ref _newBranch, value);
+        }
+
         public bool IsCheckSubmodulesVisible
         {
             get => _repo.Submodules.Count > 0;
@@ -152,6 +163,10 @@ namespace SourceGit.ViewModels
             _repo.SetWatcherEnabled(false);
 
             var remoteBranchName = _selectedRemoteBranch.Name.Replace(" (new)", "");
+            if (_isNewBranch&&!string.IsNullOrEmpty(_newBranch.Name))
+            {
+                remoteBranchName = _newBranch.Name; 
+            }
             ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ...";
 
             return Task.Run(() =>
@@ -223,5 +238,7 @@ namespace SourceGit.ViewModels
         private List<Models.Branch> _remoteBranches = new List<Models.Branch>();
         private Models.Branch _selectedRemoteBranch = null;
         private bool _isSetTrackOptionVisible = false;
+        private bool _isNewBranch = false;
+        private Models.Branch _newBranch = new Models.Branch();
     }
 }
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
index 2d1e9232..ea427785 100644
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="500"
              x:Class="SourceGit.Views.Push"
              x:DataType="vm:Push">
   <StackPanel Orientation="Vertical" Margin="8,0">
@@ -12,7 +12,7 @@
                Classes="bold"
                Text="{DynamicResource Text.Push.Title}"/>
 
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto,32,32" ColumnDefinitions="130,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto,32,32,32" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -60,7 +60,9 @@
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
-                SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}">
+                SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}"
+                IsEnabled="{Binding !IsNewBranch}"
+                >
         <ComboBox.ItemTemplate>
           <DataTemplate x:DataType="{x:Type m:Branch}">
             <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
@@ -70,24 +72,37 @@
           </DataTemplate>
         </ComboBox.ItemTemplate>
       </ComboBox>
+      <CheckBox Grid.Row="3" Grid.Column="0"
+                  Height="32"
+                  Margin="0,0,8,0"
+                  HorizontalAlignment="Right" VerticalAlignment="Center"
+                  Content="{DynamicResource Text.Push.IsNewBranch}"
+                  IsChecked="{Binding IsNewBranch, Mode=TwoWay}"
+                 />
 
-      <CheckBox Grid.Row="3" Grid.Column="1"
+      <TextBox   Grid.Row="3" Grid.Column="1"   x:Name="NewBranch"
+               Height="28"
+               CornerRadius="3"
+               IsVisible="{Binding IsNewBranch}"
+               Watermark="{DynamicResource Text.Push.NewBranch}"
+               Text="{Binding NewBranch.Name, Mode=TwoWay}"/>
+      <CheckBox Grid.Row="4" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.Tracking}"
                 IsChecked="{Binding Tracking, Mode=TwoWay}"
                 IsVisible="{Binding IsSetTrackOptionVisible}"/>
 
-      <CheckBox Grid.Row="4" Grid.Column="1"
+      <CheckBox Grid.Row="5" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.CheckSubmodules}"
                 IsChecked="{Binding CheckSubmodules, Mode=TwoWay}"
-                IsVisible="{Binding IsCheckSubmodulesVisible}"/>
+                IsVisible="{Binding IsCheckSubmodulesVisible}"/>  
 
-      <CheckBox Grid.Row="5" Grid.Column="1"
+      <CheckBox Grid.Row="6" Grid.Column="1"
                 Content="{DynamicResource Text.Push.WithAllTags}"
                 IsChecked="{Binding PushAllTags, Mode=TwoWay}"/>
 
-      <CheckBox Grid.Row="6" Grid.Column="1"
+      <CheckBox Grid.Row="7" Grid.Column="1"
                 Content="{DynamicResource Text.Push.Force}"
                 IsChecked="{Binding ForcePush, Mode=TwoWay}"/>
     </Grid>