Merge branch 'sourcegit-scm:develop' into develop

README.md

@@ -52,7 +52,9 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD
 For **Windows** users:
 
 * **MSYS Git is NOT supported**. Please use official [Git for Windows](https://git-scm.com/download/win) instead.
-* `sourcegit_x.y.win-x64.zip` may be reported as virus by Windows Defender. I don't know why. I have manually tested the zip to be uploaded using Windows Defender before uploading and no virus was found. If you have installed .NET 8 SDK locally, I suggest you to compile it yourself. And if you have any idea about how to fix this, please open an issue.
+* You can install the latest stable by `winget install SourceGit`.
+  - Note: `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
+* Portable versions can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 
 For **macOS** users:
 
@@ -94,51 +96,9 @@ This app supports open repository in external tools listed in the table below.
 
 ![Theme Light](./screenshots/theme_light.png)
 
-## How to Customize Theme
+* Custom Themes
 
-1. Create a new json file, and provide your favorite colors with follow keys:
-
-| Key | Description |
-| --- | --- |
-| Color.Window | Window background color |
-| Color.WindowBorder | Window border color. Only used on Linux. |
-| Color.TitleBar | Title bar background color |
-| Color.ToolBar | Tool bar background color |
-| Color.Popup | Popup panel background color |
-| Color.Contents | Background color used in inputs, data grids, file content viewer, change lists, text diff viewer, etc. |
-| Color.Badge | Badge background color |
-| Color.BadgeFG | Badge foreground color |
-| Color.Conflict | Conflict panel background color |
-| Color.ConflictForeground | Conflict panel foreground color |
-| Color.DecoratorIconBG | Background color for commit ref icon |
-| Color.DecoratorIcon | Foreground color for commit ref icon |
-| Color.DecoratorBranch | Background color for commit branch ref name |
-| Color.DecoratorTag | Background color for commit tag ref name |
-| Color.DecoratorFG | Foreground color for commit ref name |
-| Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |
-| Color.Border1 | Border color used in inputs, like TextBox, ComboBox, etc. |
-| Color.Border2 | Border color used in visual lines, like seperators, Rectange, etc. |
-| Color.FlatButton.Background | Flat button background color, like `Cancel`, `Commit & Push` button |
-| Color.FlatButton.BackgroundHovered | Flat button background color when hovered, like `Cancel` button |
-| Color.FG1 | Primary foreground color for all text elements |
-| Color.FG2 | Secondary foreground color for all text elements |
-| Color.Diff.EmptyBG | Background color used in empty lines in diff viewer |
-| Color.Diff.AddedBG | Background color used in added lines in diff viewer |
-| Color.Diff.DeletedBG | Background color used in deleted lines in diff viewer |
-| Color.Diff.AddedHighlight | Background color used for changed words in added lines in diff viewer |
-| Color.Diff.DeletedHighlight | Background color used for changed words in deleted lines in diff viewer |
-
-For example:
-
-```json
-{
-  "Color.Window": "#FFFF6059"
-}
-```
-
-2. Open `Preference` -> `Appearance`, choose the json file you just created in `Custom Color Schema`.
-
-> **NOTE**: The `Custom Color Schema` will override the colors with same keys in current active theme.
+You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git)
 
 ## Contributing
 

src/Commands/Blame.cs

@@ -9,7 +9,6 @@ namespace SourceGit.Commands
 
         [GeneratedRegex(@"^\^?([0-9a-f]+)\s+.*\((.*)\s+(\d+)\s+[\-\+]?\d+\s+\d+\) (.*)")]
         private static partial Regex REG_FORMAT();
-        private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime();
 
         public Blame(string repo, string file, string revision)
         {
@@ -67,7 +66,7 @@ namespace SourceGit.Commands
             var commit = match.Groups[1].Value;
             var author = match.Groups[2].Value;
             var timestamp = int.Parse(match.Groups[3].Value);
-            var when = UTC_START.AddSeconds(timestamp).ToString("yyyy/MM/dd");
+            var when = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime().ToString("yyyy/MM/dd");
 
             var info = new Models.BlameLineInfo()
             {

src/Converters/BranchConverters.cs

@@ -1,10 +0,0 @@
-using Avalonia.Data.Converters;
-
-namespace SourceGit.Converters
-{
-    public static class BranchConverters
-    {
-        public static readonly FuncValueConverter<Models.Branch, string> ToName =
-            new FuncValueConverter<Models.Branch, string>(v => v.IsLocal ? v.Name : $"{v.Remote}/{v.Name}");
-    }
-}

src/Models/Branch.cs

@@ -11,5 +11,7 @@
         public string UpstreamTrackStatus { get; set; }
         public string Remote { get; set; }
         public bool IsHead { get; set; }
+
+        public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
 }

src/Models/Commit.cs

@@ -19,14 +19,13 @@ namespace SourceGit.Models
         public bool IsMerged { get; set; } = false;
         public Thickness Margin { get; set; } = new Thickness(0);
 
-        public string AuthorTimeStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd HH:mm:ss");
-        public string CommitterTimeStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd HH:mm:ss");
-        public string AuthorTimeShortStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd");
-        public string CommitterTimeShortStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd");
+        
+        public string AuthorTimeStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
+        public string CommitterTimeStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
+        public string AuthorTimeShortStr => DateTime.UnixEpoch.AddSeconds(AuthorTime).ToLocalTime().ToString("yyyy/MM/dd");
+        public string CommitterTimeShortStr => DateTime.UnixEpoch.AddSeconds(CommitterTime).ToString("yyyy/MM/dd");
 
         public bool IsCommitterVisible => Author != Committer || AuthorTime != CommitterTime;
         public bool IsCurrentHead => Decorators.Find(x => x.Type is DecoratorType.CurrentBranchHead or DecoratorType.CurrentCommitHead) != null;
-
-        private static readonly DateTime _utcStart = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime();
     }
 }

src/Models/Stash.cs

@@ -4,13 +4,11 @@ namespace SourceGit.Models
 {
     public class Stash
     {
-        private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime();
-
         public string Name { get; set; } = "";
         public string SHA { get; set; } = "";
         public ulong Time { get; set; } = 0;
         public string Message { get; set; } = "";
 
-        public string TimeStr => UTC_START.AddSeconds(Time).ToString("yyyy/MM/dd HH:mm:ss");
+        public string TimeStr => DateTime.UnixEpoch.AddSeconds(Time).ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");
     }
 }

src/Models/Statistics.cs

@@ -49,7 +49,6 @@ namespace SourceGit.Models
 
         public Statistics()
         {
-            _utcStart = DateTime.UnixEpoch;
             _today = DateTime.Today;
             _thisWeekStart = _today.AddSeconds(-(int)_today.DayOfWeek * 3600 * 24 - _today.Hour * 3600 - _today.Minute * 60 - _today.Second);
             _thisWeekEnd = _thisWeekStart.AddDays(7);
@@ -115,7 +114,7 @@ namespace SourceGit.Models
 
         public void AddCommit(string committer, double timestamp)
         {
-            var time = _utcStart.AddSeconds(timestamp).ToLocalTime();
+            var time = DateTime.UnixEpoch.AddSeconds(timestamp).ToLocalTime();
             if (time.CompareTo(_thisWeekStart) >= 0 && time.CompareTo(_thisWeekEnd) < 0)
             {
                 Week.AddCommit((int)time.DayOfWeek, committer);
@@ -136,7 +135,6 @@ namespace SourceGit.Models
             Week.Complete();
         }
 
-        private readonly DateTime _utcStart;
         private readonly DateTime _today;
         private readonly DateTime _thisWeekStart;
         private readonly DateTime _thisWeekEnd;

src/ViewModels/AddWorktree.cs

@@ -71,7 +71,7 @@ namespace SourceGit.ViewModels
                 if (branch.IsLocal)
                     LocalBranches.Add(branch.Name);
                 else
-                    RemoteBranches.Add($"{branch.Remote}/{branch.Name}");
+                    RemoteBranches.Add(branch.FriendlyName);
             }
 
             if (RemoteBranches.Count > 0)

src/ViewModels/BranchTreeNode.cs

@@ -69,6 +69,17 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _isSelected, value);
         }
 
+        public string Tooltip
+        {
+            get
+            {
+                if (Backend is Models.Branch b)
+                    return b.FriendlyName;
+
+                return null;
+            }
+        }
+
         public CornerRadius CornerRadius
         {
             get => _cornerRadius;

src/ViewModels/CreateBranch.cs

@@ -72,8 +72,7 @@ namespace SourceGit.ViewModels
 
             foreach (var b in creator._repo.Branches)
             {
-                var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}";
-                if (test == name)
+                if (b.FriendlyName == name)
                     return new ValidationResult("A branch with same name already exists!");
             }
 

src/ViewModels/DeleteBranch.cs

@@ -35,9 +35,8 @@ namespace SourceGit.ViewModels
 
             if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))
             {
-                var upstream = branch.Upstream.Substring(13);
-                TrackingRemoteBranch = repo.Branches.Find(x => !x.IsLocal && $"{x.Remote}/{x.Name}" == upstream);
-                DeleteTrackingRemoteTip = new Views.NameHighlightedTextBlock("DeleteBranch.WithTrackingRemote", upstream);
+                TrackingRemoteBranch = repo.Branches.Find(x => x.FullName == branch.Upstream);
+                DeleteTrackingRemoteTip = new Views.NameHighlightedTextBlock("DeleteBranch.WithTrackingRemote", TrackingRemoteBranch.FriendlyName);
             }
 
             View = new Views.DeleteBranch() { DataContext = this };

src/ViewModels/DeleteMultipleBranches.cs

@@ -37,7 +37,7 @@ namespace SourceGit.ViewModels
                 {
                     foreach (var target in Targets)
                     {
-                        SetProgressDescription($"Deleting remote branch : {target.Remote}/{target.Name}");
+                        SetProgressDescription($"Deleting remote branch : {target.FriendlyName}");
                         Commands.Branch.DeleteRemote(_repo.FullPath, target.Remote, target.Name);
                     }
                 }

src/ViewModels/GitFlowStart.cs

@@ -39,8 +39,7 @@ namespace SourceGit.ViewModels
                 var check = $"{starter._prefix}{name}";
                 foreach (var b in starter._repo.Branches)
                 {
-                    var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}";
-                    if (test == check)
+                    if (b.FriendlyName == check)
                         return new ValidationResult("A branch with same name already exists!");
                 }
             }

src/ViewModels/Histories.cs

@@ -175,7 +175,7 @@ namespace SourceGit.ViewModels
                     }
                     else if (d.Type == Models.DecoratorType.RemoteBranchHead)
                     {
-                        var b = _repo.Branches.Find(x => !x.IsLocal && d.Name == $"{x.Remote}/{x.Name}");
+                        var b = _repo.Branches.Find(x => !x.IsLocal && d.Name == x.FriendlyName);
                         FillRemoteBranchMenu(menu, b, current, commit.IsMerged);
                     }
                     else if (d.Type == Models.DecoratorType.Tag)
@@ -583,7 +583,7 @@ namespace SourceGit.ViewModels
 
         private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged)
         {
-            var name = $"{branch.Remote}/{branch.Name}";
+            var name = branch.FriendlyName;
 
             var submenu = new MenuItem();
             submenu.Icon = App.CreateMenuIcon("Icons.Branch");

src/ViewModels/Repository.cs

@@ -268,11 +268,18 @@ namespace SourceGit.ViewModels
         public void Open()
         {
             var settingsFile = Path.Combine(_gitDir, "sourcegit.settings");
-            try
+            if (File.Exists(settingsFile))
             {
-                _settings = JsonSerializer.Deserialize(File.ReadAllText(settingsFile), JsonCodeGen.Default.RepositorySettings);
+                try
+                {
+                    _settings = JsonSerializer.Deserialize(File.ReadAllText(settingsFile), JsonCodeGen.Default.RepositorySettings);
+                }
+                catch
+                {
+                    _settings = new RepositorySettings();
+                }
             }
-            catch
+            else
             {
                 _settings = new RepositorySettings();
             }
@@ -1202,7 +1209,7 @@ namespace SourceGit.ViewModels
                 if (upstream != null)
                 {
                     var fastForward = new MenuItem();
-                    fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", $"{upstream.Remote}/{upstream.Name}");
+                    fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream.FriendlyName);
                     fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
                     fastForward.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus) && branch.UpstreamTrackStatus.IndexOf('↑') < 0;
                     fastForward.Click += (o, e) =>
@@ -1491,9 +1498,10 @@ namespace SourceGit.ViewModels
         {
             var menu = new ContextMenu();
             var current = Branches.Find(x => x.IsCurrent);
+            var name = branch.FriendlyName;
 
             var checkout = new MenuItem();
-            checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", $"{branch.Remote}/{branch.Name}");
+            checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", name);
             checkout.Icon = App.CreateMenuIcon("Icons.Check");
             checkout.Click += (o, e) =>
             {
@@ -1506,7 +1514,7 @@ namespace SourceGit.ViewModels
             if (current != null)
             {
                 var pull = new MenuItem();
-                pull.Header = new Views.NameHighlightedTextBlock("BranchCM.PullInto", $"{branch.Remote}/{branch.Name}", current.Name);
+                pull.Header = new Views.NameHighlightedTextBlock("BranchCM.PullInto", name, current.Name);
                 pull.Icon = App.CreateMenuIcon("Icons.Pull");
                 pull.Click += (o, e) =>
                 {
@@ -1516,17 +1524,17 @@ namespace SourceGit.ViewModels
                 };
 
                 var merge = new MenuItem();
-                merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", $"{branch.Remote}/{branch.Name}", current.Name);
+                merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", name, current.Name);
                 merge.Icon = App.CreateMenuIcon("Icons.Merge");
                 merge.Click += (o, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new Merge(this, $"{branch.Remote}/{branch.Name}", current.Name));
+                        PopupHost.ShowPopup(new Merge(this, name, current.Name));
                     e.Handled = true;
                 };
 
                 var rebase = new MenuItem();
-                rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", current.Name, $"{branch.Remote}/{branch.Name}");
+                rebase.Header = new Views.NameHighlightedTextBlock("BranchCM.Rebase", current.Name, name);
                 rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
                 rebase.Click += (o, e) =>
                 {
@@ -1573,7 +1581,7 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(new MenuItem() { Header = "-" });
 
             var delete = new MenuItem();
-            delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", $"{branch.Remote}/{branch.Name}");
+            delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);
             delete.Icon = App.CreateMenuIcon("Icons.Clear");
             delete.Click += (o, e) =>
             {
@@ -1617,7 +1625,7 @@ namespace SourceGit.ViewModels
             copy.Icon = App.CreateMenuIcon("Icons.Copy");
             copy.Click += (o, e) =>
             {
-                App.CopyText(branch.Remote + "/" + branch.Name);
+                App.CopyText(name);
                 e.Handled = true;
             };
 
@@ -1810,7 +1818,7 @@ namespace SourceGit.ViewModels
                 {
                     var dup = b;
                     var target = new MenuItem();
-                    target.Header = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}";
+                    target.Header = b.FriendlyName;
                     target.Icon = App.CreateMenuIcon(b.IsCurrent ? "Icons.Check" : "Icons.Branch");
                     target.Click += (_, e) =>
                     {

src/Views/Archive.axaml

@@ -23,7 +23,7 @@
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+              <TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
             </StackPanel>
           </DataTemplate>
 

src/Views/BranchCompare.axaml

@@ -61,7 +61,7 @@
                         User="{Binding BaseHead.Author}"/>
               <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding BaseHead.Author.Name}" Margin="8,0,0,0"/>
               <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-                <TextBlock Text="{Binding Base, Converter={x:Static c:BranchConverters.ToName}}" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
+                <TextBlock Text="{Binding Base.FriendlyName}" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
               </Border>
               <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
               <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
@@ -82,7 +82,7 @@
                         User="{Binding ToHead.Author}"/>
               <TextBlock Grid.Column="1" Classes="monospace" Text="{Binding ToHead.Author.Name}" Margin="8,0,0,0"/>
               <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-                <TextBlock Text="{Binding To, Converter={x:Static c:BranchConverters.ToName}}" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
+                <TextBlock Text="{Binding To.FriendlyName}" Classes="monospace" Margin="4,0" Foreground="#FFDDDDDD"/>
               </Border>
               <TextBlock Grid.Column="3" Classes="monospace" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
               <TextBlock Grid.Column="4" Classes="monospace" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>

src/Views/CreateBranch.axaml

@@ -24,7 +24,7 @@
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+              <TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
             </StackPanel>
           </DataTemplate>
 

src/Views/CreateTag.axaml

@@ -23,7 +23,7 @@
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+              <TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
             </StackPanel>
           </DataTemplate>
 

src/Views/DeleteBranch.axaml

@@ -18,7 +18,7 @@
       <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
-        <TextBlock Text="{Binding Target, Converter={x:Static c:BranchConverters.ToName}}"/>
+        <TextBlock Text="{Binding Target.FriendlyName}}"/>
       </StackPanel>
 
       <Border Grid.Row="1" Grid.Column="1" Height="32" IsVisible="{Binding !Target.IsLocal}">

src/Views/DeleteMultipleBranches.axaml

@@ -64,8 +64,7 @@
           <DataGridTemplateColumn Width="*" Header="NAME">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
-                <TextBlock Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" ClipToBounds="True"
-                           Classes="monospace" />
+                <TextBlock Text="{Binding FriendlyName}" ClipToBounds="True" Classes="monospace" />
               </DataTemplate>
             </DataGridTemplateColumn.CellTemplate>
           </DataGridTemplateColumn>

src/Views/FastForwardWithoutCheckout.axaml

@@ -16,7 +16,7 @@
       <TextBlock Text="{Binding Local.Name}" Margin="8,0,0,0"/>
       <TextBlock Text="→" Margin="8,0"/>
       <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Text="{Binding To, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+      <TextBlock Text="{Binding To.FriendlyName}" Margin="8,0,0,0"/>
     </StackPanel>
   </StackPanel>
 </UserControl>

src/Views/InteractiveRebase.axaml

@@ -54,7 +54,7 @@
     <Grid Grid.Row="1" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" Margin="8">
       <TextBlock Grid.Column="0" Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
       <Path Grid.Column="1" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Current, Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+      <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Current.FriendlyName}" Margin="8,0,0,0"/>
 
       <TextBlock Grid.Column="3" Margin="48,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
       <Path Grid.Column="4" Width="14" Height="14" Margin="8,8,0,0" Data="{StaticResource Icons.Commit}"/>

src/Views/Pull.axaml

@@ -48,7 +48,7 @@
           <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 Converter={x:Static c:BranchConverters.ToName}}"/>
+              <TextBlock Text="{Binding FriendlyName}"/>
             </StackPanel>
           </DataTemplate>
         </ComboBox.ItemTemplate>

src/Views/Rebase.axaml

@@ -31,7 +31,7 @@
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock VerticalAlignment="Center" Text="{Binding Converter={x:Static c:BranchConverters.ToName}}" Margin="8,0,0,0"/>
+              <TextBlock VerticalAlignment="Center" Text="{Binding FriendlyName}" Margin="8,0,0,0"/>
             </StackPanel>
           </DataTemplate>
 

src/Views/Repository.axaml

@@ -269,7 +269,7 @@
             </TreeView.Styles>
             <TreeView.ItemTemplate>
               <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type vm:BranchTreeNode}">
-                <Grid Height="24" ColumnDefinitions="20,*,Auto,Auto" Background="Transparent" DoubleTapped="OnDoubleTappedBranchNode">
+                <Grid Height="24" ColumnDefinitions="20,*,Auto,Auto" Background="Transparent" DoubleTapped="OnDoubleTappedBranchNode" ToolTip.Tip="{Binding Tooltip}">
                   <Path Grid.Column="0" Classes="folder_icon" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,1,0,0" IsVisible="{Binding IsFolder}"/>
                   <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Check}" IsVisible="{Binding IsCurrent}" VerticalAlignment="Center"/>
                   <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}" VerticalAlignment="Center">
@@ -281,7 +281,10 @@
                     </Path.IsVisible>
                   </Path>
 
-                  <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="monospace" FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.BoldIfTrue}}"/>
+                  <TextBlock Grid.Column="1" 
+                             Text="{Binding Name}" 
+                             Classes="monospace" 
+                             FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.BoldIfTrue}}"/>
 
                   <Border Grid.Column="2" Margin="8,0" Height="18" CornerRadius="9" VerticalAlignment="Center" Background="{DynamicResource Brush.Badge}" IsVisible="{Binding IsUpstreamTrackStatusVisible}">
                     <TextBlock Classes="monospace" FontSize="10" HorizontalAlignment="Center" Margin="9,0" Text="{Binding UpstreamTrackStatus}" Foreground="{DynamicResource Brush.BadgeFG}"/>
@@ -294,7 +297,8 @@
                                 IsVisible="{Binding IsBranch}"
                                 Checked="OnToggleFilter"
                                 Unchecked="OnToggleFilter"
-                                IsChecked="{Binding IsFiltered}"/>
+                                IsChecked="{Binding IsFiltered}"
+                                ToolTip.Tip="{DynamicResource Text.Filter}"/>
                 </Grid>
               </TreeDataTemplate>
             </TreeView.ItemTemplate>
@@ -343,7 +347,7 @@
 
             <TreeView.ItemTemplate>
               <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type vm:BranchTreeNode}">
-                <Grid Height="24" ColumnDefinitions="20,*,Auto" Background="Transparent" DoubleTapped="OnDoubleTappedBranchNode">
+                <Grid Height="24" ColumnDefinitions="20,*,Auto" Background="Transparent" DoubleTapped="OnDoubleTappedBranchNode" ToolTip.Tip="{Binding Tooltip}">
                   <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" HorizontalAlignment="Left" Margin="0,2,0,0" IsVisible="{Binding IsFolder}" VerticalAlignment="Center"/>
                   <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Remote}" IsVisible="{Binding IsRemote}" VerticalAlignment="Center"/>
                   <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}" VerticalAlignment="Center"/>
@@ -357,7 +361,8 @@
                                 Checked="OnToggleFilter"
                                 Unchecked="OnToggleFilter"
                                 IsVisible="{Binding IsBranch}"
-                                IsChecked="{Binding IsFiltered}"/>
+                                IsChecked="{Binding IsFiltered}"
+                                ToolTip.Tip="{DynamicResource Text.Filter}"/>
                 </Grid>
               </TreeDataTemplate>
             </TreeView.ItemTemplate>
@@ -444,7 +449,8 @@
                                   Background="Transparent"
                                   Checked="OnToggleFilter"
                                   Unchecked="OnToggleFilter"
-                                  IsChecked="{Binding IsFiltered}"/>
+                                  IsChecked="{Binding IsFiltered}"
+                                  ToolTip.Tip="{DynamicResource Text.Filter}"/>
                   </DataTemplate>
                 </DataGridTemplateColumn.CellTemplate>
               </DataGridTemplateColumn>