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

fix<Discard>: wrong discard behavior with changes both in worktree and staged

Browse source
This commit is contained in:
leo 2024-03-01 11:34:32 +08:00
parent a770ff542d
commit 1c005983c7
4 changed files with 58 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/ViewModels/WorkingCopy.cs
View file

@ -271,12 +271,20 @@ namespace SourceGit.ViewModels {
IsUnstaging = false;
}
public void Discard(List<Models.Change> changes) {
public void Discard(List<Models.Change> changes, bool isUnstaged) {
if (PopupHost.CanCreatePopup()) {
if (changes.Count == _count) {
PopupHost.ShowPopup(new Discard(_repo));
if (isUnstaged) {
if (changes.Count == _unstaged.Count && _staged.Count == 0) {
PopupHost.ShowPopup(new Discard(_repo));
} else {
PopupHost.ShowPopup(new Discard(_repo, changes, true));
}
} else {
PopupHost.ShowPopup(new Discard(_repo, changes));
if (changes.Count == _staged.Count && _unstaged.Count == 0) {
PopupHost.ShowPopup(new Discard(_repo));
} else {
PopupHost.ShowPopup(new Discard(_repo, changes, false));
}
}
}
}
@ -397,7 +405,7 @@ namespace SourceGit.ViewModels {
discard.Header = App.Text("FileCM.Discard");
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
Discard(changes);
Discard(changes, true);
e.Handled = true;
};
@ -483,7 +491,7 @@ namespace SourceGit.ViewModels {
discard.Header = App.Text("FileCM.DiscardMulti", changes.Count);
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
Discard(changes);
Discard(changes, true);
e.Handled = true;
};
@ -561,6 +569,14 @@ namespace SourceGit.ViewModels {
e.Handled = true;
};
var discard = new MenuItem();
discard.Header = App.Text("FileCM.Discard");
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
Discard(changes, false);
e.Handled = true;
};
var stash = new MenuItem();
stash.Header = App.Text("FileCM.Stash");
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
@ -604,6 +620,7 @@ namespace SourceGit.ViewModels {
menu.Items.Add(openWith);
menu.Items.Add(new MenuItem() { Header = "-" });
menu.Items.Add(unstage);
menu.Items.Add(discard);
menu.Items.Add(stash);
menu.Items.Add(patch);
menu.Items.Add(new MenuItem() { Header = "-" });
@ -617,6 +634,14 @@ namespace SourceGit.ViewModels {
e.Handled = true;
};
var discard = new MenuItem();
discard.Header = App.Text("FileCM.DiscardMulti", changes.Count);
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
Discard(changes, false);
e.Handled = true;
};
var stash = new MenuItem();
stash.Header = App.Text("FileCM.StashMulti", changes.Count);
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
@ -649,6 +674,7 @@ namespace SourceGit.ViewModels {
};
menu.Items.Add(unstage);
menu.Items.Add(discard);
menu.Items.Add(stash);
menu.Items.Add(patch);
}