dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 12:15:00 +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/Histories.cs
View file

@ -1,9 +1,11 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Avalonia.VisualTree;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
@ -240,6 +242,25 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
menu.Items.Add(reset);
var squash = new MenuItem();
squash.Header = App.Text("CommitCM.SquashCommitsSinceThis");
squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
squash.IsVisible = commit.IsMerged;
squash.Click += (_, e) =>
{
if (_repo.LocalChangesCount > 0)
{
App.RaiseException(_repo.FullPath, "You have local changes. Please run stash or discard first.");
return;
}
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Squash(_repo, commit, commit.SHA));
e.Handled = true;
};
menu.Items.Add(squash);
}
else
{
@ -276,7 +297,7 @@ namespace SourceGit.ViewModels
{
var parent = _commits.Find(x => x.SHA == commit.Parents[0]);
if (parent != null && PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Squash(_repo, commit, parent));
PopupHost.ShowPopup(new Squash(_repo, parent, commit.SHA));
}
e.Handled = true;