michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-11-01 13:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix<Discard>: fix discard with files not only dropped changes selected but also others

Browse source
This commit is contained in:
leo 2021-04-29 21:22:17 +08:00
parent 30ab8ae954
commit 8f3c2fdc32
4 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Commands/Checkout.cs
View file

@ -33,7 +33,7 @@ namespace SourceGit.Commands {
public bool Files(List<string> files) {
StringBuilder builder = new StringBuilder();
builder.Append("checkout -qf --");
builder.Append("checkout -f -q --");
foreach (var f in files) {
builder.Append(" \"");
builder.Append(f);

16
src/Commands/Clean.cs
View file

@ -1,3 +1,6 @@
using System.Collections.Generic;
using System.Text;
namespace SourceGit.Commands {
/// <summary>
/// 清理指令
@ -8,5 +11,18 @@ namespace SourceGit.Commands {
Cwd = repo;
Args = "clean -qfd";
}
public Clean(string repo, List<string> files) {
StringBuilder builder = new StringBuilder();
builder.Append("clean -qfd --");
foreach (var f in files) {
builder.Append(" \"");
builder.Append(f);
builder.Append("\"");
}
Cwd = repo;
Args = builder.ToString();
}
}
}

38
src/Commands/Discard.cs
View file

@ -7,31 +7,37 @@ namespace SourceGit.Commands {
/// </summary>
public class Discard {
private string repo = null;
private List<string> files = new List<string>();
public Discard(string repo, List<Models.Change> changes) {
public Discard(string repo) {
this.repo = repo;
if (changes != null && changes.Count > 0) {
foreach (var c in changes) {
if (c.WorkTree == Models.Change.Status.Untracked || c.WorkTree == Models.Change.Status.Added) continue;
files.Add(c.Path);
}
}
}
public bool Exec() {
if (files.Count == 0) {
public void Whole() {
new Reset(repo, "HEAD", "--hard").Exec();
new Clean(repo).Exec();
}
public void Changes(List<Models.Change> changes) {
var needClean = new List<string>();
var needCheckout = new List<string>();
foreach (var c in changes) {
if (c.WorkTree == Models.Change.Status.Untracked || c.WorkTree == Models.Change.Status.Added) {
needClean.Add(c.Path);
} else {
for (int i = 0; i < files.Count; i += 10) {
var count = Math.Min(10, files.Count - i);
new Checkout(repo).Files(files.GetRange(i, count));
needCheckout.Add(c.Path);
}
}
new Clean(repo).Exec();
return true;
for (int i = 0; i < needClean.Count; i += 10) {
var count = Math.Min(10, needClean.Count - i);
new Clean(repo, needClean.GetRange(i, count)).Exec();
}
for (int i = 0; i < needCheckout.Count; i += 10) {
var count = Math.Min(10, needCheckout.Count - i);
new Checkout(repo).Files(needCheckout.GetRange(i, count));
}
}
}
}

7
src/Views/Popups/Discard.xaml.cs
View file

@ -33,7 +33,12 @@ namespace SourceGit.Views.Popups {
public override Task<bool> Start() {
return Task.Run(() => {
Models.Watcher.SetEnabled(repo, false);
new Commands.Discard(repo, changes).Exec();
var cmd = new Commands.Discard(repo);
if (changes == null || changes.Count == 0) {
cmd.Whole();
} else {
cmd.Changes(changes);
}
Models.Watcher.SetEnabled(repo, true);
return true;
});