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

style: add .editorconfig for code formatting. see issu #25

Browse source
This commit is contained in:
leo 2024-03-18 09:37:06 +08:00
parent a8eeea4f78
commit 18aaa0a143
225 changed files with 7781 additions and 3911 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ViewModels/Squash.cs
View file

@ -1,25 +1,31 @@
using System.ComponentModel.DataAnnotations;
using System.Threading.Tasks;
namespace SourceGit.ViewModels {
public class Squash : Popup {
public Models.Commit Head {
namespace SourceGit.ViewModels
{
public class Squash : Popup
{
public Models.Commit Head
{
get;
private set;
}
public Models.Commit Parent {
public Models.Commit Parent
{
get;
private set;
}
[Required(ErrorMessage = "Commit message is required!!!")]
public string Message {
public string Message
{
get => _message;
set => SetProperty(ref _message, value, true);
}
public Squash(Repository repo, Models.Commit head, Models.Commit parent) {
public Squash(Repository repo, Models.Commit head, Models.Commit parent)
{
_repo = repo;
_message = parent.FullMessage;
Head = head;
@ -27,11 +33,13 @@ namespace SourceGit.ViewModels {
View = new Views.Squash() { DataContext = this };
}
public override Task<bool> Sure() {
public override Task<bool> Sure()
{
_repo.SetWatcherEnabled(false);
ProgressDescription = "Squashing ...";
return Task.Run(() => {
return Task.Run(() =>
{
var succ = new Commands.Reset(_repo.FullPath, Parent.SHA, "--soft").Exec();
if (succ) succ = new Commands.Commit(_repo.FullPath, _message, true).Exec();
CallUIThread(() => _repo.SetWatcherEnabled(true));
@ -39,7 +47,7 @@ namespace SourceGit.ViewModels {
});
}
private Repository _repo = null;
private readonly Repository _repo = null;
private string _message = string.Empty;
}
}
}