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

feature: supports squash multiple commits into selected commit (#408)

Browse source
This commit is contained in:
leo 2024-08-25 21:39:59 +08:00
parent 4f8ccc4563
commit 184c89ea1d
No known key found for this signature in database
9 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ViewModels/Squash.cs
View file

@ -5,16 +5,9 @@ namespace SourceGit.ViewModels
{
public class Squash : Popup
{
public Models.Commit Head
public Models.Commit Target
{
get;
private set;
}
public Models.Commit Parent
{
get;
private set;
get => _target;
}
[Required(ErrorMessage = "Commit message is required!!!")]
@ -24,13 +17,12 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _message, value, true);
}
public Squash(Repository repo, Models.Commit head, Models.Commit parent)
public Squash(Repository repo, Models.Commit target, string shaToGetPreferMessage)
{
_repo = repo;
_message = new Commands.QueryCommitFullMessage(_repo.FullPath, head.SHA).Result();
Head = head;
Parent = parent;
_target = target;
_message = new Commands.QueryCommitFullMessage(_repo.FullPath, shaToGetPreferMessage).Result();
View = new Views.Squash() { DataContext = this };
}
@ -41,7 +33,7 @@ namespace SourceGit.ViewModels
return Task.Run(() =>
{
var succ = new Commands.Reset(_repo.FullPath, Parent.SHA, "--soft").Exec();
var succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Exec();
if (succ)
succ = new Commands.Commit(_repo.FullPath, _message, true).Exec();
CallUIThread(() => _repo.SetWatcherEnabled(true));
@ -50,6 +42,7 @@ namespace SourceGit.ViewModels
}
private readonly Repository _repo;
private Models.Commit _target;
private string _message;
}
}