SourceGit.sln

@@ -41,6 +41,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{04FD
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "usr", "usr", "{76639799-54BC-45E8-BD90-F45F63ACD11D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bin", "bin", "{2E27E952-846B-4D75-A426-D22151277864}"
+	ProjectSection(SolutionItems) = preProject
+		build\resources\_common\usr\bin\sourcegit = build\resources\_common\usr\bin\sourcegit
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "share", "share", "{A3ABAA7C-EE14-4448-B466-6E69C1347E7D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{2AF28D3B-14A8-46A8-B828-157FAAB1B06F}"
@@ -101,6 +106,7 @@ Global
 		{ABC98884-F023-4EF4-A9C9-5DE9452BE955} = {FD384607-ED99-47B7-AF31-FB245841BC92}
 		{04FD74B1-FBDB-496E-A48F-3D59D71FF952} = {FD384607-ED99-47B7-AF31-FB245841BC92}
 		{76639799-54BC-45E8-BD90-F45F63ACD11D} = {04FD74B1-FBDB-496E-A48F-3D59D71FF952}
+		{2E27E952-846B-4D75-A426-D22151277864} = {76639799-54BC-45E8-BD90-F45F63ACD11D}
 		{A3ABAA7C-EE14-4448-B466-6E69C1347E7D} = {76639799-54BC-45E8-BD90-F45F63ACD11D}
 		{2AF28D3B-14A8-46A8-B828-157FAAB1B06F} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D}
 		{7166EC6C-17F5-4B5E-B38E-1E53C81EACF6} = {A3ABAA7C-EE14-4448-B466-6E69C1347E7D}

src/Commands/Stash.cs

@@ -17,45 +17,32 @@ namespace SourceGit.Commands
             return Exec();
         }
 
-        public bool Push(List<Models.Change> changes, string message, bool onlyStaged)
+        public bool Push(List<Models.Change> changes, string message)
         {
             var pathsBuilder = new StringBuilder();
+            var needAdd = new List<Models.Change>();
+            foreach (var c in changes)
+            {
+                pathsBuilder.Append($"\"{c.Path}\" ");
 
-            if (onlyStaged)
+                if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
-            {
-                foreach (var c in changes)
-                    pathsBuilder.Append($"\"{c.Path}\" ");
-                
-                var paths = pathsBuilder.ToString();
-                Args = $"stash push --staged -m \"{message}\" -- {paths}";
-            }
-            else
-            {
-                var needAdd = new List<Models.Change>();
-                foreach (var c in changes)
                 {
-                    pathsBuilder.Append($"\"{c.Path}\" ");
+                    needAdd.Add(c);
-
+                    if (needAdd.Count > 10)
-                    if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked)
                     {
-                        needAdd.Add(c);
+                        new Add(WorkingDirectory, needAdd).Exec();
-                        if (needAdd.Count > 10)
+                        needAdd.Clear();
-                        {
-                            new Add(WorkingDirectory, needAdd).Exec();
-                            needAdd.Clear();
-                        }
                     }
                 }
-                if (needAdd.Count > 0)
-                {
-                    new Add(WorkingDirectory, needAdd).Exec();
-                    needAdd.Clear();
-                }
-                
-                var paths = pathsBuilder.ToString();
-                Args = $"stash push -m \"{message}\" -- {paths}";
             }
-            
+            if (needAdd.Count > 0)
+            {
+                new Add(WorkingDirectory, needAdd).Exec();
+                needAdd.Clear();
+            }
+
+            var paths = pathsBuilder.ToString();
+            Args = $"stash push -m \"{message}\" -- {paths}";
             return Exec();
         }
 

src/ViewModels/RenameBranch.cs

@@ -8,6 +8,7 @@ namespace SourceGit.ViewModels
         public Models.Branch Target
         {
             get;
+            private set;
         }
 
         [Required(ErrorMessage = "Branch name is required!!!")]
@@ -53,19 +54,8 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                var oldName = Target.FullName;
                 var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name);
-                CallUIThread(() =>
+                CallUIThread(() => _repo.SetWatcherEnabled(true));
-                {
-                    if (succ && _repo.Settings.Filters.Contains(oldName))
-                    {
-                        _repo.Settings.Filters.Remove(oldName);
-                        _repo.Settings.Filters.Add($"refs/heads/{_name}");
-                    }
-                    
-                    _repo.MarkBranchesDirtyManually();
-                    _repo.SetWatcherEnabled(true);
-                });
                 return succ;
             });
         }

src/ViewModels/Repository.cs

@@ -841,7 +841,7 @@ namespace SourceGit.ViewModels
 
                 if (_settings.Filters.Count != validFilters.Count)
                 {
-                    Dispatcher.UIThread.Invoke(() =>
+                    Dispatcher.UIThread.Post(() =>
                     {
                         _settings.Filters.Clear();
                         _settings.Filters.AddRange(validFilters);
@@ -850,9 +850,6 @@ namespace SourceGit.ViewModels
             }
             else
             {
-                if (_settings.Filters.Count != 0)
-                    Dispatcher.UIThread.Invoke(() => _settings.Filters.Clear());
-                    
                 limits += "--exclude=refs/stash --all";
             }
 

src/ViewModels/StashChanges.cs

@@ -14,6 +14,7 @@ namespace SourceGit.ViewModels
         public bool CanIgnoreUntracked
         {
             get;
+            private set;
         }
 
         public bool IncludeUntracked
@@ -22,11 +23,10 @@ namespace SourceGit.ViewModels
             set;
         }
 
-        public StashChanges(Repository repo, List<Models.Change> changes, bool onlyStaged, bool canIgnoreUntracked)
+        public StashChanges(Repository repo, List<Models.Change> changes, bool canIgnoreUntracked)
         {
             _repo = repo;
             _changes = changes;
-            _onlyStaged = onlyStaged;
 
             CanIgnoreUntracked = canIgnoreUntracked;
             IncludeUntracked = true;
@@ -56,18 +56,17 @@ namespace SourceGit.ViewModels
 
             return Task.Run(() =>
             {
-                var succ = new Commands.Stash(_repo.FullPath).Push(jobs, Message, _onlyStaged);
+                new Commands.Stash(_repo.FullPath).Push(jobs, Message);
                 CallUIThread(() =>
                 {
                     _repo.MarkWorkingCopyDirtyManually();
                     _repo.SetWatcherEnabled(true);
                 });
-                return succ;
+                return true;
             });
         }
 
         private readonly Repository _repo = null;
         private readonly List<Models.Change> _changes = null;
-        private readonly bool _onlyStaged = false;
     }
 }

src/ViewModels/WorkingCopy.cs

@@ -318,9 +318,9 @@ namespace SourceGit.ViewModels
                 return;
 
             if (autoStart)
-                PopupHost.ShowAndStartPopup(new StashChanges(_repo, _cached, false, true));
+                PopupHost.ShowAndStartPopup(new StashChanges(_repo, _cached, true));
             else
-                PopupHost.ShowPopup(new StashChanges(_repo, _cached, false, true));
+                PopupHost.ShowPopup(new StashChanges(_repo, _cached, true));
         }
 
         public void StageSelected(Models.Change next)
@@ -524,7 +524,7 @@ namespace SourceGit.ViewModels
                     {
                         if (PopupHost.CanCreatePopup())
                         {
-                            PopupHost.ShowPopup(new StashChanges(_repo, _selectedUnstaged, false, false));
+                            PopupHost.ShowPopup(new StashChanges(_repo, _selectedUnstaged, false));
                         }
                         e.Handled = true;
                     };
@@ -843,7 +843,7 @@ namespace SourceGit.ViewModels
                 stash.Click += (_, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedUnstaged, false, false));
+                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedUnstaged, false));
 
                     e.Handled = true;
                 };
@@ -928,7 +928,7 @@ namespace SourceGit.ViewModels
                 stash.Click += (_, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedStaged, true, false));
+                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedStaged, false));
 
                     e.Handled = true;
                 };
@@ -1097,7 +1097,7 @@ namespace SourceGit.ViewModels
                 stash.Click += (_, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedStaged, true, false));
+                        PopupHost.ShowPopup(new StashChanges(_repo, _selectedStaged, false));
 
                     e.Handled = true;
                 };
@@ -1202,16 +1202,20 @@ namespace SourceGit.ViewModels
         private List<Models.Change> GetStagedChanges()
         {
             if (_useAmend)
-                return new Commands.QueryStagedChangesWithAmend(_repo.FullPath).Result();
-            
-            var rs = new List<Models.Change>();
-            foreach (var c in _cached)
             {
-                if (c.Index != Models.ChangeState.None &&
+                return new Commands.QueryStagedChangesWithAmend(_repo.FullPath).Result();
-                    c.Index != Models.ChangeState.Untracked)
+            }
-                    rs.Add(c);
+            else
+            {
+                var rs = new List<Models.Change>();
+                foreach (var c in _cached)
+                {
+                    if (c.Index != Models.ChangeState.None &&
+                        c.Index != Models.ChangeState.Untracked)
+                        rs.Add(c);
+                }
+                return rs;
             }
-            return rs;
         }
 
         private void SetDetail(Models.Change change, bool isUnstaged)

src/Views/ChangeStatusIcon.cs

@@ -62,7 +62,6 @@ namespace SourceGit.Views
         ];
 
         private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "U", "★"];
-        private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Unmerged", "Untracked" ];
 
         public static readonly StyledProperty<bool> IsUnstagedChangeProperty =
             AvaloniaProperty.Register<ChangeStatusIcon, bool>(nameof(IsUnstagedChange));
@@ -82,6 +81,11 @@ namespace SourceGit.Views
             set => SetValue(ChangeProperty, value);
         }
 
+        static ChangeStatusIcon()
+        {
+            AffectsRender<ChangeStatusIcon>(IsUnstagedChangeProperty, ChangeProperty);
+        }
+
         public override void Render(DrawingContext context)
         {
             if (Change == null || Bounds.Width <= 0)
@@ -118,33 +122,10 @@ namespace SourceGit.Views
                 Bounds.Width * 0.8,
                 Brushes.White);
 
-            var corner = (float)Math.Max(2, Bounds.Width / 16);
+            float corner = (float)Math.Max(2, Bounds.Width / 16);
-            var textOrigin = new Point((Bounds.Width - txt.Width) * 0.5, (Bounds.Height - txt.Height) * 0.5);
+            Point textOrigin = new Point((Bounds.Width - txt.Width) * 0.5, (Bounds.Height - txt.Height) * 0.5);
             context.DrawRectangle(background, null, new Rect(0, 0, Bounds.Width, Bounds.Height), corner, corner);
             context.DrawText(txt, textOrigin);
         }
-
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == IsUnstagedChangeProperty || change.Property == ChangeProperty)
-            {
-                var isUnstaged = IsUnstagedChange;
-                var c = Change;
-                if (c == null)
-                {
-                    ToolTip.SetTip(this, null);
-                    return;
-                }
-
-                if (isUnstaged)
-                    ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]);
-                else
-                    ToolTip.SetTip(this, TIPS[(int)c.Index]);
-                
-                InvalidateVisual();
-            }
-        }
     }
 }