dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 12:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: change worktree presentation (#978)

Browse source 
Present the worktree name first, then relative path to the main repo.

This is more aligned with Git's own UI,  and works better with UI size constrains.
This commit is contained in:
Dmitrij D. Czarkoff 2025-02-13 02:41:08 +00:00 • committed by GitHub
parent c6aedf1193
commit 588879eb7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Commands/Worktree.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
namespace SourceGit.Commands namespace SourceGit.Commands
{ {
@ -26,6 +27,7 @@ namespace SourceGit.Commands
if (line.StartsWith("worktree ", StringComparison.Ordinal)) if (line.StartsWith("worktree ", StringComparison.Ordinal))
{ {
last = new Models.Worktree() { FullPath = line.Substring(9).Trim() }; last = new Models.Worktree() { FullPath = line.Substring(9).Trim() };
last.RelativePath = Path.GetRelativePath(WorkingDirectory, last.FullPath);
worktrees.Add(last); worktrees.Add(last);
} }
else if (line.StartsWith("bare", StringComparison.Ordinal)) else if (line.StartsWith("bare", StringComparison.Ordinal))

9
src/Models/Worktree.cs
View file

@ -6,6 +6,7 @@ namespace SourceGit.Models
{ {
public string Branch { get; set; } = string.Empty; public string Branch { get; set; } = string.Empty;
public string FullPath { get; set; } = string.Empty; public string FullPath { get; set; } = string.Empty;
public string RelativePath { get; set; } = string.Empty;
public string Head { get; set; } = string.Empty; public string Head { get; set; } = string.Empty;
public bool IsBare { get; set; } = false; public bool IsBare { get; set; } = false;
public bool IsDetached { get; set; } = false; public bool IsDetached { get; set; } = false;
@ -21,15 +22,15 @@ namespace SourceGit.Models
get get
{ {
if (IsDetached) if (IsDetached)
return $"(deteched HEAD at {Head.Substring(10)})"; return $"deteched HEAD at {Head.Substring(10)}";
if (Branch.StartsWith("refs/heads/", System.StringComparison.Ordinal)) if (Branch.StartsWith("refs/heads/", System.StringComparison.Ordinal))
return $"({Branch.Substring(11)})"; return Branch.Substring(11);
if (Branch.StartsWith("refs/remotes/", System.StringComparison.Ordinal)) if (Branch.StartsWith("refs/remotes/", System.StringComparison.Ordinal))
return $"({Branch.Substring(13)})"; return Branch.Substring(13);
return $"({Branch})"; return Branch;
} }
} }

4
src/Views/RemoveWorktree.axaml
View file

@ -18,8 +18,8 @@
<Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,*"> <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,*">
<Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.Worktree}"/> <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.Worktree}"/>
<TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"> <TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" TextTrimming="CharacterEllipsis">
<Run Text="{Binding Target.FullPath}"/> <Run Text="{Binding Target.Name}"/>
<Run Text="{Binding Target.Name}" Foreground="{DynamicResource Brush.FG2}"/> (<Run Text="{Binding Target.RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
</TextBlock> </TextBlock>
</Grid> </Grid>

4
src/Views/Repository.axaml
View file

@ -372,8 +372,8 @@
<Grid ColumnDefinitions="Auto,*,22"> <Grid ColumnDefinitions="Auto,*,22">
<Path Grid.Column="0" Width="10" Height="10" Margin="8,0,0,0" Data="{StaticResource Icons.Worktree}"/> <Path Grid.Column="0" Width="10" Height="10" Margin="8,0,0,0" Data="{StaticResource Icons.Worktree}"/>
<TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"> <TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" TextTrimming="CharacterEllipsis">
<Run Text="{Binding FullPath}"/> <Run Text="{Binding Name}"/>
<Run Text="{Binding Name}" Foreground="{DynamicResource Brush.FG2}"/> (<Run Text="{Binding RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>)
</TextBlock> </TextBlock>
<Path Grid.Column="2" Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Lock}" Fill="{DynamicResource Brush.FG2}" IsVisible="{Binding IsLocked}"/> <Path Grid.Column="2" Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Lock}" Fill="{DynamicResource Brush.FG2}" IsVisible="{Binding IsLocked}"/>
</Grid> </Grid>