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

enhance: forbid to reword or squash when there're local changes

Browse Source
This commit is contained in:
leo
2024-06-25 10:26:31 +08:00
parent 3b7545e4fb
commit 2d4f8709ca
3 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ViewModels/Histories.cs
View File

@@ -217,6 +217,12 @@ namespace SourceGit.ViewModels
reword.Icon = App.CreateMenuIcon("Icons.Edit");
reword.Click += (o, e) =>
{
if (_repo.WorkingCopyChangesCount > 0)
{
App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
return;
}
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Reword(_repo, commit));
e.Handled = true;
@@ -229,6 +235,12 @@ namespace SourceGit.ViewModels
squash.IsEnabled = commit.Parents.Count == 1;
squash.Click += (o, e) =>
{
if (_repo.WorkingCopyChangesCount > 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]);

2
src/ViewModels/Squash.cs
View File

@@ -27,7 +27,7 @@ namespace SourceGit.ViewModels
public Squash(Repository repo, Models.Commit head, Models.Commit parent)
{
_repo = repo;
_message = new Commands.QueryCommitFullMessage(_repo.FullPath, parent.SHA).Result();
_message = new Commands.QueryCommitFullMessage(_repo.FullPath, head.SHA).Result();
Head = head;
Parent = parent;