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

refactor: rewrite Reset to This/Parent Revision feature in commit details panel (#2079)

Browse Source 
Better handle for `added/deleted/renamed` file changes

Co-authored-by: ybeapps <ybeapps@gmail.com>
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-01-29 11:11:17 +08:00
parent 7585f0d8e3
commit 769c22083d
3 changed files with 150 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Commands/Remove.cs Normal file
View File

@@ -0,0 +1,21 @@
using System.Collections.Generic;
using System.Text;
namespace SourceGit.Commands
{
public class Remove : Command
{
public Remove(string repo, List<string> files)
{
WorkingDirectory = repo;
Context = repo;
var builder = new StringBuilder();
builder.Append("rm -f --");
foreach (var file in files)
builder.Append(' ').Append(file.Quoted());
Args = builder.ToString();
}
}
}

144
src/ViewModels/CommitDetail.cs
View File

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
using Avalonia;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
@@ -249,53 +248,166 @@ namespace SourceGit.ViewModels
public async Task ResetToThisRevisionAsync(string path)
{
var c = _changes?.Find(x => x.Path.Equals(path, StringComparison.Ordinal));
if (c != null)
{
await ResetToThisRevisionAsync(c);
return;
}
var log = _repo.CreateLog($"Reset File to '{_commit.SHA}'");
await new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevisionAsync(path, _commit.SHA);
log.Complete();
}
public async Task ResetToThisRevisionAsync(Models.Change change)
{
var log = _repo.CreateLog($"Reset File to '{_commit.SHA}'");
if (change.Index == Models.ChangeState.Deleted)
{
var fullpath = Native.OS.GetAbsPath(_repo.FullPath, change.Path);
if (File.Exists(fullpath))
await new Commands.Remove(_repo.FullPath, [change.Path])
.Use(log)
.ExecAsync();
}
else if (change.Index == Models.ChangeState.Renamed)
{
var old = Native.OS.GetAbsPath(_repo.FullPath, change.OriginalPath);
if (File.Exists(old))
await new Commands.Remove(_repo.FullPath, [change.OriginalPath])
.Use(log)
.ExecAsync();
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.FileWithRevisionAsync(change.Path, _commit.SHA);
}
else
{
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.FileWithRevisionAsync(change.Path, _commit.SHA);
}
log.Complete();
}
public async Task ResetToParentRevisionAsync(Models.Change change)
{
var log = _repo.CreateLog($"Reset File to '{_commit.SHA}~1'");
if (change.Index == Models.ChangeState.Renamed)
await new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevisionAsync(change.OriginalPath, $"{_commit.SHA}~1");
if (change.Index == Models.ChangeState.Added)
{
var fullpath = Native.OS.GetAbsPath(_repo.FullPath, change.Path);
if (File.Exists(fullpath))
await new Commands.Remove(_repo.FullPath, [change.Path])
.Use(log)
.ExecAsync();
}
else if (change.Index == Models.ChangeState.Renamed)
{
var renamed = Native.OS.GetAbsPath(_repo.FullPath, change.Path);
if (File.Exists(renamed))
await new Commands.Remove(_repo.FullPath, [change.Path])
.Use(log)
.ExecAsync();
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.FileWithRevisionAsync(change.OriginalPath, _commit.SHA);
}
else
{
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.FileWithRevisionAsync(change.Path, _commit.SHA);
}
await new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevisionAsync(change.Path, $"{_commit.SHA}~1");
log.Complete();
}
public async Task ResetMultipleToThisRevisionAsync(List<Models.Change> changes)
{
var files = new List<string>();
var checkouts = new List<string>();
var removes = new List<string>();
foreach (var c in changes)
files.Add(c.Path);
{
if (c.Index == Models.ChangeState.Deleted)
{
var fullpath = Native.OS.GetAbsPath(_repo.FullPath, c.Path);
if (File.Exists(fullpath))
removes.Add(c.Path);
}
else if (c.Index == Models.ChangeState.Renamed)
{
var old = Native.OS.GetAbsPath(_repo.FullPath, c.OriginalPath);
if (File.Exists(old))
removes.Add(c.OriginalPath);
checkouts.Add(c.Path);
}
else
{
checkouts.Add(c.Path);
}
}
var log = _repo.CreateLog($"Reset Files to '{_commit.SHA}'");
await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(files, _commit.SHA);
if (removes.Count > 0)
await new Commands.Remove(_repo.FullPath, removes)
.Use(log)
.ExecAsync();
if (checkouts.Count > 0)
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.MultipleFilesWithRevisionAsync(checkouts, _commit.SHA);
log.Complete();
}
public async Task ResetMultipleToParentRevisionAsync(List<Models.Change> changes)
{
var renamed = new List<string>();
var modified = new List<string>();
var checkouts = new List<string>();
var removes = new List<string>();
foreach (var c in changes)
{
if (c.Index == Models.ChangeState.Renamed)
renamed.Add(c.OriginalPath);
if (c.Index == Models.ChangeState.Added)
{
var fullpath = Native.OS.GetAbsPath(_repo.FullPath, c.Path);
if (File.Exists(fullpath))
removes.Add(c.Path);
}
else if (c.Index == Models.ChangeState.Renamed)
{
var renamed = Native.OS.GetAbsPath(_repo.FullPath, c.Path);
if (File.Exists(renamed))
removes.Add(c.Path);
checkouts.Add(c.OriginalPath);
}
else
modified.Add(c.Path);
{
checkouts.Add(c.Path);
}
}
var log = _repo.CreateLog($"Reset Files to '{_commit.SHA}~1'");
if (modified.Count > 0)
await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(modified, $"{_commit.SHA}~1");
if (removes.Count > 0)
await new Commands.Remove(_repo.FullPath, removes)
.Use(log)
.ExecAsync();
if (renamed.Count > 0)
await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(renamed, $"{_commit.SHA}~1");
if (checkouts.Count > 0)
await new Commands.Checkout(_repo.FullPath)
.Use(log)
.MultipleFilesWithRevisionAsync(checkouts, $"{_commit.SHA}~1");
log.Complete();
}

2
src/Views/CommitDetail.axaml.cs
View File

@@ -335,7 +335,7 @@ namespace SourceGit.Views
resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
resetToThisRevision.Click += async (_, ev) =>
{
await vm.ResetToThisRevisionAsync(change.Path);
await vm.ResetToThisRevisionAsync(change);
ev.Handled = true;
};