Skip to content

Add SimplifyByDecoration mode for commit filtering #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add SimplifyByDecoration mode for commit filtering #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc1cb06
add SimplifyByDecoration mode
heartacker Jul 18, 2025
5e4d748
use stackpanel instead of grid for those icons
heartacker Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Models/RepositorySettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ public string DefaultRemote
set;
} = string.Empty;

public bool SimplifyByDecoration
{
get;
set;
} = false;

public bool EnableReflog
{
get;
Expand Down
1 change: 1 addition & 0 deletions src/Resources/Locales/en_US.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@
<x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">Current Branch</x:String>
<x:String x:Key="Text.Repository.ShowFirstParentOnly" xml:space="preserve">Show first-parent only</x:String>
<x:String x:Key="Text.Repository.ShowLostCommits" xml:space="preserve">Show lost commits</x:String>
<x:String x:Key="Text.Repository.SimplifyByDecoration" xml:space="preserve">Show Decorate Commits Only</x:String>
<x:String x:Key="Text.Repository.ShowSubmodulesAsTree" xml:space="preserve">Show Submodules as Tree</x:String>
<x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Show Tags as Tree</x:String>
<x:String x:Key="Text.Repository.Skip" xml:space="preserve">SKIP</x:String>
Expand Down
17 changes: 17 additions & 0 deletions src/ViewModels/Repository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,20 @@ public object SelectedView
set => SetProperty(ref _selectedView, value);
}

public bool SimplifyByDecoration
{
get => _settings.SimplifyByDecoration;
set
{
if (value != _settings.SimplifyByDecoration)
{
_settings.SimplifyByDecoration = value;
OnPropertyChanged();
Task.Run(RefreshCommits);
}
}
}

public bool EnableReflog
{
get => _settings.EnableReflog;
Expand Down Expand Up @@ -1271,6 +1285,9 @@ public void RefreshCommits()
builder.Append("--reflog ");
if (_settings.EnableFirstParentInHistories)
builder.Append("--first-parent ");
// only show commits with decorators
if (_settings.SimplifyByDecoration)
builder.Append("--simplify-by-decoration ");

var filters = _settings.BuildHistoriesFilter();
if (string.IsNullOrEmpty(filters))
Expand Down
104 changes: 57 additions & 47 deletions src/Views/Repository.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,55 +83,65 @@
</ListBox.ItemsPanel>

<ListBoxItem>
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto,Auto">
<Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
<Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Histories}"/>
<TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Histories}"/>

<ToggleButton Grid.Column="2"
Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding EnableReflog, Mode=TwoWay}">
<ToolTip.Tip>
<TextBlock>
<Run Text="{DynamicResource Text.Repository.ShowLostCommits}"/>
<Run Text=" "/>
<Run Text="--reflog" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
</TextBlock>
</ToolTip.Tip>
<Path Width="12" Height="12" Data="{StaticResource Icons.Reference}"/>
</ToggleButton>
<ToggleButton Grid.Column="3"
Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding EnableFirstParentInHistories, Mode=TwoWay}">
<ToolTip.Tip>
<TextBlock>
<Run Text="{DynamicResource Text.Repository.ShowFirstParentOnly}"/>
<Run Text=" "/>
<Run Text="--first-parent" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
</TextBlock>
</ToolTip.Tip>
<Path Width="12" Height="12" Data="{StaticResource Icons.FirstParentFilter}"/>
</ToggleButton>
<ToggleButton Grid.Column="4"
Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding OnlyHighlightCurrentBranchInHistories, Mode=TwoWay}"
ToolTip.Tip="{DynamicResource Text.Repository.OnlyHighlightCurrentBranchInGraph}">
<Path Width="12" Height="12" Data="{StaticResource Icons.LightOn}"/>
</ToggleButton>
<ToggleButton Grid.Column="5"
Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInGraph}">
<Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
</ToggleButton>
<Button Grid.Column="6"
<StackPanel Grid.Column="2" Orientation="Horizontal">
<ToggleButton Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding SimplifyByDecoration, Mode=TwoWay}">
<ToolTip.Tip>
<TextBlock>
<Run Text="{DynamicResource Text.Repository.SimplifyByDecoration}"/>
<Run Text=" "/>
<Run Text="--simplify-by-decoration" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
</TextBlock>
</ToolTip.Tip>
<Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
</ToggleButton>
<ToggleButton Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding EnableReflog, Mode=TwoWay}">
<ToolTip.Tip>
<TextBlock>
<Run Text="{DynamicResource Text.Repository.ShowLostCommits}"/>
<Run Text=" "/>
<Run Text="--reflog" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
</TextBlock>
</ToolTip.Tip>
<Path Width="12" Height="12" Data="{StaticResource Icons.Reference}"/>
</ToggleButton>
<ToggleButton Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding EnableFirstParentInHistories, Mode=TwoWay}">
<ToolTip.Tip>
<TextBlock>
<Run Text="{DynamicResource Text.Repository.ShowFirstParentOnly}"/>
<Run Text=" "/>
<Run Text="--first-parent" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
</TextBlock>
</ToolTip.Tip>
<Path Width="12" Height="12" Data="{StaticResource Icons.FirstParentFilter}"/>
</ToggleButton>
<ToggleButton Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding OnlyHighlightCurrentBranchInHistories, Mode=TwoWay}"
ToolTip.Tip="{DynamicResource Text.Repository.OnlyHighlightCurrentBranchInGraph}">
<Path Width="12" Height="12" Data="{StaticResource Icons.LightOn}"/>
</ToggleButton>
<ToggleButton Classes="line_path"
Width="26" Height="26"
Background="Transparent"
IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=DisplayTimeAsPeriodInHistories, Mode=TwoWay}"
ToolTip.Tip="{DynamicResource Text.Repository.UseRelativeTimeInGraph}">
<Path Width="12" Height="12" Data="{StaticResource Icons.Stopwatch}"/>
</ToggleButton>
</StackPanel>
<Button Grid.Column="3"
Classes="icon_button"
Width="26" Height="26"
Click="OnOpenAdvancedHistoriesOption">
Expand Down
Loading