feature: allow to push revision where local branch is ahead of its upstream (#1394) (#1441)

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-21 11:51:27 +08:00
parent 64ffbb113f
commit 9bfc315ace
No known key found for this signature in database
7 changed files with 147 additions and 0 deletions

View file

@ -0,0 +1,51 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.PushRevision"
x:DataType="vm:PushRevision">
<StackPanel Orientation="Vertical" Margin="8,0">
<TextBlock FontSize="18"
Classes="bold"
Text="{DynamicResource Text.Push.Revision.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="130,*">
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Push.Revision}"/>
<Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
<Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
<TextBlock Grid.Column="1"
Classes="primary"
VerticalAlignment="Center"
Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
Foreground="DarkOrange"
Margin="8,0,0,0"/>
<TextBlock Grid.Column="2"
VerticalAlignment="Center"
Text="{Binding Revision.Subject}"
Margin="4,0,0,0"
TextTrimming="CharacterEllipsis"/>
</Grid>
<TextBlock Grid.Row="1" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Push.To}"/>
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock VerticalAlignment="Center" Text="{Binding RemoteBranch.FriendlyName}" Margin="8,0,0,0"/>
</StackPanel>
<CheckBox Grid.Row="2" Grid.Column="1"
Content="{DynamicResource Text.Push.Force}"
IsChecked="{Binding Force, Mode=TwoWay}"
ToolTip.Tip="--force-with-lease"/>
</Grid>
</StackPanel>
</UserControl>

View file

@ -0,0 +1,12 @@
using Avalonia.Controls;
namespace SourceGit.Views
{
public partial class PushRevision : UserControl
{
public PushRevision()
{
InitializeComponent();
}
}
}