github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-24 02:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: add original pick-order for commits in Interactive Rebase window (#1676)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-10-23 14:49:48 +08:00
parent 99389dba89
commit 89bc8a7e06
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ViewModels/InteractiveRebase.cs
View File

@@ -15,6 +15,11 @@ namespace SourceGit.ViewModels
public class InteractiveRebaseItem : ObservableObject
{
public int OriginalOrder
{
get;
}
public Models.Commit Commit
{
get;
@@ -59,8 +64,9 @@ namespace SourceGit.ViewModels
}
}
public InteractiveRebaseItem(Models.Commit c, string message, bool canSquashOrFixup)
public InteractiveRebaseItem(int order, Models.Commit c, string message, bool canSquashOrFixup)
{
OriginalOrder = order;
Commit = c;
FullMessage = message;
CanSquashOrFixup = canSquashOrFixup;
@@ -142,7 +148,7 @@ namespace SourceGit.ViewModels
for (var i = 0; i < commits.Count; i++)
{
var c = commits[i];
list.Add(new InteractiveRebaseItem(c.Commit, c.Message, i < commits.Count - 1));
list.Add(new InteractiveRebaseItem(commits.Count - i, c.Commit, c.Message, i < commits.Count - 1));
}
var selected = list.Count > 0 ? list[0] : null;

20
src/Views/InteractiveRebase.axaml
View File

@@ -84,6 +84,7 @@
<Grid Height="26" Margin="8,0" ClipToBounds="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="16"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitOrderColumn"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="32"/>
@@ -111,8 +112,15 @@
VerticalAlignment="Center"/>
</Border>
<!-- Original Order -->
<TextBlock Grid.Column="1"
Margin="4,0,0,0"
FontFamily="{DynamicResource Fonts.Monospace}"
Text="{Binding OriginalOrder, StringFormat='#{0}'}"
HorizontalAlignment="Center"/>
<!-- Action -->
<Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
<Button Grid.Column="2" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
<StackPanel Orientation="Horizontal">
<Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
<TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
@@ -120,7 +128,7 @@
</Button>
<!-- Subject -->
<Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
<Grid Grid.Column="3" ColumnDefinitions="Auto,*" ClipToBounds="True">
<Button Grid.Column="0"
Classes="icon_button"
Margin="0,0,6,0" Padding="0"
@@ -142,24 +150,24 @@
</Grid>
<!-- Author Avatar -->
<v:Avatar Grid.Column="3"
<v:Avatar Grid.Column="4"
Width="16" Height="16"
Margin="8,0,0,0"
VerticalAlignment="Center"
User="{Binding Commit.Author}"/>
<!-- Author Name -->
<Border Grid.Column="4" ClipToBounds="True">
<Border Grid.Column="5" ClipToBounds="True">
<TextBlock Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
</Border>
<!-- Commit SHA -->
<Border Grid.Column="5" ClipToBounds="True">
<Border Grid.Column="6" ClipToBounds="True">
<TextBlock Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
</Border>
<!-- Commit Time -->
<Border Grid.Column="6">
<Border Grid.Column="7">
<TextBlock Margin="16,0,8,0" Text="{Binding Commit.CommitterTimeStr}"/>
</Border>
</Grid>