feat: push to any remote branch

Muszkal · Muszkal · commit e9c41f2a41d0 · 2025-02-14T14:42:38.000-05:00
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
@@ -1,5 +1,6 @@
 ﻿using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -44,20 +45,32 @@ public Models.Remote SelectedRemote
             }
         }
 
-        public List<Models.Branch> RemoteBranches
+        public Models.Branch SelectedRemoteBranch
         {
-            get => _remoteBranches;
-            private set => SetProperty(ref _remoteBranches, value);
+            get => _selectedRemoteBranch;
+            private set => SetProperty(ref _selectedRemoteBranch, value);
         }
-
+        
         [Required(ErrorMessage = "Remote branch is required!!!")]
-        public Models.Branch SelectedRemoteBranch
+        public string SelectedRemoteBranchName
         {
-            get => _selectedRemoteBranch;
+            get => _selectedRemoteBranchName;
             set
             {
-                if (SetProperty(ref _selectedRemoteBranch, value))
-                    IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName;
+                if (SetProperty(ref _selectedRemoteBranchName, value))
+                {
+                    SelectedRemoteBranch = null;
+
+                    foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))
+                    {
+                        if (_selectedRemoteBranchName == branch.Name)
+                        {
+                            SelectedRemoteBranch = branch;
+                        }
+                    }
+
+                    IsSetTrackOptionVisible = SelectedRemoteBranch != null && _selectedLocalBranch.Upstream != SelectedRemoteBranch.FullName;
+                }
             }
         }
 
@@ -130,7 +143,7 @@ public Push(Repository repo, Models.Branch localBranch)
                 {
                     if (!branch.IsLocal && _selectedLocalBranch.Upstream == branch.FullName)
                     {
-                        _selectedRemote = repo.Remotes.Find(x => x.Name == branch.Remote);
+                        _selectedRemote = repo.Remotes.Find(remote => remote.Name == branch.Remote);
                         break;
                     }
                 }
@@ -141,7 +154,7 @@ public Push(Repository repo, Models.Branch localBranch)
             {
                 var remote = null as Models.Remote;
                 if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
-                    remote = repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);
+                    remote = repo.Remotes.Find(remote => remote.Name == _repo.Settings.DefaultRemote);
 
                 _selectedRemote = remote ?? repo.Remotes[0];
             }
@@ -154,23 +167,23 @@ public Push(Repository repo, Models.Branch localBranch)
 
         public override bool CanStartDirectly()
         {
-            return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
+            return !string.IsNullOrEmpty(SelectedRemoteBranch?.Head);
         }
 
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
 
-            var remoteBranchName = _selectedRemoteBranch.Name;
-            ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ...";
+            ProgressDescription =
+                $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{_selectedRemoteBranchName} ...";
 
             return Task.Run(() =>
             {
                 var succ = new Commands.Push(
                     _repo.FullPath,
                     _selectedLocalBranch.Name,
                     _selectedRemote.Name,
-                    remoteBranchName,
+                    _selectedRemoteBranchName,
                     PushAllTags,
                     _repo.Submodules.Count > 0 && CheckSubmodules,
                     _isSetTrackOptionVisible && Tracking,
@@ -183,54 +196,36 @@ public override Task<bool> Sure()
 
         private void AutoSelectBranchByRemote()
         {
-            // Gather branches.
-            var branches = new List<Models.Branch>();
-            foreach (var branch in _repo.Branches)
-            {
-                if (branch.Remote == _selectedRemote.Name)
-                    branches.Add(branch);
-            }
-
             // If selected local branch has upstream. Try to find it in current remote branches.
             if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream))
             {
-                foreach (var branch in branches)
+                foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))
                 {
                     if (_selectedLocalBranch.Upstream == branch.FullName)
                     {
-                        RemoteBranches = branches;
-                        SelectedRemoteBranch = branch;
+                        SelectedRemoteBranchName = branch.Name;
                         return;
                     }
                 }
             }
 
             // Try to find a remote branch with the same name of selected local branch.
-            foreach (var branch in branches)
+            foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))
             {
                 if (_selectedLocalBranch.Name == branch.Name)
                 {
-                    RemoteBranches = branches;
-                    SelectedRemoteBranch = branch;
+                    SelectedRemoteBranchName = branch.Name;
                     return;
                 }
             }
 
-            // Add a fake new branch.
-            var fake = new Models.Branch()
-            {
-                Name = _selectedLocalBranch.Name,
-                Remote = _selectedRemote.Name,
-            };
-            branches.Add(fake);
-            RemoteBranches = branches;
-            SelectedRemoteBranch = fake;
+            SelectedRemoteBranchName = _selectedLocalBranch.Name;
         }
 
         private readonly Repository _repo = null;
         private Models.Branch _selectedLocalBranch = null;
         private Models.Remote _selectedRemote = null;
-        private List<Models.Branch> _remoteBranches = [];
+        private string _selectedRemoteBranchName = null;
         private Models.Branch _selectedRemoteBranch = null;
         private bool _isSetTrackOptionVisible = false;
     }
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
@@ -10,13 +10,13 @@
   <StackPanel Orientation="Vertical" Margin="8,0">
     <TextBlock FontSize="18"
                Classes="bold"
-               Text="{DynamicResource Text.Push.Title}"/>
+               Text="{DynamicResource Text.Push.Title}" />
 
     <Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,Auto,32,32" ColumnDefinitions="130,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
-                 Text="{DynamicResource Text.Push.Local}"/>
+                 Text="{DynamicResource Text.Push.Local}" />
       <ComboBox Grid.Row="0" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -28,22 +28,22 @@
           <DataTemplate x:DataType="{x:Type m:Branch}">
             <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
               <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Text="{Binding Name}"/>
+              <TextBlock Text="{Binding Name}" />
             </StackPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>
 
         <ComboBox.ItemContainerTheme>
           <ControlTheme TargetType="ComboBoxItem" x:DataType="m:Branch" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-            <Setter Property="TextSearch.Text" Value="{Binding Name}"/>
+            <Setter Property="TextSearch.Text" Value="{Binding Name}" />
           </ControlTheme>
         </ComboBox.ItemContainerTheme>
       </ComboBox>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
-                 Text="{DynamicResource Text.Push.Remote}"/>
+                 Text="{DynamicResource Text.Push.Remote}" />
       <ComboBox Grid.Row="1" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
@@ -53,7 +53,7 @@
           <DataTemplate x:DataType="{x:Type m:Remote}">
             <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
               <Path Margin="0,2,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Remote}"/>
-              <TextBlock Text="{Binding Name}"/>
+              <TextBlock Text="{Binding Name}" />
             </StackPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>
@@ -62,60 +62,55 @@
       <TextBlock Grid.Row="2" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
-                 Text="{DynamicResource Text.Push.To}"/>
-      <ComboBox Grid.Row="2" Grid.Column="1"
-                Height="28" Padding="8,0"
-                VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding RemoteBranches}"
-                IsTextSearchEnabled="True"
-                SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}">
-        <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:Branch}">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
-              <Border Height="14"
-                      CornerRadius="7"
-                      Margin="4,0,0,0" Padding="6,0" 
-                      VerticalAlignment="Center" 
-                      Background="Green"
-                      IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
-                <TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
-              </Border>
-            </StackPanel>
-          </DataTemplate>
-        </ComboBox.ItemTemplate>
+                 Text="{DynamicResource Text.Push.To}" />
 
-        <ComboBox.ItemContainerTheme>
-          <ControlTheme TargetType="ComboBoxItem" x:DataType="m:Branch" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-            <Setter Property="TextSearch.Text" Value="{Binding Name}"/>
-          </ControlTheme>
-        </ComboBox.ItemContainerTheme>
-      </ComboBox>
+      <TextBox Grid.Row="2" Grid.Column="1"
+               Height="28" Padding="8,0"
+               CornerRadius="3"
+               Text="{Binding SelectedRemoteBranchName, Mode=TwoWay}">
+        <TextBox.InnerLeftContent>
+          <Path Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}" />
+        </TextBox.InnerLeftContent>
+        <TextBox.InnerRightContent>
+          <Border Height="14"
+                  Margin="0,0,8,0"
+                  CornerRadius="7"
+                  Padding="6,0"
+                  VerticalAlignment="Center"
+                  Background="Green"
+                  IsVisible="{Binding SelectedRemoteBranch.Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
+            <TextBlock Text="NEW"
+                       FontSize="9"
+                       FontFamily="{DynamicResource Fonts.Monospace}"
+                       Foreground="White"
+                       VerticalAlignment="Center" />
+          </Border>
+        </TextBox.InnerRightContent>
+      </TextBox>
 
       <CheckBox Grid.Row="3" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.Tracking}"
                 IsChecked="{Binding Tracking, Mode=TwoWay}"
                 IsVisible="{Binding IsSetTrackOptionVisible}"
-                ToolTip.Tip="-u"/>
+                ToolTip.Tip="-u" />
 
       <CheckBox Grid.Row="4" Grid.Column="1"
                 Height="32"
                 Content="{DynamicResource Text.Push.CheckSubmodules}"
                 IsChecked="{Binding CheckSubmodules, Mode=TwoWay}"
                 IsVisible="{Binding IsCheckSubmodulesVisible}"
-                ToolTip.Tip="--recurse-submodules=check"/>
+                ToolTip.Tip="--recurse-submodules=check" />
 
       <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.Push.WithAllTags}"
                 IsChecked="{Binding PushAllTags, Mode=TwoWay}"
-                ToolTip.Tip="--tags"/>
+                ToolTip.Tip="--tags" />
 
       <CheckBox Grid.Row="6" Grid.Column="1"
                 Content="{DynamicResource Text.Push.Force}"
                 IsChecked="{Binding ForcePush, Mode=TwoWay}"
-                ToolTip.Tip="--force-with-lease"/>
+                ToolTip.Tip="--force-with-lease" />
     </Grid>
   </StackPanel>
 </UserControl>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.ComponentModel.DataAnnotations;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Threading.Tasks;`
`4`	`5`
`5`	`6`	`namespace SourceGit.ViewModels`
`@@ -44,20 +45,32 @@ public Models.Remote SelectedRemote`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`
`47`		`- public List<Models.Branch> RemoteBranches`
	`48`	`+ public Models.Branch SelectedRemoteBranch`
`48`	`49`	`{`
`49`		`- get => _remoteBranches;`
`50`		`- private set => SetProperty(ref _remoteBranches, value);`
	`50`	`+ get => _selectedRemoteBranch;`
	`51`	`+ private set => SetProperty(ref _selectedRemoteBranch, value);`
`51`	`52`	`}`
`52`		`-`
	`53`	`+`
`53`	`54`	`[Required(ErrorMessage = "Remote branch is required!!!")]`
`54`		`- public Models.Branch SelectedRemoteBranch`
	`55`	`+ public string SelectedRemoteBranchName`
`55`	`56`	`{`
`56`		`- get => _selectedRemoteBranch;`
	`57`	`+ get => _selectedRemoteBranchName;`
`57`	`58`	`set`
`58`	`59`	`{`
`59`		`- if (SetProperty(ref _selectedRemoteBranch, value))`
`60`		`- IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName;`
	`60`	`+ if (SetProperty(ref _selectedRemoteBranchName, value))`
	`61`	`+ {`
	`62`	`+ SelectedRemoteBranch = null;`
	`63`	`+`
	`64`	`+ foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))`
	`65`	`+ {`
	`66`	`+ if (_selectedRemoteBranchName == branch.Name)`
	`67`	`+ {`
	`68`	`+ SelectedRemoteBranch = branch;`
	`69`	`+ }`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ IsSetTrackOptionVisible = SelectedRemoteBranch != null && _selectedLocalBranch.Upstream != SelectedRemoteBranch.FullName;`
	`73`	`+ }`
`61`	`74`	`}`
`62`	`75`	`}`
`63`	`76`
`@@ -130,7 +143,7 @@ public Push(Repository repo, Models.Branch localBranch)`
`130`	`143`	`{`
`131`	`144`	`if (!branch.IsLocal && _selectedLocalBranch.Upstream == branch.FullName)`
`132`	`145`	`{`
`133`		`- _selectedRemote = repo.Remotes.Find(x => x.Name == branch.Remote);`
	`146`	`+ _selectedRemote = repo.Remotes.Find(remote => remote.Name == branch.Remote);`
`134`	`147`	`break;`
`135`	`148`	`}`
`136`	`149`	`}`
`@@ -141,7 +154,7 @@ public Push(Repository repo, Models.Branch localBranch)`
`141`	`154`	`{`
`142`	`155`	`var remote = null as Models.Remote;`
`143`	`156`	`if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))`
`144`		`- remote = repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);`
	`157`	`+ remote = repo.Remotes.Find(remote => remote.Name == _repo.Settings.DefaultRemote);`
`145`	`158`
`146`	`159`	`_selectedRemote = remote ?? repo.Remotes[0];`
`147`	`160`	`}`
`@@ -154,23 +167,23 @@ public Push(Repository repo, Models.Branch localBranch)`
`154`	`167`
`155`	`168`	`public override bool CanStartDirectly()`
`156`	`169`	`{`
`157`		`- return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);`
	`170`	`+ return !string.IsNullOrEmpty(SelectedRemoteBranch?.Head);`
`158`	`171`	`}`
`159`	`172`
`160`	`173`	`public override Task<bool> Sure()`
`161`	`174`	`{`
`162`	`175`	`_repo.SetWatcherEnabled(false);`
`163`	`176`
`164`		`- var remoteBranchName = _selectedRemoteBranch.Name;`
`165`		`- ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ...";`
	`177`	`+ ProgressDescription =`
	`178`	`+ $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{_selectedRemoteBranchName} ...";`
`166`	`179`
`167`	`180`	`return Task.Run(() =>`
`168`	`181`	`{`
`169`	`182`	`var succ = new Commands.Push(`
`170`	`183`	`_repo.FullPath,`
`171`	`184`	`_selectedLocalBranch.Name,`
`172`	`185`	`_selectedRemote.Name,`
`173`		`- remoteBranchName,`
	`186`	`+ _selectedRemoteBranchName,`
`174`	`187`	`PushAllTags,`
`175`	`188`	`_repo.Submodules.Count > 0 && CheckSubmodules,`
`176`	`189`	`_isSetTrackOptionVisible && Tracking,`
`@@ -183,54 +196,36 @@ public override Task<bool> Sure()`
`183`	`196`
`184`	`197`	`private void AutoSelectBranchByRemote()`
`185`	`198`	`{`
`186`		`- // Gather branches.`
`187`		`- var branches = new List<Models.Branch>();`
`188`		`- foreach (var branch in _repo.Branches)`
`189`		`- {`
`190`		`- if (branch.Remote == _selectedRemote.Name)`
`191`		`- branches.Add(branch);`
`192`		`- }`
`193`		`-`
`194`	`199`	`// If selected local branch has upstream. Try to find it in current remote branches.`
`195`	`200`	`if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream))`
`196`	`201`	`{`
`197`		`- foreach (var branch in branches)`
	`202`	`+ foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))`
`198`	`203`	`{`
`199`	`204`	`if (_selectedLocalBranch.Upstream == branch.FullName)`
`200`	`205`	`{`
`201`		`- RemoteBranches = branches;`
`202`		`- SelectedRemoteBranch = branch;`
	`206`	`+ SelectedRemoteBranchName = branch.Name;`
`203`	`207`	`return;`
`204`	`208`	`}`
`205`	`209`	`}`
`206`	`210`	`}`
`207`	`211`
`208`	`212`	`// Try to find a remote branch with the same name of selected local branch.`
`209`		`- foreach (var branch in branches)`
	`213`	`+ foreach (var branch in _repo.Branches.Where(branch => branch.Remote == _selectedRemote.Name))`
`210`	`214`	`{`
`211`	`215`	`if (_selectedLocalBranch.Name == branch.Name)`
`212`	`216`	`{`
`213`		`- RemoteBranches = branches;`
`214`		`- SelectedRemoteBranch = branch;`
	`217`	`+ SelectedRemoteBranchName = branch.Name;`
`215`	`218`	`return;`
`216`	`219`	`}`
`217`	`220`	`}`
`218`	`221`
`219`		`- // Add a fake new branch.`
`220`		`- var fake = new Models.Branch()`
`221`		`- {`
`222`		`- Name = _selectedLocalBranch.Name,`
`223`		`- Remote = _selectedRemote.Name,`
`224`		`- };`
`225`		`- branches.Add(fake);`
`226`		`- RemoteBranches = branches;`
`227`		`- SelectedRemoteBranch = fake;`
	`222`	`+ SelectedRemoteBranchName = _selectedLocalBranch.Name;`
`228`	`223`	`}`
`229`	`224`
`230`	`225`	`private readonly Repository _repo = null;`
`231`	`226`	`private Models.Branch _selectedLocalBranch = null;`
`232`	`227`	`private Models.Remote _selectedRemote = null;`
`233`		`- private List<Models.Branch> _remoteBranches = [];`
	`228`	`+ private string _selectedRemoteBranchName = null;`
`234`	`229`	`private Models.Branch _selectedRemoteBranch = null;`
`235`	`230`	`private bool _isSetTrackOptionVisible = false;`
`236`	`231`	`}`