michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2025-01-13 00:07:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

code_style: run dotnet format

Browse source
This commit is contained in:
leo 2025-01-08 21:44:35 +08:00
parent f06b1d5d51
commit a3d744f426
No known key found for this signature in database
12 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/App.Commands.cs
View file

@ -29,11 +29,11 @@ namespace SourceGit
{ {
get get
{ {
#if DISABLE_UPDATE_DETECTION #if DISABLE_UPDATE_DETECTION
return false; return false;
#else #else
return true; return true;
#endif #endif
} }
} }

4
src/App.axaml.cs
View file

@ -548,11 +548,11 @@ namespace SourceGit
_launcher = new ViewModels.Launcher(startupRepo); _launcher = new ViewModels.Launcher(startupRepo);
desktop.MainWindow = new Views.Launcher() { DataContext = _launcher }; desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
#if !DISABLE_UPDATE_DETECTION #if !DISABLE_UPDATE_DETECTION
var pref = ViewModels.Preference.Instance; var pref = ViewModels.Preference.Instance;
if (pref.ShouldCheck4UpdateOnStartup()) if (pref.ShouldCheck4UpdateOnStartup())
Check4Update(); Check4Update();
#endif #endif
} }
private ViewModels.Launcher _launcher = null; private ViewModels.Launcher _launcher = null;

3
src/Native/MacOS.cs
View file

@ -29,7 +29,8 @@ namespace SourceGit.Native
"/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git"
}; };
foreach (var path in gitPathVariants) foreach (var path in gitPathVariants)
if (File.Exists(path)) return path; if (File.Exists(path))
return path;
return string.Empty; return string.Empty;
} }

4
src/ViewModels/WorkingCopy.cs
View file

@ -619,7 +619,7 @@ namespace SourceGit.ViewModels
useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", cherryPick.HeadName); useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", cherryPick.HeadName);
useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", _repo.CurrentBranch.Name); useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
} }
else if(_inProgressContext is RebaseInProgress rebase) else if (_inProgressContext is RebaseInProgress rebase)
{ {
useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", rebase.HeadName); useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", rebase.HeadName);
useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", rebase.BaseName); useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", rebase.BaseName);
@ -971,7 +971,7 @@ namespace SourceGit.ViewModels
} }
else if (_inProgressContext is RevertInProgress revert) else if (_inProgressContext is RevertInProgress revert)
{ {
useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", revert.Head.SHA.Substring(0,10) + " (revert)"); useTheirs.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", revert.Head.SHA.Substring(0, 10) + " (revert)");
useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", _repo.CurrentBranch.Name); useMine.Header = new Views.NameHighlightedTextBlock("FileCM.ResolveUsing", _repo.CurrentBranch.Name);
} }
else if (_inProgressContext is MergeInProgress merge) else if (_inProgressContext is MergeInProgress merge)

3
src/Views/CommitBaseInfo.axaml.cs
View file

@ -136,7 +136,8 @@ namespace SourceGit.Views
Task.Run(() => Task.Run(() =>
{ {
var c = detail.GetParent(sha); var c = detail.GetParent(sha);
if (c == null) return; if (c == null)
return;
Dispatcher.UIThread.Invoke(() => Dispatcher.UIThread.Invoke(() =>
{ {

4
src/Views/SelfUpdate.axaml.cs
View file

@ -1,14 +1,12 @@
using System; using System;
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using AvaloniaEdit;
using AvaloniaEdit.Document; using AvaloniaEdit.Document;
using AvaloniaEdit.Editing; using AvaloniaEdit.Editing;
using AvaloniaEdit.TextMate; using AvaloniaEdit.TextMate;
using AvaloniaEdit;
namespace SourceGit.Views namespace SourceGit.Views
{ {