dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 20:24: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

260
src/ViewModels/Histories.cs
View file

@ -1,35 +1,47 @@
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace SourceGit.ViewModels {
public class CountSelectedCommits {
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
{
public class CountSelectedCommits
{
public int Count { get; set; }
}
public class Histories : ObservableObject {
public bool IsLoading {
public class Histories : ObservableObject
{
public bool IsLoading
{
get => _isLoading;
set => SetProperty(ref _isLoading, value);
}
public double DataGridRowHeight {
public double DataGridRowHeight
{
get => _dataGridRowHeight;
}
public List<Models.Commit> Commits {
public List<Models.Commit> Commits
{
get => _commits;
set {
if (SetProperty(ref _commits, value)) {
set
{
if (SetProperty(ref _commits, value))
{
Graph = null;
Task.Run(() => {
Task.Run(() =>
{
var graph = Models.CommitGraph.Parse(value, DataGridRowHeight, 8);
Dispatcher.UIThread.Invoke(() => {
Dispatcher.UIThread.Invoke(() =>
{
Graph = graph;
});
});
@ -37,49 +49,62 @@ namespace SourceGit.ViewModels {
}
}
public Models.CommitGraph Graph {
public Models.CommitGraph Graph
{
get => _graph;
set => SetProperty(ref _graph, value);
}
public Models.Commit AutoSelectedCommit {
public Models.Commit AutoSelectedCommit
{
get => _autoSelectedCommit;
private set => SetProperty(ref _autoSelectedCommit, value);
}
public object DetailContext {
public object DetailContext
{
get => _detailContext;
private set => SetProperty(ref _detailContext, value);
}
public Histories(Repository repo) {
public Histories(Repository repo)
{
_repo = repo;
}
public void Cleanup() {
public void Cleanup()
{
Commits = new List<Models.Commit>();
_repo = null;
_graph = null;
_autoSelectedCommit = null;
if (_detailContext is CommitDetail cd) {
if (_detailContext is CommitDetail cd)
{
cd.Cleanup();
} else if (_detailContext is RevisionCompare rc) {
}
else if (_detailContext is RevisionCompare rc)
{
rc.Cleanup();
}
_detailContext = null;
}
public void NavigateTo(string commitSHA) {
public void NavigateTo(string commitSHA)
{
var commit = _commits.Find(x => x.SHA.StartsWith(commitSHA, StringComparison.Ordinal));
if (commit != null) {
if (commit != null)
{
AutoSelectedCommit = commit;
if (_detailContext is CommitDetail detail) {
if (_detailContext is CommitDetail detail)
{
detail.Commit = commit;
} else {
}
else
{
var commitDetail = new CommitDetail(_repo.FullPath);
commitDetail.Commit = commit;
DetailContext = commitDetail;
@ -87,30 +112,42 @@ namespace SourceGit.ViewModels {
}
}
public void Select(IList commits) {
if (commits.Count == 0) {
public void Select(IList commits)
{
if (commits.Count == 0)
{
DetailContext = null;
} else if (commits.Count == 1) {
}
else if (commits.Count == 1)
{
var commit = commits[0] as Models.Commit;
AutoSelectedCommit = commit;
if (_detailContext is CommitDetail detail) {
if (_detailContext is CommitDetail detail)
{
detail.Commit = commit;
} else {
}
else
{
var commitDetail = new CommitDetail(_repo.FullPath);
commitDetail.Commit = commit;
DetailContext = commitDetail;
}
} else if (commits.Count == 2) {
}
else if (commits.Count == 2)
{
var end = commits[0] as Models.Commit;
var start = commits[1] as Models.Commit;
DetailContext = new RevisionCompare(_repo.FullPath, start, end);
} else {
}
else
{
DetailContext = new CountSelectedCommits() { Count = commits.Count };
}
}
public ContextMenu MakeContextMenu() {
public ContextMenu MakeContextMenu()
{
var detail = _detailContext as CommitDetail;
if (detail == null) return null;
@ -121,17 +158,26 @@ namespace SourceGit.ViewModels {
var menu = new ContextMenu();
var tags = new List<Models.Tag>();
if (commit.HasDecorators) {
foreach (var d in commit.Decorators) {
if (d.Type == Models.DecoratorType.CurrentBranchHead) {
if (commit.HasDecorators)
{
foreach (var d in commit.Decorators)
{
if (d.Type == Models.DecoratorType.CurrentBranchHead)
{
FillCurrentBranchMenu(menu, current);
} else if (d.Type == Models.DecoratorType.LocalBranchHead) {
}
else if (d.Type == Models.DecoratorType.LocalBranchHead)
{
var b = _repo.Branches.Find(x => x.IsLocal && d.Name == x.Name);
FillOtherLocalBranchMenu(menu, b, current, commit.IsMerged);
} else if (d.Type == Models.DecoratorType.RemoteBranchHead) {
}
else if (d.Type == Models.DecoratorType.RemoteBranchHead)
{
var b = _repo.Branches.Find(x => !x.IsLocal && d.Name == $"{x.Remote}/{x.Name}");
FillRemoteBranchMenu(menu, b, current, commit.IsMerged);
} else if (d.Type == Models.DecoratorType.Tag) {
}
else if (d.Type == Models.DecoratorType.Tag)
{
var t = _repo.Tags.Find(x => x.Name == d.Name);
if (t != null) tags.Add(t);
}
@ -140,25 +186,31 @@ namespace SourceGit.ViewModels {
if (menu.Items.Count > 0) menu.Items.Add(new MenuItem() { Header = "-" });
}
if (tags.Count > 0) {
if (tags.Count > 0)
{
foreach (var tag in tags) FillTagMenu(menu, tag);
menu.Items.Add(new MenuItem() { Header = "-" });
}
if (current.Head != commit.SHA) {
if (current.Head != commit.SHA)
{
var reset = new MenuItem();
reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name);
reset.Icon = App.CreateMenuIcon("Icons.Reset");
reset.Click += (o, e) => {
reset.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Reset(_repo, current, commit));
e.Handled = true;
};
menu.Items.Add(reset);
} else {
}
else
{
var reword = new MenuItem();
reword.Header = App.Text("CommitCM.Reword");
reword.Icon = App.CreateMenuIcon("Icons.Edit");
reword.Click += (o, e) => {
reword.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Reword(_repo, commit));
e.Handled = true;
};
@ -168,22 +220,26 @@ namespace SourceGit.ViewModels {
squash.Header = App.Text("CommitCM.Squash");
squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent");
squash.IsEnabled = commit.Parents.Count == 1;
squash.Click += (o, e) => {
if (commit.Parents.Count == 1) {
squash.Click += (o, e) =>
{
if (commit.Parents.Count == 1)
{
var parent = _commits.Find(x => x.SHA == commit.Parents[0]);
if (parent != null && PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Squash(_repo, commit, parent));
}
e.Handled = true;
};
menu.Items.Add(squash);
}
if (!commit.IsMerged) {
if (!commit.IsMerged)
{
var rebase = new MenuItem();
rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name);
rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
rebase.Click += (o, e) => {
rebase.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Rebase(_repo, current, commit));
e.Handled = true;
};
@ -192,16 +248,20 @@ namespace SourceGit.ViewModels {
var cherryPick = new MenuItem();
cherryPick.Header = App.Text("CommitCM.CherryPick");
cherryPick.Icon = App.CreateMenuIcon("Icons.CherryPick");
cherryPick.Click += (o, e) => {
cherryPick.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CherryPick(_repo, commit));
e.Handled = true;
};
menu.Items.Add(cherryPick);
} else {
}
else
{
var revert = new MenuItem();
revert.Header = App.Text("CommitCM.Revert");
revert.Icon = App.CreateMenuIcon("Icons.Undo");
revert.Click += (o, e) => {
revert.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Revert(_repo, commit));
e.Handled = true;
};
@ -213,7 +273,8 @@ namespace SourceGit.ViewModels {
var createBranch = new MenuItem();
createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add");
createBranch.Header = App.Text("CreateBranch");
createBranch.Click += (o, e) => {
createBranch.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(_repo, commit));
e.Handled = true;
};
@ -222,7 +283,8 @@ namespace SourceGit.ViewModels {
var createTag = new MenuItem();
createTag.Icon = App.CreateMenuIcon("Icons.Tag.Add");
createTag.Header = App.Text("CreateTag");
createTag.Click += (o, e) => {
createTag.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateTag(_repo, commit));
e.Handled = true;
};
@ -232,13 +294,15 @@ namespace SourceGit.ViewModels {
var saveToPatch = new MenuItem();
saveToPatch.Icon = App.CreateMenuIcon("Icons.Diff");
saveToPatch.Header = App.Text("CommitCM.SaveAsPatch");
saveToPatch.Click += async (_, e) => {
saveToPatch.Click += async (_, e) =>
{
var topLevel = App.GetTopLevel();
if (topLevel == null) return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1) {
if (selected.Count == 1)
{
var succ = new Commands.FormatPatch(_repo.FullPath, commit.SHA, selected[0].Path.LocalPath).Exec();
if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
}
@ -250,7 +314,8 @@ namespace SourceGit.ViewModels {
var archive = new MenuItem();
archive.Icon = App.CreateMenuIcon("Icons.Archive");
archive.Header = App.Text("Archive");
archive.Click += (o, e) => {
archive.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Archive(_repo, commit));
e.Handled = true;
};
@ -260,7 +325,8 @@ namespace SourceGit.ViewModels {
var copySHA = new MenuItem();
copySHA.Header = App.Text("CommitCM.CopySHA");
copySHA.Icon = App.CreateMenuIcon("Icons.Copy");
copySHA.Click += (o, e) => {
copySHA.Click += (o, e) =>
{
App.CopyText(commit.SHA);
e.Handled = true;
};
@ -268,19 +334,22 @@ namespace SourceGit.ViewModels {
return menu;
}
private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current) {
private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
{
var submenu = new MenuItem();
submenu.Icon = App.CreateMenuIcon("Icons.Branch");
submenu.Header = current.Name;
if (!string.IsNullOrEmpty(current.Upstream)) {
if (!string.IsNullOrEmpty(current.Upstream))
{
var upstream = current.Upstream.Substring(13);
var fastForward = new MenuItem();
fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream);
fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
fastForward.IsEnabled = !string.IsNullOrEmpty(current.UpstreamTrackStatus) && current.UpstreamTrackStatus.IndexOf('↑') < 0; ;
fastForward.Click += (o, e) => {
fastForward.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Merge(_repo, upstream, current.Name));
e.Handled = true;
};
@ -289,7 +358,8 @@ namespace SourceGit.ViewModels {
var pull = new MenuItem();
pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream);
pull.Icon = App.CreateMenuIcon("Icons.Pull");
pull.Click += (o, e) => {
pull.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Pull(_repo, null));
e.Handled = true;
};
@ -300,7 +370,8 @@ namespace SourceGit.ViewModels {
push.Header = new Views.NameHighlightedTextBlock("BranchCM.Push", current.Name);
push.Icon = App.CreateMenuIcon("Icons.Push");
push.IsEnabled = _repo.Remotes.Count > 0;
push.Click += (o, e) => {
push.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Push(_repo, current));
e.Handled = true;
};
@ -308,11 +379,13 @@ namespace SourceGit.ViewModels {
submenu.Items.Add(new MenuItem() { Header = "-" });
var type = _repo.GitFlow.GetBranchType(current.Name);
if (type != Models.GitFlowBranchType.None) {
if (type != Models.GitFlowBranchType.None)
{
var finish = new MenuItem();
finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", current.Name);
finish.Icon = App.CreateMenuIcon("Icons.Flow");
finish.Click += (o, e) => {
finish.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowFinish(_repo, current, type));
e.Handled = true;
};
@ -323,7 +396,8 @@ namespace SourceGit.ViewModels {
var rename = new MenuItem();
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", current.Name);
rename.Icon = App.CreateMenuIcon("Icons.Rename");
rename.Click += (o, e) => {
rename.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new RenameBranch(_repo, current));
e.Handled = true;
};
@ -332,7 +406,8 @@ namespace SourceGit.ViewModels {
menu.Items.Add(submenu);
}
private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged) {
private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged)
{
var submenu = new MenuItem();
submenu.Icon = App.CreateMenuIcon("Icons.Branch");
submenu.Header = branch.Name;
@ -340,7 +415,8 @@ namespace SourceGit.ViewModels {
var checkout = new MenuItem();
checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
checkout.Icon = App.CreateMenuIcon("Icons.Check");
checkout.Click += (o, e) => {
checkout.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Checkout(_repo, branch.Name));
e.Handled = true;
};
@ -350,7 +426,8 @@ namespace SourceGit.ViewModels {
merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name);
merge.Icon = App.CreateMenuIcon("Icons.Merge");
merge.IsEnabled = !merged;
merge.Click += (o, e) => {
merge.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(_repo, branch.Name, current.Name));
e.Handled = true;
};
@ -358,11 +435,13 @@ namespace SourceGit.ViewModels {
submenu.Items.Add(new MenuItem() { Header = "-" });
var type = _repo.GitFlow.GetBranchType(branch.Name);
if (type != Models.GitFlowBranchType.None) {
if (type != Models.GitFlowBranchType.None)
{
var finish = new MenuItem();
finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
finish.Icon = App.CreateMenuIcon("Icons.Flow");
finish.Click += (o, e) => {
finish.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowFinish(_repo, branch, type));
e.Handled = true;
};
@ -373,7 +452,8 @@ namespace SourceGit.ViewModels {
var rename = new MenuItem();
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
rename.Icon = App.CreateMenuIcon("Icons.Rename");
rename.Click += (o, e) => {
rename.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new RenameBranch(_repo, branch));
e.Handled = true;
};
@ -382,7 +462,8 @@ namespace SourceGit.ViewModels {
var delete = new MenuItem();
delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", branch.Name);
delete.Icon = App.CreateMenuIcon("Icons.Clear");
delete.Click += (o, e) => {
delete.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(_repo, branch));
e.Handled = true;
};
@ -391,7 +472,8 @@ namespace SourceGit.ViewModels {
menu.Items.Add(submenu);
}
private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged) {
private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged)
{
var name = $"{branch.Remote}/{branch.Name}";
var submenu = new MenuItem();
@ -401,9 +483,12 @@ namespace SourceGit.ViewModels {
var checkout = new MenuItem();
checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", name);
checkout.Icon = App.CreateMenuIcon("Icons.Check");
checkout.Click += (o, e) => {
foreach (var b in _repo.Branches) {
if (b.IsLocal && b.Upstream == branch.FullName) {
checkout.Click += (o, e) =>
{
foreach (var b in _repo.Branches)
{
if (b.IsLocal && b.Upstream == branch.FullName)
{
if (b.IsCurrent) return;
if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Checkout(_repo, b.Name));
return;
@ -419,7 +504,8 @@ namespace SourceGit.ViewModels {
merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", name, current.Name);
merge.Icon = App.CreateMenuIcon("Icons.Merge");
merge.IsEnabled = !merged;
merge.Click += (o, e) => {
merge.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(_repo, name, current.Name));
e.Handled = true;
};
@ -430,7 +516,8 @@ namespace SourceGit.ViewModels {
var delete = new MenuItem();
delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);
delete.Icon = App.CreateMenuIcon("Icons.Clear");
delete.Click += (o, e) => {
delete.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(_repo, branch));
e.Handled = true;
};
@ -439,7 +526,8 @@ namespace SourceGit.ViewModels {
menu.Items.Add(submenu);
}
private void FillTagMenu(ContextMenu menu, Models.Tag tag) {
private void FillTagMenu(ContextMenu menu, Models.Tag tag)
{
var submenu = new MenuItem();
submenu.Header = tag.Name;
submenu.Icon = App.CreateMenuIcon("Icons.Tag");
@ -449,7 +537,8 @@ namespace SourceGit.ViewModels {
push.Header = new Views.NameHighlightedTextBlock("TagCM.Push", tag.Name);
push.Icon = App.CreateMenuIcon("Icons.Push");
push.IsEnabled = _repo.Remotes.Count > 0;
push.Click += (o, e) => {
push.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new PushTag(_repo, tag));
e.Handled = true;
};
@ -458,7 +547,8 @@ namespace SourceGit.ViewModels {
var delete = new MenuItem();
delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
delete.Icon = App.CreateMenuIcon("Icons.Clear");
delete.Click += (o, e) => {
delete.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteTag(_repo, tag));
e.Handled = true;
};
@ -468,11 +558,11 @@ namespace SourceGit.ViewModels {
}
private Repository _repo = null;
private double _dataGridRowHeight = 28;
private readonly double _dataGridRowHeight = 28;
private bool _isLoading = true;
private List<Models.Commit> _commits = new List<Models.Commit>();
private Models.CommitGraph _graph = null;
private Models.Commit _autoSelectedCommit = null;
private object _detailContext = null;
}
}
}