mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 12:15:00 +00:00
code_style: run dotnet format
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
9a36e652e6
commit
12597fd3e3
7 changed files with 22 additions and 19 deletions
|
@ -25,7 +25,8 @@ namespace SourceGit.Native
|
||||||
void OpenWithDefaultEditor(string file);
|
void OpenWithDefaultEditor(string file);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string DataDir {
|
public static string DataDir
|
||||||
|
{
|
||||||
get;
|
get;
|
||||||
private set;
|
private set;
|
||||||
} = string.Empty;
|
} = string.Empty;
|
||||||
|
@ -61,12 +62,14 @@ namespace SourceGit.Native
|
||||||
private set;
|
private set;
|
||||||
} = new Version(0, 0, 0);
|
} = new Version(0, 0, 0);
|
||||||
|
|
||||||
public static string ShellOrTerminal {
|
public static string ShellOrTerminal
|
||||||
|
{
|
||||||
get;
|
get;
|
||||||
set;
|
set;
|
||||||
} = string.Empty;
|
} = string.Empty;
|
||||||
|
|
||||||
public static List<Models.ExternalTool> ExternalTools {
|
public static List<Models.ExternalTool> ExternalTools
|
||||||
|
{
|
||||||
get;
|
get;
|
||||||
set;
|
set;
|
||||||
} = [];
|
} = [];
|
||||||
|
|
|
@ -295,7 +295,7 @@ namespace SourceGit.ViewModels
|
||||||
public void NavigateToCommit(Models.Commit commit)
|
public void NavigateToCommit(Models.Commit commit)
|
||||||
{
|
{
|
||||||
_repo.NavigateToCommit(commit.SHA);
|
_repo.NavigateToCommit(commit.SHA);
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly Repository _repo = null;
|
private readonly Repository _repo = null;
|
||||||
private readonly string _file = null;
|
private readonly string _file = null;
|
||||||
|
|
|
@ -285,7 +285,7 @@ namespace SourceGit.ViewModels
|
||||||
|
|
||||||
if (canCherryPick || canMerge)
|
if (canCherryPick || canMerge)
|
||||||
multipleMenu.Items.Add(new MenuItem() { Header = "-" });
|
multipleMenu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
|
|
||||||
var saveToPatchMultiple = new MenuItem();
|
var saveToPatchMultiple = new MenuItem();
|
||||||
saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff");
|
saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff");
|
||||||
|
@ -589,7 +589,7 @@ namespace SourceGit.ViewModels
|
||||||
menu.Items.Add(interactiveRebase);
|
menu.Items.Add(interactiveRebase);
|
||||||
menu.Items.Add(new MenuItem() { Header = "-" });
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current.Head != commit.SHA)
|
if (current.Head != commit.SHA)
|
||||||
{
|
{
|
||||||
|
@ -937,7 +937,7 @@ namespace SourceGit.ViewModels
|
||||||
submenu.Items.Add(finish);
|
submenu.Items.Add(finish);
|
||||||
submenu.Items.Add(new MenuItem() { Header = "-" });
|
submenu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var copy = new MenuItem();
|
var copy = new MenuItem();
|
||||||
copy.Header = App.Text("BranchCM.CopyName");
|
copy.Header = App.Text("BranchCM.CopyName");
|
||||||
|
@ -983,7 +983,7 @@ namespace SourceGit.ViewModels
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
};
|
};
|
||||||
submenu.Items.Add(merge);
|
submenu.Items.Add(merge);
|
||||||
}
|
}
|
||||||
|
|
||||||
var rename = new MenuItem();
|
var rename = new MenuItem();
|
||||||
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
|
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
|
||||||
|
@ -1025,7 +1025,7 @@ namespace SourceGit.ViewModels
|
||||||
submenu.Items.Add(finish);
|
submenu.Items.Add(finish);
|
||||||
submenu.Items.Add(new MenuItem() { Header = "-" });
|
submenu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var copy = new MenuItem();
|
var copy = new MenuItem();
|
||||||
copy.Header = App.Text("BranchCM.CopyName");
|
copy.Header = App.Text("BranchCM.CopyName");
|
||||||
|
@ -1131,7 +1131,7 @@ namespace SourceGit.ViewModels
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
};
|
};
|
||||||
submenu.Items.Add(merge);
|
submenu.Items.Add(merge);
|
||||||
}
|
}
|
||||||
|
|
||||||
var delete = new MenuItem();
|
var delete = new MenuItem();
|
||||||
delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
|
delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
|
||||||
|
|
|
@ -1500,7 +1500,7 @@ namespace SourceGit.ViewModels
|
||||||
menu.Items.Add(fastForward);
|
menu.Items.Add(fastForward);
|
||||||
menu.Items.Add(pull);
|
menu.Items.Add(pull);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.Items.Add(push);
|
menu.Items.Add(push);
|
||||||
}
|
}
|
||||||
|
@ -1518,7 +1518,7 @@ namespace SourceGit.ViewModels
|
||||||
};
|
};
|
||||||
menu.Items.Add(checkout);
|
menu.Items.Add(checkout);
|
||||||
menu.Items.Add(new MenuItem() { Header = "-" });
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
}
|
}
|
||||||
|
|
||||||
var worktree = _worktrees.Find(x => x.Branch == branch.FullName);
|
var worktree = _worktrees.Find(x => x.Branch == branch.FullName);
|
||||||
var upstream = _branches.Find(x => x.FullName == branch.Upstream);
|
var upstream = _branches.Find(x => x.FullName == branch.Upstream);
|
||||||
|
@ -1577,7 +1577,7 @@ namespace SourceGit.ViewModels
|
||||||
|
|
||||||
menu.Items.Add(merge);
|
menu.Items.Add(merge);
|
||||||
menu.Items.Add(rebase);
|
menu.Items.Add(rebase);
|
||||||
}
|
}
|
||||||
|
|
||||||
var compareWithHead = new MenuItem();
|
var compareWithHead = new MenuItem();
|
||||||
compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
|
compareWithHead.Header = App.Text("BranchCM.CompareWithHead");
|
||||||
|
@ -1629,7 +1629,7 @@ namespace SourceGit.ViewModels
|
||||||
menu.Items.Add(new MenuItem() { Header = "-" });
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
||||||
menu.Items.Add(finish);
|
menu.Items.Add(finish);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var rename = new MenuItem();
|
var rename = new MenuItem();
|
||||||
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
|
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
|
||||||
|
@ -1702,7 +1702,7 @@ namespace SourceGit.ViewModels
|
||||||
};
|
};
|
||||||
menu.Items.Add(tracking);
|
menu.Items.Add(tracking);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var archive = new MenuItem();
|
var archive = new MenuItem();
|
||||||
archive.Icon = App.CreateMenuIcon("Icons.Archive");
|
archive.Icon = App.CreateMenuIcon("Icons.Archive");
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
using System.Collections.Generic;
|
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
|
@ -56,7 +55,7 @@ namespace SourceGit.Views
|
||||||
|
|
||||||
NotifyDonePanel.IsVisible = true;
|
NotifyDonePanel.IsVisible = true;
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,7 +146,8 @@ namespace SourceGit.Views
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.Key == Key.Q) {
|
if (e.Key == Key.Q)
|
||||||
|
{
|
||||||
App.Quit(0);
|
App.Quit(0);
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1000,7 +1000,7 @@ namespace SourceGit.Views
|
||||||
builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1));
|
builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == endIdx && selection.EndPosition.Column < line.Content.Length)
|
if (i == endIdx && selection.EndPosition.Column < line.Content.Length)
|
||||||
{
|
{
|
||||||
builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));
|
builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue