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

enhance: auto stash and re-apply local changes before squashing (#1141)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-07 16:03:49 +08:00
parent 67fb0b300f
commit 3275dd07d2
No known key found for this signature in database
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ViewModels/Histories.cs
View file

@ -419,12 +419,6 @@ namespace SourceGit.ViewModels
squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
squash.Click += (_, e) =>
{
if (_repo.LocalChangesCount > 0)
{
App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
return;
}
if (_repo.CanCreatePopup())
_repo.ShowPopup(new Squash(_repo, commit, commit.SHA));
@ -458,12 +452,6 @@ namespace SourceGit.ViewModels
squash.IsEnabled = commit.Parents.Count == 1;
squash.Click += (_, e) =>
{
if (_repo.LocalChangesCount > 0)
{
App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
return;
}
if (commit.Parents.Count == 1)
{
var parent = _commits.Find(x => x.SHA == commit.Parents[0]);

21
src/ViewModels/Squash.cs
View file

@ -33,9 +33,28 @@ namespace SourceGit.ViewModels
return Task.Run(() =>
{
var succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Exec();
var autoStashed = false;
var succ = false;
if (_repo.LocalChangesCount > 0)
{
succ = new Commands.Stash(_repo.FullPath).Push("SQUASH_AUTO_STASH");
if (!succ)
{
CallUIThread(() => _repo.SetWatcherEnabled(true));
return false;
}
autoStashed = true;
}
succ = new Commands.Reset(_repo.FullPath, Target.SHA, "--soft").Exec();
if (succ)
succ = new Commands.Commit(_repo.FullPath, _message, true, _repo.Settings.EnableSignOffForCommit).Run();
if (succ && autoStashed)
new Commands.Stash(_repo.FullPath).Pop("stash@{0}");
CallUIThread(() => _repo.SetWatcherEnabled(true));
return succ;
});