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

fix<WorkingCopyChanges>: fix that discard all unstaged changes will drop changes staged

Browse Source
This commit is contained in:
leo
2023-10-17 19:50:09 +08:00
parent 0966baa1d8
commit ed26256c90
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Views/Widgets/Dashboard.xaml.cs
View File

@@ -10,7 +10,6 @@ using System.Windows.Controls.Primitives;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Animation;
using System.Windows.Shell;
namespace SourceGit.Views.Widgets {

8
src/Views/Widgets/WorkingCopy.xaml.cs
View File

@@ -97,6 +97,14 @@ namespace SourceGit.Views.Widgets {
if (watcher != null) watcher.RefreshWC();
}
public void Discard(List<Models.Change> changes) {
if (changes.Count >= unstagedContainer.Changes.Count && stagedContainer.Changes.Count == 0) {
new Popups.Discard(repo.Path, null).Show();
} else {
new Popups.Discard(repo.Path, changes).Show();
}
}
#region STAGE_UNSTAGE
private void ViewAssumeUnchanged(object sender, RoutedEventArgs e) {
var dialog = new AssumeUnchanged(repo.Path);

13
src/Views/Widgets/WorkingCopyChanges.xaml.cs
View File

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
namespace SourceGit.Views.Widgets {
/// <summary>
@@ -385,10 +386,14 @@ namespace SourceGit.Views.Widgets {
}
private void Disard(List<Models.Change> changes) {
if (changes.Count >= Changes.Count) {
new Popups.Discard(repo, null).Show();
} else {
new Popups.Discard(repo, changes).Show();
DependencyObject parent = VisualTreeHelper.GetParent(this);
while (parent != null) {
if (parent is WorkingCopy wc) {
wc.Discard(changes);
return;
}
parent = VisualTreeHelper.GetParent(parent);
}
}