diff --git a/.gitignore b/.gitignore index f348333a..1742b876 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ .vscode bin obj -publish *.user diff --git a/README.md b/README.md index ca35f786..878c1abe 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # SourceGit -Opensouce Git GUI client for Windows. +Opensouce Git GUI client. ## High-lights * Opensource/Free -* Light-weight * Fast * English/简体中文 * Build-in light/dark themes @@ -29,8 +28,6 @@ Opensouce Git GUI client for Windows. Pre-build Binaries：[Releases](https://github.com/sourcegit-scm/sourcegit/releases) -> NOTE: You need install Git first. - ## Screen Shots * Drak Theme diff --git a/src/App.axaml b/src/App.axaml new file mode 100644 index 00000000..b9124294 --- /dev/null +++ b/src/App.axaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/App.axaml.cs b/src/App.axaml.cs new file mode 100644 index 00000000..924d79b5 --- /dev/null +++ b/src/App.axaml.cs @@ -0,0 +1,158 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Data.Core.Plugins; +using Avalonia.Markup.Xaml; +using Avalonia.Media; +using Avalonia.Styling; +using System; +using System.Diagnostics; +using System.IO; +using System.Reflection; +using System.Text; + +namespace SourceGit { + public partial class App : Application { + + [STAThread] + public static void Main(string[] args) { + try { + BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); + } catch (Exception ex) { + var builder = new StringBuilder(); + builder.Append("Crash: "); + builder.Append(ex.Message); + builder.Append("\n\n"); + builder.Append("----------------------------\n"); + builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n"); + builder.Append($"OS: {Environment.OSVersion.ToString()}\n"); + builder.Append($"Framework: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n"); + builder.Append($"Source: {ex.Source}\n"); + builder.Append($"---------------------------\n\n"); + builder.Append(ex.StackTrace); + + var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"); + var file = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName); + file = Path.Combine(file, $"crash_{time}.log"); + File.WriteAllText(file, builder.ToString()); + } + } + + public static AppBuilder BuildAvaloniaApp() { + var builder = AppBuilder.Configure(); + builder.UsePlatformDetect(); + + if (OperatingSystem.IsWindows()) { + builder.With(new FontManagerOptions() { + FontFallbacks = [ + new FontFallback { FontFamily = new FontFamily("Microsoft YaHei UI") } + ] + }); + } else if (OperatingSystem.IsMacOS()) { + builder.With(new FontManagerOptions() { + FontFallbacks = [ + new FontFallback { FontFamily = new FontFamily("PingFang SC") } + ] + }); + builder.With(new MacOSPlatformOptions() { + DisableDefaultApplicationMenuItems = true, + DisableNativeMenus = true, + }); + } + + builder.LogToTrace(); + return builder; + } + + public static void RaiseException(string context, string message) { + if (Current is App app && app._notificationReceiver != null) { + var ctx = context.Replace('\\', '/'); + var notice = new Models.Notification() { IsError = true, Message = message }; + app._notificationReceiver.OnReceiveNotification(ctx, notice); + } + } + + public static void SendNotification(string context, string message) { + if (Current is App app && app._notificationReceiver != null) { + var ctx = context.Replace('\\', '/'); + var notice = new Models.Notification() { IsError = false, Message = message }; + app._notificationReceiver.OnReceiveNotification(ctx, notice); + } + } + + public static void SetLocale(string localeKey) { + var app = Current as App; + var targetLocale = app.Resources[localeKey] as ResourceDictionary; + if (targetLocale == null || targetLocale == app._activeLocale) { + return; + } + + if (app._activeLocale != null) { + app.Resources.MergedDictionaries.Remove(app._activeLocale); + } + + app.Resources.MergedDictionaries.Add(targetLocale); + app._activeLocale = targetLocale; + } + + public static void SetTheme(string theme) { + if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase)) { + App.Current.RequestedThemeVariant = ThemeVariant.Light; + } else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) { + App.Current.RequestedThemeVariant = ThemeVariant.Dark; + } else { + App.Current.RequestedThemeVariant = ThemeVariant.Default; + } + } + + public static async void CopyText(string data) { + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { + if (desktop.MainWindow.Clipboard is { } clipbord) { + await clipbord.SetTextAsync(data); + } + } + } + + public static string Text(string key, params object[] args) { + var fmt = Current.FindResource($"Text.{key}") as string; + if (string.IsNullOrWhiteSpace(fmt)) return $"Text.{key}"; + return string.Format(fmt, args); + } + + public static TopLevel GetTopLevel() { + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { + return desktop.MainWindow; + } + return null; + } + + public static void Quit() { + if (Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { + desktop.MainWindow.Close(); + desktop.Shutdown(); + } + } + + public override void Initialize() { + AvaloniaXamlLoader.Load(this); + + SetLocale(ViewModels.Preference.Instance.Locale); + SetTheme(ViewModels.Preference.Instance.Theme); + } + + public override void OnFrameworkInitializationCompleted() { + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { + BindingPlugins.DataValidators.RemoveAt(0); + + var launcher = new Views.Launcher(); + _notificationReceiver = launcher; + desktop.MainWindow = launcher; + } + + base.OnFrameworkInitializationCompleted(); + } + + private ResourceDictionary _activeLocale = null; + private Models.INotificationReceiver _notificationReceiver = null; + } +} \ No newline at end of file diff --git a/src/App.manifest b/src/App.manifest index 5a6db8f3..b3bc3bdf 100644 --- a/src/App.manifest +++ b/src/App.manifest @@ -1,14 +1,18 @@  - - - - - - - - PerMonitorV2 - true - + + + + + + + + + + diff --git a/src/App.xaml b/src/App.xaml deleted file mode 100644 index 1f48956b..00000000 --- a/src/App.xaml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/App.xaml.cs b/src/App.xaml.cs deleted file mode 100644 index 16637cd1..00000000 --- a/src/App.xaml.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.IO; -using System.Windows; - -namespace SourceGit { - - /// - /// 程序入口. - /// - public partial class App : Application { - public static event Action ExceptionRaised; - - /// - /// 读取本地化字串 - /// - /// 本地化字串的Key - /// 可选格式化参数 - /// 本地化字串 - public static string Text(string key, params object[] args) { - var data = Current.FindResource($"Text.{key}") as string; - if (string.IsNullOrEmpty(data)) return $"Text.{key}"; - return string.Format(data, args); - } - - /// - /// 触发错误 - /// - /// 错误上下文 - /// 错误内容 - public static void Exception(string ctx, string detail) { - ExceptionRaised?.Invoke(ctx, detail); - } - - /// - /// 启动. - /// - /// - /// - protected override void OnStartup(StartupEventArgs e) { - base.OnStartup(e); - - // 崩溃文件生成 - AppDomain.CurrentDomain.UnhandledException += (_, ev) => Models.CrashInfo.Create(ev.ExceptionObject as Exception); - - // 创建必要目录 - if (!Directory.Exists(Views.Controls.Avatar.CACHE_PATH)) { - Directory.CreateDirectory(Views.Controls.Avatar.CACHE_PATH); - } - - Models.Theme.Change(); - Models.Locale.Change(); - - // 如果启动命令中指定了路径，打开指定目录的仓库 - var launcher = new Views.Launcher(); - if (Models.Preference.Instance.IsReady) { - if (e.Args.Length > 0) { - var repo = Models.Preference.Instance.FindRepository(e.Args[0]); - if (repo == null) { - var path = new Commands.GetRepositoryRootPath(e.Args[0]).Result(); - if (path != null) { - var gitDir = new Commands.QueryGitDir(path).Result(); - repo = Models.Preference.Instance.AddRepository(path, gitDir); - } - } - - if (repo != null) Models.Watcher.Open(repo); - } else if (Models.Preference.Instance.Restore.IsEnabled) { - var restore = Models.Preference.Instance.Restore; - var actived = null as Models.Repository; - if (restore.Opened.Count > 0) { - foreach (var path in restore.Opened) { - if (!Directory.Exists(path)) continue; - var repo = Models.Preference.Instance.FindRepository(path); - if (repo != null) Models.Watcher.Open(repo); - if (path == restore.Actived) actived = repo; - } - - if (actived != null) Models.Watcher.Open(actived); - } - } - } - - // 主界面显示 - MainWindow = launcher; - MainWindow.Show(); - } - - /// - /// 后台运行 - /// - /// - /// - protected override void OnDeactivated(EventArgs e) { - base.OnDeactivated(e); - GC.Collect(); - Models.Preference.Save(); - } - } -} diff --git a/src/Avalonia.Controls.DataGrid.patch b/src/Avalonia.Controls.DataGrid.patch new file mode 100644 index 00000000..415c537f --- /dev/null +++ b/src/Avalonia.Controls.DataGrid.patch @@ -0,0 +1,81 @@ +diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs +index e4573c3759a8a1eeece45c8bacb4fa853201f8e7..aa29066173e03092b61477985aed73beb08ec8fc 100644 +--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs ++++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs +@@ -716,6 +716,16 @@ public DataGridRowDetailsVisibilityMode RowDetailsVisibilityMode + set { SetValue(RowDetailsVisibilityModeProperty, value); } + } + ++ public static readonly RoutedEvent DisplayRegionChangedEvent = RoutedEvent.Register( ++ nameof(DisplayRegionChanged), ++ RoutingStrategies.Bubble); ++ ++ public event EventHandler DisplayRegionChanged ++ { ++ add => AddHandler(DisplayRegionChangedEvent, value); ++ remove => RemoveHandler(DisplayRegionChangedEvent, value); ++ } ++ + static DataGrid() + { + AffectsMeasure( +@@ -2428,6 +2438,11 @@ protected virtual void OnUnloadingRow(DataGridRowEventArgs e) + } + } + ++ protected virtual void OnDisplayRegionChanged() ++ { ++ RaiseEvent(new RoutedEventArgs(DisplayRegionChangedEvent)); ++ } ++ + /// + /// Comparator class so we can sort list by the display index + /// +@@ -3879,6 +3894,7 @@ private void InvalidateColumnHeadersMeasure() + { + EnsureColumnHeadersVisibility(); + _columnHeadersPresenter.InvalidateMeasure(); ++ OnDisplayRegionChanged(); + } + } + +@@ -3903,6 +3919,8 @@ private void InvalidateRowsMeasure(bool invalidateIndividualElements) + element.InvalidateMeasure(); + } + } ++ ++ OnDisplayRegionChanged(); + } + } + +@@ -6211,5 +6229,30 @@ protected virtual void OnAutoGeneratingColumn(DataGridAutoGeneratingColumnEventA + { + AutoGeneratingColumn?.Invoke(this, e); + } ++ ++ public Vector GetDisplayOffset() ++ { ++ // Has bug when using arrow keys via keyboard. ++ // return new Vector(_horizontalOffset, _verticalOffset); ++ ++ double startX = 0; ++ double startY = 0; ++ ++ foreach (var child in _rowsPresenter.Children) ++ { ++ var row = child as DataGridRow; ++ if (row.Slot >= 0 && row.Bounds.Top <= 0 && row.Bounds.Top > -RowHeight) ++ { ++ var testY = RowHeight * row.Index - row.Bounds.Top; ++ if (startY < testY) ++ { ++ startY = testY; ++ startX = row.Bounds.Left; ++ } ++ } ++ } ++ ++ return new Vector(startX, startY); ++ } + } + } diff --git a/src/BuildWindows.bat b/src/BuildWindows.bat new file mode 100644 index 00000000..8ec72502 --- /dev/null +++ b/src/BuildWindows.bat @@ -0,0 +1 @@ +dotnet publish -c Release -r win-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained \ No newline at end of file diff --git a/src/Commands/Add.cs b/src/Commands/Add.cs index fb98cf87..c83c330d 100644 --- a/src/Commands/Add.cs +++ b/src/Commands/Add.cs @@ -1,27 +1,24 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; namespace SourceGit.Commands { - /// - /// `git add`命令 - /// public class Add : Command { - public Add(string repo) { - Cwd = repo; - Args = "add ."; - } + public Add(string repo, List changes = null) { + WorkingDirectory = repo; + Context = repo; - public Add(string repo, List paths) { - StringBuilder builder = new StringBuilder(); - builder.Append("add --"); - foreach (var p in paths) { - builder.Append(" \""); - builder.Append(p); - builder.Append("\""); + if (changes == null || changes.Count == 0) { + Args = "add ."; + } else { + var builder = new StringBuilder(); + builder.Append("add --"); + foreach (var c in changes) { + builder.Append(" \""); + builder.Append(c.Path); + builder.Append("\""); + } + Args = builder.ToString(); } - - Cwd = repo; - Args = builder.ToString(); } } } diff --git a/src/Commands/Apply.cs b/src/Commands/Apply.cs index f62f113c..3619d963 100644 --- a/src/Commands/Apply.cs +++ b/src/Commands/Apply.cs @@ -1,11 +1,8 @@ -namespace SourceGit.Commands { - /// - /// 应用Patch - /// +namespace SourceGit.Commands { public class Apply : Command { - public Apply(string repo, string file, bool ignoreWhitespace, string whitespaceMode) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = "apply "; if (ignoreWhitespace) Args += "--ignore-whitespace "; else Args += $"--whitespace={whitespaceMode} "; diff --git a/src/Commands/Archive.cs b/src/Commands/Archive.cs index b4153e34..ac748653 100644 --- a/src/Commands/Archive.cs +++ b/src/Commands/Archive.cs @@ -1,22 +1,19 @@ -using System; +using System; namespace SourceGit.Commands { - - /// - /// 存档命令 - /// public class Archive : Command { - private Action handler; - - public Archive(string repo, string revision, string to, Action onProgress) { - Cwd = repo; - Args = $"archive --format=zip --verbose --output=\"{to}\" {revision}"; + public Archive(string repo, string revision, string saveTo, Action outputHandler) { + WorkingDirectory = repo; + Context = repo; + Args = $"archive --format=zip --verbose --output=\"{saveTo}\" {revision}"; TraitErrorAsOutput = true; - handler = onProgress; + _outputHandler = outputHandler; } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler; } } diff --git a/src/Commands/AssumeUnchanged.cs b/src/Commands/AssumeUnchanged.cs index 9a0af3d9..d7dc4c06 100644 --- a/src/Commands/AssumeUnchanged.cs +++ b/src/Commands/AssumeUnchanged.cs @@ -2,59 +2,59 @@ using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 查看、添加或移除忽略变更文件 - /// public class AssumeUnchanged { - private string repo; - class ViewCommand : Command { private static readonly Regex REG = new Regex(@"^(\w)\s+(.+)$"); - private List outs = new List(); public ViewCommand(string repo) { - Cwd = repo; + WorkingDirectory = repo; Args = "ls-files -v"; + RaiseError = false; } public List Result() { Exec(); - return outs; + return _outs; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { var match = REG.Match(line); if (!match.Success) return; if (match.Groups[1].Value == "h") { - outs.Add(match.Groups[2].Value); + _outs.Add(match.Groups[2].Value); } } + + private List _outs = new List(); } class ModCommand : Command { public ModCommand(string repo, string file, bool bAdd) { var mode = bAdd ? "--assume-unchanged" : "--no-assume-unchanged"; - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = $"update-index {mode} -- \"{file}\""; } } public AssumeUnchanged(string repo) { - this.repo = repo; + _repo = repo; } public List View() { - return new ViewCommand(repo).Result(); + return new ViewCommand(_repo).Result(); } public void Add(string file) { - new ModCommand(repo, file, true).Exec(); + new ModCommand(_repo, file, true).Exec(); } public void Remove(string file) { - new ModCommand(repo, file, false).Exec(); + new ModCommand(_repo, file, false).Exec(); } + + private string _repo; } } diff --git a/src/Commands/Blame.cs b/src/Commands/Blame.cs index 571ff17e..908019f9 100644 --- a/src/Commands/Blame.cs +++ b/src/Commands/Blame.cs @@ -1,77 +1,90 @@ -using System; -using System.Collections.Generic; +using System; +using System.IO; +using System.Text; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 逐行追溯 - /// public class Blame : Command { private static readonly Regex REG_FORMAT = new Regex(@"^\^?([0-9a-f]+)\s+.*\((.*)\s+(\d+)\s+[\-\+]?\d+\s+\d+\) (.*)"); private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); - private Data data = new Data(); - private bool needUnifyCommitSHA = false; - private int minSHALen = 0; - - public class Data { - public List Lines = new List(); - public bool IsBinary = false; - } - public Blame(string repo, string file, string revision) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = $"blame -t {revision} -- \"{file}\""; + RaiseError = false; + + _result.File = file; } - public Data Result() { - Exec(); + public Models.BlameData Result() { + var succ = Exec(); + if (!succ) { + return new Models.BlameData(); + } - if (needUnifyCommitSHA) { - foreach (var line in data.Lines) { - if (line.CommitSHA.Length > minSHALen) { - line.CommitSHA = line.CommitSHA.Substring(0, minSHALen); + if (_needUnifyCommitSHA) { + foreach (var line in _result.LineInfos) { + if (line.CommitSHA.Length > _minSHALen) { + line.CommitSHA = line.CommitSHA.Substring(0, _minSHALen); } } } - return data; + _result.Content = _content.ToString(); + return _result; } - public override void OnReadline(string line) { - if (data.IsBinary) return; + protected override void OnReadline(string line) { + if (_result.IsBinary) return; if (string.IsNullOrEmpty(line)) return; if (line.IndexOf('\0') >= 0) { - data.IsBinary = true; - data.Lines.Clear(); + _result.IsBinary = true; + _result.LineInfos.Clear(); return; } var match = REG_FORMAT.Match(line); if (!match.Success) return; + _content.AppendLine(match.Groups[4].Value); + var commit = match.Groups[1].Value; - var author = match.Groups[2].Value; - var timestamp = int.Parse(match.Groups[3].Value); - var content = match.Groups[4].Value; - var when = UTC_START.AddSeconds(timestamp).ToString("yyyy/MM/dd"); + if (commit == _lastSHA) { + var info = new Models.BlameLineInfo() { + CommitSHA = commit, + Author = string.Empty, + Time = string.Empty, + }; - var blameLine = new Models.BlameLine() { - LineNumber = $"{data.Lines.Count + 1}", - CommitSHA = commit, - Author = author, - Time = when, - Content = content, - }; + _result.LineInfos.Add(info); + } else { + var author = match.Groups[2].Value; + var timestamp = int.Parse(match.Groups[3].Value); + var when = UTC_START.AddSeconds(timestamp).ToString("yyyy/MM/dd"); - if (line[0] == '^') { - needUnifyCommitSHA = true; - if (minSHALen == 0) minSHALen = commit.Length; - else if (commit.Length < minSHALen) minSHALen = commit.Length; + var blameLine = new Models.BlameLineInfo() { + IsFirstInGroup = true, + CommitSHA = commit, + Author = author, + Time = when, + }; + + _lastSHA = commit; + _result.LineInfos.Add(blameLine); } - data.Lines.Add(blameLine); + if (line[0] == '^') { + _needUnifyCommitSHA = true; + _minSHALen = Math.Min(_minSHALen, commit.Length); + } } + + private Models.BlameData _result = new Models.BlameData(); + private StringBuilder _content = new StringBuilder(); + private string _lastSHA = string.Empty; + private bool _needUnifyCommitSHA = false; + private int _minSHALen = 64; } } diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs index 387892ba..f109d1e4 100644 --- a/src/Commands/Branch.cs +++ b/src/Commands/Branch.cs @@ -1,38 +1,39 @@ -namespace SourceGit.Commands { - /// - /// 分支相关操作 - /// - class Branch : Command { - private string target = null; - - public Branch(string repo, string branch) { - Cwd = repo; - target = branch; +namespace SourceGit.Commands { + public static class Branch { + public static bool Create(string repo, string name, string basedOn) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; + cmd.Args = $"branch {name} {basedOn}"; + return cmd.Exec(); } - public void Create(string basedOn) { - Args = $"branch {target} {basedOn}"; - Exec(); + public static bool Rename(string repo, string name, string to) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; + cmd.Args = $"branch -M {name} {to}"; + return cmd.Exec(); } - public void Rename(string to) { - Args = $"branch -M {target} {to}"; - Exec(); - } - - public void SetUpstream(string upstream) { - Args = $"branch {target} "; + public static bool SetUpstream(string repo, string name, string upstream) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; if (string.IsNullOrEmpty(upstream)) { - Args += "--unset-upstream"; + cmd.Args = $"branch {name} --unset-upstream"; } else { - Args += $"-u {upstream}"; + cmd.Args = $"branch {name} -u {upstream}"; } - Exec(); + return cmd.Exec(); } - public void Delete() { - Args = $"branch -D {target}"; - Exec(); + public static bool Delete(string repo, string name) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; + cmd.Args = $"branch -D {name}"; + return cmd.Exec(); } } } diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs index 1f169992..14121fab 100644 --- a/src/Commands/Checkout.cs +++ b/src/Commands/Checkout.cs @@ -1,29 +1,25 @@ -using System; +using System; using System.Collections.Generic; using System.Text; namespace SourceGit.Commands { - /// - /// 检出 - /// public class Checkout : Command { - private Action handler = null; - public Checkout(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; } public bool Branch(string branch, Action onProgress) { Args = $"checkout --progress {branch}"; TraitErrorAsOutput = true; - handler = onProgress; + _outputHandler = onProgress; return Exec(); } public bool Branch(string branch, string basedOn, Action onProgress) { Args = $"checkout --progress -b {branch} {basedOn}"; TraitErrorAsOutput = true; - handler = onProgress; + _outputHandler = onProgress; return Exec(); } @@ -54,8 +50,10 @@ namespace SourceGit.Commands { return Exec(); } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler; } } diff --git a/src/Commands/CherryPick.cs b/src/Commands/CherryPick.cs index ca939e76..6160ebac 100644 --- a/src/Commands/CherryPick.cs +++ b/src/Commands/CherryPick.cs @@ -1,12 +1,9 @@ -namespace SourceGit.Commands { - /// - /// 遴选命令 - /// +namespace SourceGit.Commands { public class CherryPick : Command { - public CherryPick(string repo, string commit, bool noCommit) { var mode = noCommit ? "-n" : "--ff"; - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = $"cherry-pick {mode} {commit}"; } } diff --git a/src/Commands/Clean.cs b/src/Commands/Clean.cs index 38a9a477..56a56a6c 100644 --- a/src/Commands/Clean.cs +++ b/src/Commands/Clean.cs @@ -1,14 +1,11 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; namespace SourceGit.Commands { - /// - /// 清理指令 - /// public class Clean : Command { - public Clean(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = "clean -qfd"; } @@ -21,7 +18,8 @@ namespace SourceGit.Commands { builder.Append("\""); } - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = builder.ToString(); } } diff --git a/src/Commands/Clone.cs b/src/Commands/Clone.cs index fefc0f3e..a6228e20 100644 --- a/src/Commands/Clone.cs +++ b/src/Commands/Clone.cs @@ -1,24 +1,18 @@ -using System; +using System; namespace SourceGit.Commands { - - /// - /// 克隆 - /// public class Clone : Command { - private Action handler = null; - private Action onError = null; + private Action _notifyProgress; - public Clone(string path, string url, string localName, string sshKey, string extraArgs, Action outputHandler, Action errHandler) { - Cwd = path; + public Clone(string ctx, string path, string url, string localName, string sshKey, string extraArgs, Action ouputHandler) { + Context = ctx; + WorkingDirectory = path; TraitErrorAsOutput = true; - handler = outputHandler; - onError = errHandler; if (string.IsNullOrEmpty(sshKey)) { - Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; - } else { Args = "-c credential.helper=manager "; + } else { + Args = $"-c core.sshCommand=\"ssh -i '{sshKey}'\" "; } Args += "clone --progress --verbose --recurse-submodules "; @@ -26,14 +20,12 @@ namespace SourceGit.Commands { if (!string.IsNullOrEmpty(extraArgs)) Args += $"{extraArgs} "; Args += $"{url} "; if (!string.IsNullOrEmpty(localName)) Args += localName; + + _notifyProgress = ouputHandler; } - public override void OnReadline(string line) { - handler?.Invoke(line); - } - - public override void OnException(string message) { - onError?.Invoke(message); + protected override void OnReadline(string line) { + _notifyProgress?.Invoke(line); } } } diff --git a/src/Commands/Command.cs b/src/Commands/Command.cs index aac9bdff..9e55a581 100644 --- a/src/Commands/Command.cs +++ b/src/Commands/Command.cs @@ -1,3 +1,4 @@ +using Avalonia.Threading; using System; using System.Collections.Generic; using System.Diagnostics; @@ -5,60 +6,27 @@ using System.Text; using System.Text.RegularExpressions; namespace SourceGit.Commands { - - /// - /// 用于取消命令执行的上下文对象 - /// - public class Context { - public bool IsCancelRequested { get; set; } = false; - } - - /// - /// 命令接口 - /// public class Command { - private static readonly Regex PROGRESS_REG = new Regex(@"\d+%"); - - /// - /// 读取全部输出时的结果 - /// - public class ReadToEndResult { - public bool IsSuccess { get; set; } - public string Output { get; set; } - public string Error { get; set; } + public class CancelToken { + public bool Requested { get; set; } = false; } - /// - /// 上下文 - /// - public Context Ctx { get; set; } = null; + public class ReadToEndResult { + public bool IsSuccess { get; set; } + public string StdOut { get; set; } + public string StdErr { get; set; } + } - /// - /// 运行路径 - /// - public string Cwd { get; set; } = ""; - - /// - /// 参数 - /// - public string Args { get; set; } = ""; - - /// - /// 是否忽略错误 - /// - public bool DontRaiseError { get; set; } = false; - - /// - /// 使用标准错误输出 - /// + public string Context { get; set; } = string.Empty; + public CancelToken Cancel { get; set; } = null; + public string WorkingDirectory { get; set; } = null; + public string Args { get; set; } = string.Empty; + public bool RaiseError { get; set; } = true; public bool TraitErrorAsOutput { get; set; } = false; - /// - /// 运行 - /// public bool Exec() { var start = new ProcessStartInfo(); - start.FileName = Models.Preference.Instance.Git.Path; + start.FileName = Native.OS.GitExecutableFile; start.Arguments = "--no-pager -c core.quotepath=off " + Args; start.UseShellExecute = false; start.CreateNoWindow = true; @@ -67,49 +35,53 @@ namespace SourceGit.Commands { start.StandardOutputEncoding = Encoding.UTF8; start.StandardErrorEncoding = Encoding.UTF8; - if (!string.IsNullOrEmpty(Cwd)) start.WorkingDirectory = Cwd; + if (!string.IsNullOrEmpty(WorkingDirectory)) start.WorkingDirectory = WorkingDirectory; var errs = new List(); var proc = new Process() { StartInfo = start }; var isCancelled = false; - proc.OutputDataReceived += (o, e) => { - if (Ctx != null && Ctx.IsCancelRequested) { + proc.OutputDataReceived += (_, e) => { + if (Cancel != null && Cancel.Requested) { isCancelled = true; proc.CancelErrorRead(); proc.CancelOutputRead(); - if (!proc.HasExited) proc.Kill(); + if (!proc.HasExited) proc.Kill(true); return; } - if (e.Data == null) return; - OnReadline(e.Data); + if (e.Data != null) OnReadline(e.Data); }; - proc.ErrorDataReceived += (o, e) => { - if (Ctx != null && Ctx.IsCancelRequested) { + + proc.ErrorDataReceived += (_, e) => { + if (Cancel != null && Cancel.Requested) { isCancelled = true; proc.CancelErrorRead(); proc.CancelOutputRead(); - if (!proc.HasExited) proc.Kill(); + if (!proc.HasExited) proc.Kill(true); return; } if (string.IsNullOrEmpty(e.Data)) return; if (TraitErrorAsOutput) OnReadline(e.Data); - // 错误信息中忽略进度相关的输出 + // Ignore progress messages if (e.Data.StartsWith("remote: Enumerating objects:", StringComparison.Ordinal)) return; if (e.Data.StartsWith("remote: Counting objects:", StringComparison.Ordinal)) return; if (e.Data.StartsWith("remote: Compressing objects:", StringComparison.Ordinal)) return; if (e.Data.StartsWith("Filtering content:", StringComparison.Ordinal)) return; - if (PROGRESS_REG.IsMatch(e.Data)) return; + if (_progressRegex.IsMatch(e.Data)) return; errs.Add(e.Data); }; try { proc.Start(); } catch (Exception e) { - if (!DontRaiseError) OnException(e.Message); + if (RaiseError) { + Dispatcher.UIThread.Invoke(() => { + App.RaiseException(Context, e.Message); + }); + } return false; } @@ -121,19 +93,20 @@ namespace SourceGit.Commands { proc.Close(); if (!isCancelled && exitCode != 0 && errs.Count > 0) { - if (!DontRaiseError) OnException(string.Join("\n", errs)); + if (RaiseError) { + Dispatcher.UIThread.Invoke(() => { + App.RaiseException(Context, string.Join("\n", errs)); + }); + } return false; } else { return true; } } - /// - /// 直接读取全部标准输出 - /// public ReadToEndResult ReadToEnd() { var start = new ProcessStartInfo(); - start.FileName = Models.Preference.Instance.Git.Path; + start.FileName = Native.OS.GitExecutableFile; start.Arguments = "--no-pager -c core.quotepath=off " + Args; start.UseShellExecute = false; start.CreateNoWindow = true; @@ -142,22 +115,23 @@ namespace SourceGit.Commands { start.StandardOutputEncoding = Encoding.UTF8; start.StandardErrorEncoding = Encoding.UTF8; - if (!string.IsNullOrEmpty(Cwd)) start.WorkingDirectory = Cwd; + if (!string.IsNullOrEmpty(WorkingDirectory)) start.WorkingDirectory = WorkingDirectory; var proc = new Process() { StartInfo = start }; try { proc.Start(); } catch (Exception e) { return new ReadToEndResult() { - Output = string.Empty, - Error = e.Message, IsSuccess = false, + StdOut = string.Empty, + StdErr = e.Message, }; } - var rs = new ReadToEndResult(); - rs.Output = proc.StandardOutput.ReadToEnd(); - rs.Error = proc.StandardError.ReadToEnd(); + var rs = new ReadToEndResult() { + StdOut = proc.StandardOutput.ReadToEnd(), + StdErr = proc.StandardError.ReadToEnd(), + }; proc.WaitForExit(); rs.IsSuccess = proc.ExitCode == 0; @@ -166,19 +140,8 @@ namespace SourceGit.Commands { return rs; } - /// - /// 调用Exec时的读取函数 - /// - /// - public virtual void OnReadline(string line) { - } + protected virtual void OnReadline(string line) { } - /// - /// 默认异常处理函数 - /// - /// - public virtual void OnException(string message) { - App.Exception(Cwd, message); - } + private static readonly Regex _progressRegex = new Regex(@"\d+%"); } -} +} \ No newline at end of file diff --git a/src/Commands/Commit.cs b/src/Commands/Commit.cs index a3dde9a9..2733590c 100644 --- a/src/Commands/Commit.cs +++ b/src/Commands/Commit.cs @@ -1,17 +1,16 @@ -using System.IO; +using System.IO; namespace SourceGit.Commands { - /// - /// `git commit`命令 - /// public class Commit : Command { - public Commit(string repo, string message, bool amend) { + public Commit(string repo, string message, bool amend, bool allowEmpty = false) { var file = Path.GetTempFileName(); File.WriteAllText(file, message); - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = $"commit --file=\"{file}\""; if (amend) Args += " --amend --no-edit"; + if (allowEmpty) Args += " --allow-empty"; } } } diff --git a/src/Commands/CommitChanges.cs b/src/Commands/CommitChanges.cs deleted file mode 100644 index defcbff2..00000000 --- a/src/Commands/CommitChanges.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - - /// - /// 取得一个提交的变更列表 - /// - public class CommitChanges : Command { - private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); - private List changes = new List(); - - public CommitChanges(string cwd, string commit) { - Cwd = cwd; - Args = $"show --name-status {commit}"; - } - - public List Result() { - Exec(); - return changes; - } - - public override void OnReadline(string line) { - var match = REG_FORMAT.Match(line); - if (!match.Success) return; - - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; - - switch (status[0]) { - case 'M': change.Set(Models.Change.Status.Modified); changes.Add(change); break; - case 'A': change.Set(Models.Change.Status.Added); changes.Add(change); break; - case 'D': change.Set(Models.Change.Status.Deleted); changes.Add(change); break; - case 'R': change.Set(Models.Change.Status.Renamed); changes.Add(change); break; - case 'C': change.Set(Models.Change.Status.Copied); changes.Add(change); break; - } - } - } -} diff --git a/src/Commands/CommitRangeChanges.cs b/src/Commands/CommitRangeChanges.cs deleted file mode 100644 index 05cc778e..00000000 --- a/src/Commands/CommitRangeChanges.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - - /// - /// 对比两个提交间的变更 - /// - public class CommitRangeChanges : Command { - private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); - private List changes = new List(); - - public CommitRangeChanges(string cwd, string start, string end) { - Cwd = cwd; - Args = $"diff --name-status {start} {end}"; - } - - public List Result() { - Exec(); - return changes; - } - - public override void OnReadline(string line) { - var match = REG_FORMAT.Match(line); - if (!match.Success) return; - - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; - - switch (status[0]) { - case 'M': change.Set(Models.Change.Status.Modified); changes.Add(change); break; - case 'A': change.Set(Models.Change.Status.Added); changes.Add(change); break; - case 'D': change.Set(Models.Change.Status.Deleted); changes.Add(change); break; - case 'R': change.Set(Models.Change.Status.Renamed); changes.Add(change); break; - case 'C': change.Set(Models.Change.Status.Copied); changes.Add(change); break; - } - } - } -} diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs new file mode 100644 index 00000000..2b10adab --- /dev/null +++ b/src/Commands/CompareRevisions.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class CompareRevisions : Command { + private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); + + public CompareRevisions(string repo, string start, string end) { + WorkingDirectory = repo; + Context = repo; + Args = $"diff --name-status {start} {end}"; + } + + public List Result() { + Exec(); + _changes.Sort((l, r) => l.Path.CompareTo(r.Path)); + return _changes; + } + + protected override void OnReadline(string line) { + var match = REG_FORMAT.Match(line); + if (!match.Success) return; + + var change = new Models.Change() { Path = match.Groups[2].Value }; + var status = match.Groups[1].Value; + + switch (status[0]) { + case 'M': change.Set(Models.ChangeState.Modified); _changes.Add(change); break; + case 'A': change.Set(Models.ChangeState.Added); _changes.Add(change); break; + case 'D': change.Set(Models.ChangeState.Deleted); _changes.Add(change); break; + case 'R': change.Set(Models.ChangeState.Renamed); _changes.Add(change); break; + case 'C': change.Set(Models.ChangeState.Copied); _changes.Add(change); break; + } + } + + private List _changes = new List(); + } +} diff --git a/src/Commands/Config.cs b/src/Commands/Config.cs index f77216dd..4a0ebb30 100644 --- a/src/Commands/Config.cs +++ b/src/Commands/Config.cs @@ -1,32 +1,55 @@ +using System; +using System.Collections.Generic; + namespace SourceGit.Commands { - /// - /// config命令 - /// - public class Config : Command { + public class Config : Command { + public Config(string repository) { + WorkingDirectory = repository; + Context = repository; + RaiseError = false; + } - public Config() { } + public Dictionary ListAll() { + Args = "config -l"; - public Config(string repo) { - Cwd = repo; + var output = ReadToEnd(); + var rs = new Dictionary(); + if (output.IsSuccess) { + var lines = output.StdOut.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); + foreach (var line in lines) { + var idx = line.IndexOf('='); + if (idx != -1) { + var key = line.Substring(0, idx).Trim(); + var val = line.Substring(idx+1).Trim(); + if (rs.ContainsKey(key)) { + rs[key] = val; + } else { + rs.Add(key, val); + } + } + } + } + + return rs; } public string Get(string key) { Args = $"config {key}"; - return ReadToEnd().Output.Trim(); + return ReadToEnd().StdOut.Trim(); } - public bool Set(string key, string val, bool allowEmpty = false) { - if (!allowEmpty && string.IsNullOrEmpty(val)) { - if (string.IsNullOrEmpty(Cwd)) { + public bool Set(string key, string value, bool allowEmpty = false) { + if (!allowEmpty && string.IsNullOrWhiteSpace(value)) { + if (string.IsNullOrEmpty(WorkingDirectory)) { Args = $"config --global --unset {key}"; } else { Args = $"config --unset {key}"; } } else { - if (string.IsNullOrEmpty(Cwd)) { - Args = $"config --global {key} \"{val}\""; + if (string.IsNullOrWhiteSpace(WorkingDirectory)) { + Args = $"config --global {key} \"{value}\""; } else { - Args = $"config {key} \"{val}\""; + Args = $"config {key} \"{value}\""; } } diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs index 4e4e641a..983b60c1 100644 --- a/src/Commands/Diff.cs +++ b/src/Commands/Diff.cs @@ -1,111 +1,147 @@ -using System; +using System; using System.Collections.Generic; -using System.Linq; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// Diff命令（用于文件文件比对） - /// public class Diff : Command { private static readonly Regex REG_INDICATOR = new Regex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@"); - private Models.TextChanges changes = new Models.TextChanges(); - private List deleted = new List(); - private List added = new List(); - private int oldLine = 0; - private int newLine = 0; - private int lineIndex = 0; + private static readonly string PREFIX_LFS = " version https://git-lfs.github.com/spec/"; - public Diff(string repo, string args) { - Cwd = repo; - Args = $"diff --ignore-cr-at-eol --unified=4 {args}"; + public Diff(string repo, Models.DiffOption opt) { + WorkingDirectory = repo; + Context = repo; + Args = $"diff --ignore-cr-at-eol --unified=4 {opt}"; } - public Models.TextChanges Result() { + public Models.DiffResult Result() { Exec(); - ProcessChanges(); - if (changes.IsBinary) changes.Lines.Clear(); - lineIndex = 0; - return changes; + + if (_result.IsBinary || _result.IsLFS) { + _result.TextDiff = null; + } else { + ProcessInlineHighlights(); + + if (_result.TextDiff.Lines.Count == 0) { + _result.TextDiff = null; + } else { + _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine); + } + } + + return _result; } - public override void OnReadline(string line) { - if (changes.IsBinary) return; + protected override void OnReadline(string line) { + if (_result.IsBinary) return; - if (changes.Lines.Count == 0) { + if (_result.IsLFS) { + var ch = line[0]; + if (ch == '-') { + line = line.Substring(1); + if (line.StartsWith("oid sha256:")) { + _result.LFSDiff.Old.Oid = line.Substring(11); + } else if (line.StartsWith("size ")) { + _result.LFSDiff.Old.Size = long.Parse(line.Substring(5)); + } + } else if (ch == '+') { + line = line.Substring(1); + if (line.StartsWith("oid sha256:")) { + _result.LFSDiff.New.Oid = line.Substring(11); + } else if (line.StartsWith("size ")) { + _result.LFSDiff.New.Size = long.Parse(line.Substring(5)); + } + } else if (line.StartsWith(" size ")) { + _result.LFSDiff.New.Size = _result.LFSDiff.Old.Size = long.Parse(line.Substring(6)); + } + return; + } + + if (_result.TextDiff.Lines.Count == 0) { var match = REG_INDICATOR.Match(line); if (!match.Success) { - if (line.StartsWith("Binary", StringComparison.Ordinal)) changes.IsBinary = true; + if (line.StartsWith("Binary", StringComparison.Ordinal)) _result.IsBinary = true; return; } - oldLine = int.Parse(match.Groups[1].Value); - newLine = int.Parse(match.Groups[2].Value); - changes.Lines.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Indicator, line, "", "")); + _oldLine = int.Parse(match.Groups[1].Value); + _newLine = int.Parse(match.Groups[2].Value); + _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, "", "")); } else { if (line.Length == 0) { - ProcessChanges(); - changes.Lines.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Normal, "", $"{oldLine}", $"{newLine}")); - oldLine++; - newLine++; + ProcessInlineHighlights(); + _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Normal, "", $"{_oldLine}", $"{_newLine}")); + _oldLine++; + _newLine++; return; } var ch = line[0]; if (ch == '-') { - deleted.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Deleted, line.Substring(1), $"{oldLine}", "")); - oldLine++; + _deleted.Add(new Models.TextDiffLine(Models.TextDiffLineType.Deleted, line.Substring(1), $"{_oldLine}", "")); + _oldLine++; } else if (ch == '+') { - added.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Added, line.Substring(1), "", $"{newLine}")); - newLine++; + _added.Add(new Models.TextDiffLine(Models.TextDiffLineType.Added, line.Substring(1), "", $"{_newLine}")); + _newLine++; } else if (ch != '\\') { - ProcessChanges(); + ProcessInlineHighlights(); var match = REG_INDICATOR.Match(line); if (match.Success) { - oldLine = int.Parse(match.Groups[1].Value); - newLine = int.Parse(match.Groups[2].Value); - changes.Lines.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Indicator, line, "", "")); + _oldLine = int.Parse(match.Groups[1].Value); + _newLine = int.Parse(match.Groups[2].Value); + _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, "", "")); } else { - changes.Lines.Add(new Models.TextChanges.Line(lineIndex++, Models.TextChanges.LineMode.Normal, line.Substring(1), $"{oldLine}", $"{newLine}")); - oldLine++; - newLine++; + if (line.StartsWith(PREFIX_LFS)) { + _result.IsLFS = true; + _result.LFSDiff = new Models.LFSDiff(); + return; + } + + _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Normal, line.Substring(1), $"{_oldLine}", $"{_newLine}")); + _oldLine++; + _newLine++; } } } } - private void ProcessChanges() { - if (deleted.Any()) { - if (added.Count == deleted.Count) { - for (int i = added.Count - 1; i >= 0; i--) { - var left = deleted[i]; - var right = added[i]; + private void ProcessInlineHighlights() { + if (_deleted.Count > 0) { + if (_added.Count == _deleted.Count) { + for (int i = _added.Count - 1; i >= 0; i--) { + var left = _deleted[i]; + var right = _added[i]; if (left.Content.Length > 1024 || right.Content.Length > 1024) continue; - var chunks = Models.TextCompare.Process(left.Content, right.Content); + var chunks = Models.TextInlineChange.Compare(left.Content, right.Content); if (chunks.Count > 4) continue; foreach (var chunk in chunks) { if (chunk.DeletedCount > 0) { - left.Highlights.Add(new Models.TextChanges.HighlightRange(chunk.DeletedStart, chunk.DeletedCount)); + left.Highlights.Add(new Models.TextInlineRange(chunk.DeletedStart, chunk.DeletedCount)); } if (chunk.AddedCount > 0) { - right.Highlights.Add(new Models.TextChanges.HighlightRange(chunk.AddedStart, chunk.AddedCount)); + right.Highlights.Add(new Models.TextInlineRange(chunk.AddedStart, chunk.AddedCount)); } } } } - changes.Lines.AddRange(deleted); - deleted.Clear(); + _result.TextDiff.Lines.AddRange(_deleted); + _deleted.Clear(); } - if (added.Any()) { - changes.Lines.AddRange(added); - added.Clear(); + if (_added.Count > 0) { + _result.TextDiff.Lines.AddRange(_added); + _added.Clear(); } } + + private Models.DiffResult _result = new Models.DiffResult() { TextDiff = new Models.TextDiff() }; + private List _deleted = new List(); + private List _added = new List(); + private int _oldLine = 0; + private int _newLine = 0; } } diff --git a/src/Commands/Discard.cs b/src/Commands/Discard.cs index dd35d0ca..0480c7e6 100644 --- a/src/Commands/Discard.cs +++ b/src/Commands/Discard.cs @@ -1,28 +1,19 @@ -using System; +using System; using System.Collections.Generic; namespace SourceGit.Commands { - /// - /// 忽略变更 - /// - public class Discard { - private string repo = null; - - public Discard(string repo) { - this.repo = repo; - } - - public void Whole() { + public static class Discard { + public static void All(string repo) { new Reset(repo, "HEAD", "--hard").Exec(); new Clean(repo).Exec(); } - public void Changes(List changes) { + public static void Changes(string repo, List changes) { var needClean = new List(); var needCheckout = new List(); foreach (var c in changes) { - if (c.WorkTree == Models.Change.Status.Untracked || c.WorkTree == Models.Change.Status.Added) { + if (c.WorkTree == Models.ChangeState.Untracked || c.WorkTree == Models.ChangeState.Added) { needClean.Add(c.Path); } else { needCheckout.Add(c.Path); diff --git a/src/Commands/Fetch.cs b/src/Commands/Fetch.cs index ad3925cc..ad36051f 100644 --- a/src/Commands/Fetch.cs +++ b/src/Commands/Fetch.cs @@ -1,17 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Threading; +using System; namespace SourceGit.Commands { - - /// - /// 拉取 - /// public class Fetch : Command { - private Action handler = null; - public Fetch(string repo, string remote, bool prune, Action outputHandler) { - Cwd = repo; + _outputHandler = outputHandler; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); @@ -24,12 +18,12 @@ namespace SourceGit.Commands { Args += "fetch --progress --verbose "; if (prune) Args += "--prune "; Args += remote; - handler = outputHandler; - AutoFetch.MarkFetched(repo); } public Fetch(string repo, string remote, string localBranch, string remoteBranch, Action outputHandler) { - Cwd = repo; + _outputHandler = outputHandler; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); @@ -40,63 +34,12 @@ namespace SourceGit.Commands { } Args += $"fetch --progress --verbose {remote} {remoteBranch}:{localBranch}"; - handler = outputHandler; } - public override void OnReadline(string line) { - handler?.Invoke(line); - } - } - - /// - /// 自动拉取（每隔10分钟） - /// - public class AutoFetch { - private static Dictionary jobs = new Dictionary(); - - private Fetch cmd = null; - private long nextFetchPoint = 0; - private Timer timer = null; - - public static void Start(string repo) { - if (!Models.Preference.Instance.Git.AutoFetchRemotes) return; - - // 只自动更新加入管理列表中的仓库（子模块等不自动更新） - var exists = Models.Preference.Instance.FindRepository(repo); - if (exists == null) return; - - var job = new AutoFetch(repo); - jobs.Add(repo, job); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } - public static void MarkFetched(string repo) { - if (!jobs.ContainsKey(repo)) return; - jobs[repo].nextFetchPoint = DateTime.Now.AddMinutes(10).ToFileTime(); - } - - public static void Stop(string repo) { - if (!jobs.ContainsKey(repo)) return; - - jobs[repo].timer.Dispose(); - jobs.Remove(repo); - } - - public AutoFetch(string repo) { - cmd = new Fetch(repo, "--all", true, null); - cmd.DontRaiseError = true; - - nextFetchPoint = DateTime.Now.AddMinutes(10).ToFileTime(); - timer = new Timer(OnTick, null, 60000, 10000); - } - - private void OnTick(object o) { - var now = DateTime.Now.ToFileTime(); - if (nextFetchPoint > now) return; - - Models.Watcher.SetEnabled(cmd.Cwd, false); - cmd.Exec(); - nextFetchPoint = DateTime.Now.AddMinutes(10).ToFileTime(); - Models.Watcher.SetEnabled(cmd.Cwd, true); - } + private Action _outputHandler; } } diff --git a/src/Commands/FormatPatch.cs b/src/Commands/FormatPatch.cs index af5fb624..c139c477 100644 --- a/src/Commands/FormatPatch.cs +++ b/src/Commands/FormatPatch.cs @@ -1,12 +1,9 @@ -namespace SourceGit.Commands { - /// - /// 将Commit另存为Patch文件 - /// +namespace SourceGit.Commands { public class FormatPatch : Command { - - public FormatPatch(string repo, string commit, string path) { - Cwd = repo; - Args = $"format-patch {commit} -1 -o \"{path}\""; + public FormatPatch(string repo, string commit, string saveTo) { + WorkingDirectory = repo; + Context = repo; + Args = $"format-patch {commit} -1 -o \"{saveTo}\""; } } } diff --git a/src/Commands/GC.cs b/src/Commands/GC.cs index ceadb0b7..0c9d5761 100644 --- a/src/Commands/GC.cs +++ b/src/Commands/GC.cs @@ -1,21 +1,19 @@ using System; namespace SourceGit.Commands { - /// - /// GC - /// public class GC : Command { - private Action handler; - - public GC(string repo, Action onProgress) { - Cwd = repo; - Args = "gc"; + public GC(string repo, Action outputHandler) { + _outputHandler = outputHandler; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; - handler = onProgress; + Args = "gc"; } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler; } } diff --git a/src/Commands/GetRepositoryRootPath.cs b/src/Commands/GetRepositoryRootPath.cs deleted file mode 100644 index c4dc6777..00000000 --- a/src/Commands/GetRepositoryRootPath.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace SourceGit.Commands { - /// - /// 取得一个库的根路径 - /// - public class GetRepositoryRootPath : Command { - public GetRepositoryRootPath(string path) { - Cwd = path; - Args = "rev-parse --show-toplevel"; - } - - public string Result() { - var rs = ReadToEnd().Output; - if (string.IsNullOrEmpty(rs)) return null; - return rs.Trim(); - } - } -} diff --git a/src/Commands/GitFlow.cs b/src/Commands/GitFlow.cs index b6707b06..8aaa45b6 100644 --- a/src/Commands/GitFlow.cs +++ b/src/Commands/GitFlow.cs @@ -1,24 +1,22 @@ -namespace SourceGit.Commands { - /// - /// Git-Flow命令 - /// - public class GitFlow : Command { +using System.Collections.Generic; +namespace SourceGit.Commands { + public class GitFlow : Command { public GitFlow(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; } - public bool Init(string master, string develop, string feature, string release, string hotfix, string version) { - var branches = new Branches(Cwd).Result(); + public bool Init(List branches, string master, string develop, string feature, string release, string hotfix, string version) { var current = branches.Find(x => x.IsCurrent); var masterBranch = branches.Find(x => x.Name == master); - if (masterBranch == null && current != null) new Branch(Cwd, develop).Create(current.Head); + if (masterBranch == null && current != null) Branch.Create(WorkingDirectory, master, current.Head); var devBranch = branches.Find(x => x.Name == develop); - if (devBranch == null && current != null) new Branch(Cwd, develop).Create(current.Head); + if (devBranch == null && current != null) Branch.Create(WorkingDirectory, develop, current.Head); - var cmd = new Config(Cwd); + var cmd = new Config(WorkingDirectory); cmd.Set("gitflow.branch.master", master); cmd.Set("gitflow.branch.develop", develop); cmd.Set("gitflow.prefix.feature", feature); @@ -32,7 +30,7 @@ namespace SourceGit.Commands { return Exec(); } - public void Start(Models.GitFlowBranchType type, string name) { + public bool Start(Models.GitFlowBranchType type, string name) { switch (type) { case Models.GitFlowBranchType.Feature: Args = $"flow feature start {name}"; @@ -44,13 +42,14 @@ namespace SourceGit.Commands { Args = $"flow hotfix start {name}"; break; default: - return; + App.RaiseException(Context, "Bad branch type!!!"); + return false; } - Exec(); + return Exec(); } - public void Finish(Models.GitFlowBranchType type, string name, bool keepBranch) { + public bool Finish(Models.GitFlowBranchType type, string name, bool keepBranch) { var option = keepBranch ? "-k" : string.Empty; switch (type) { case Models.GitFlowBranchType.Feature: @@ -63,10 +62,11 @@ namespace SourceGit.Commands { Args = $"flow hotfix finish {option} {name} -m \"HOTFIX_DONE\""; break; default: - return; + App.RaiseException(Context, "Bad branch type!!!"); + return false; } - Exec(); + return Exec(); } } } diff --git a/src/Commands/Init.cs b/src/Commands/Init.cs index 35dde5a2..f009ebe0 100644 --- a/src/Commands/Init.cs +++ b/src/Commands/Init.cs @@ -1,12 +1,8 @@ -namespace SourceGit.Commands { - - /// - /// 初始化Git仓库 - /// +namespace SourceGit.Commands { public class Init : Command { - - public Init(string workDir) { - Cwd = workDir; + public Init(string ctx, string dir) { + Context = ctx; + WorkingDirectory = dir; Args = "init -q"; } } diff --git a/src/Commands/IsBinary.cs b/src/Commands/IsBinary.cs new file mode 100644 index 00000000..d9096aa2 --- /dev/null +++ b/src/Commands/IsBinary.cs @@ -0,0 +1,18 @@ +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class IsBinary : Command { + private static readonly Regex REG_TEST = new Regex(@"^\-\s+\-\s+.*$"); + + public IsBinary(string repo, string commit, string path) { + WorkingDirectory = repo; + Context = repo; + Args = $"diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 {commit} --numstat -- \"{path}\""; + RaiseError = false; + } + + public bool Result() { + return REG_TEST.IsMatch(ReadToEnd().StdOut); + } + } +} diff --git a/src/Commands/IsBinaryFile.cs b/src/Commands/IsBinaryFile.cs deleted file mode 100644 index 68cbff62..00000000 --- a/src/Commands/IsBinaryFile.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - /// - /// 查询指定版本下的某文件是否是二进制文件 - /// - public class IsBinaryFile : Command { - private static readonly Regex REG_TEST = new Regex(@"^\-\s+\-\s+.*$"); - public IsBinaryFile(string repo, string commit, string path) { - Cwd = repo; - Args = $"diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 {commit} --numstat -- \"{path}\""; - } - - public bool Result() { - return REG_TEST.IsMatch(ReadToEnd().Output); - } - } -} diff --git a/src/Commands/IsLFSFiltered.cs b/src/Commands/IsLFSFiltered.cs new file mode 100644 index 00000000..39e24654 --- /dev/null +++ b/src/Commands/IsLFSFiltered.cs @@ -0,0 +1,15 @@ +namespace SourceGit.Commands { + public class IsLFSFiltered : Command { + public IsLFSFiltered(string repo, string path) { + WorkingDirectory = repo; + Context = repo; + Args = $"check-attr -a -z \"{path}\""; + RaiseError = false; + } + + public bool Result() { + var rs = ReadToEnd(); + return rs.IsSuccess && rs.StdOut.Contains("filter\0lfs"); + } + } +} diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs index 87d3e378..d632a25b 100644 --- a/src/Commands/LFS.cs +++ b/src/Commands/LFS.cs @@ -1,51 +1,40 @@ -using System; +using System; using System.IO; namespace SourceGit.Commands { - /// - /// LFS相关 - /// public class LFS { - private string repo; - - private class PruneCmd : Command { - private Action handler; - + class PruneCmd : Command { public PruneCmd(string repo, Action onProgress) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = "lfs prune"; TraitErrorAsOutput = true; - handler = onProgress; + _outputHandler = onProgress; } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler; } public LFS(string repo) { - this.repo = repo; + _repo = repo; } public bool IsEnabled() { - var path = Path.Combine(repo, ".git", "hooks", "pre-push"); + var path = Path.Combine(_repo, ".git", "hooks", "pre-push"); if (!File.Exists(path)) return false; var content = File.ReadAllText(path); return content.Contains("git lfs pre-push"); } - public bool IsFiltered(string path) { - var cmd = new Command(); - cmd.Cwd = repo; - cmd.Args = $"check-attr -a -z \"{path}\""; - - var rs = cmd.ReadToEnd(); - return rs.Output.Contains("filter\0lfs"); + public void Prune(Action outputHandler) { + new PruneCmd(_repo, outputHandler).Exec(); } - public void Prune(Action onProgress) { - new PruneCmd(repo, onProgress).Exec(); - } + private string _repo; } } diff --git a/src/Commands/LocalChanges.cs b/src/Commands/LocalChanges.cs deleted file mode 100644 index edb156db..00000000 --- a/src/Commands/LocalChanges.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - /// - /// 取得本地工作副本变更 - /// - public class LocalChanges : Command { - private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); - private static readonly string[] UNTRACKED = new string[] { "no", "all" }; - private List changes = new List(); - - public LocalChanges(string path, bool includeUntracked = true) { - Cwd = path; - Args = $"status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain"; - } - - public List Result() { - Exec(); - return changes; - } - - public override void OnReadline(string line) { - var match = REG_FORMAT.Match(line); - if (!match.Success) return; - if (line.EndsWith("/", StringComparison.Ordinal)) return; // Ignore changes with git-worktree - - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; - - switch (status) { - case " M": change.Set(Models.Change.Status.None, Models.Change.Status.Modified); break; - case " A": change.Set(Models.Change.Status.None, Models.Change.Status.Added); break; - case " D": change.Set(Models.Change.Status.None, Models.Change.Status.Deleted); break; - case " R": change.Set(Models.Change.Status.None, Models.Change.Status.Renamed); break; - case " C": change.Set(Models.Change.Status.None, Models.Change.Status.Copied); break; - case "M": change.Set(Models.Change.Status.Modified, Models.Change.Status.None); break; - case "MM": change.Set(Models.Change.Status.Modified, Models.Change.Status.Modified); break; - case "MD": change.Set(Models.Change.Status.Modified, Models.Change.Status.Deleted); break; - case "A": change.Set(Models.Change.Status.Added, Models.Change.Status.None); break; - case "AM": change.Set(Models.Change.Status.Added, Models.Change.Status.Modified); break; - case "AD": change.Set(Models.Change.Status.Added, Models.Change.Status.Deleted); break; - case "D": change.Set(Models.Change.Status.Deleted, Models.Change.Status.None); break; - case "R": change.Set(Models.Change.Status.Renamed, Models.Change.Status.None); break; - case "RM": change.Set(Models.Change.Status.Renamed, Models.Change.Status.Modified); break; - case "RD": change.Set(Models.Change.Status.Renamed, Models.Change.Status.Deleted); break; - case "C": change.Set(Models.Change.Status.Copied, Models.Change.Status.None); break; - case "CM": change.Set(Models.Change.Status.Copied, Models.Change.Status.Modified); break; - case "CD": change.Set(Models.Change.Status.Copied, Models.Change.Status.Deleted); break; - case "DR": change.Set(Models.Change.Status.Deleted, Models.Change.Status.Renamed); break; - case "DC": change.Set(Models.Change.Status.Deleted, Models.Change.Status.Copied); break; - case "DD": change.Set(Models.Change.Status.Deleted, Models.Change.Status.Deleted); break; - case "AU": change.Set(Models.Change.Status.Added, Models.Change.Status.Unmerged); break; - case "UD": change.Set(Models.Change.Status.Unmerged, Models.Change.Status.Deleted); break; - case "UA": change.Set(Models.Change.Status.Unmerged, Models.Change.Status.Added); break; - case "DU": change.Set(Models.Change.Status.Deleted, Models.Change.Status.Unmerged); break; - case "AA": change.Set(Models.Change.Status.Added, Models.Change.Status.Added); break; - case "UU": change.Set(Models.Change.Status.Unmerged, Models.Change.Status.Unmerged); break; - case "??": change.Set(Models.Change.Status.Untracked, Models.Change.Status.Untracked); break; - default: return; - } - - changes.Add(change); - } - } -} diff --git a/src/Commands/Merge.cs b/src/Commands/Merge.cs index a44c72a1..9854e8c5 100644 --- a/src/Commands/Merge.cs +++ b/src/Commands/Merge.cs @@ -1,21 +1,19 @@ -using System; +using System; namespace SourceGit.Commands { - /// - /// 合并分支 - /// public class Merge : Command { - private Action handler = null; - - public Merge(string repo, string source, string mode, Action onProgress) { - Cwd = repo; - Args = $"merge --progress {source} {mode}"; + public Merge(string repo, string source, string mode, Action outputHandler) { + _outputHandler = outputHandler; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; - handler = onProgress; + Args = $"merge --progress {source} {mode}"; } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler = null; } } diff --git a/src/Commands/MergeTool.cs b/src/Commands/MergeTool.cs new file mode 100644 index 00000000..4d02f029 --- /dev/null +++ b/src/Commands/MergeTool.cs @@ -0,0 +1,41 @@ +using System.IO; + +namespace SourceGit.Commands { + public static class MergeTool { + public static bool OpenForMerge(string repo, string tool, string mergeCmd, string file) { + if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(mergeCmd)) { + App.RaiseException(repo, "Invalid external merge tool settings!"); + return false; + } + + if (!File.Exists(tool)) { + App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!"); + return false; + } + + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.RaiseError = false; + cmd.Args = $"-c mergetool.sourcegit.cmd=\"\\\"{tool}\\\" {mergeCmd}\" -c mergetool.writeToTemp=true -c mergetool.keepBackup=false -c mergetool.trustExitCode=true mergetool --tool=sourcegit \"{file}\""; + return cmd.Exec(); + } + + public static bool OpenForDiff(string repo, string tool, string diffCmd, Models.DiffOption option) { + if (string.IsNullOrWhiteSpace(tool) || string.IsNullOrWhiteSpace(diffCmd)) { + App.RaiseException(repo, "Invalid external merge tool settings!"); + return false; + } + + if (!File.Exists(tool)) { + App.RaiseException(repo, $"Can NOT found external merge tool in '{tool}'!"); + return false; + } + + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.RaiseError = false; + cmd.Args = $"-c difftool.sourcegit.cmd=\"\\\"{tool}\\\" {diffCmd}\" difftool --tool=sourcegit --no-prompt {option}"; + return cmd.Exec(); + } + } +} diff --git a/src/Commands/Pull.cs b/src/Commands/Pull.cs index e2ab522a..f9112206 100644 --- a/src/Commands/Pull.cs +++ b/src/Commands/Pull.cs @@ -1,19 +1,12 @@ -using System; +using System; namespace SourceGit.Commands { - - /// - /// 拉回 - /// public class Pull : Command { - private Action handler = null; - private bool needStash = false; - - public Pull(string repo, string remote, string branch, bool useRebase, bool autoStash, Action onProgress) { - Cwd = repo; + public Pull(string repo, string remote, string branch, bool useRebase, Action outputHandler) { + _outputHandler = outputHandler; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; - handler = onProgress; - needStash = autoStash; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); if (!string.IsNullOrEmpty(sshKey)) { @@ -27,25 +20,10 @@ namespace SourceGit.Commands { Args += $"{remote} {branch}"; } - public bool Run() { - if (needStash) { - var changes = new LocalChanges(Cwd).Result(); - if (changes.Count > 0) { - if (!new Stash(Cwd).Push(changes, "PULL_AUTO_STASH", true)) { - return false; - } - } else { - needStash = false; - } - } - - var succ = Exec(); - if (succ && needStash) new Stash(Cwd).Pop("stash@{0}"); - return succ; + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } - public override void OnReadline(string line) { - handler?.Invoke(line); - } + private Action _outputHandler; } } diff --git a/src/Commands/Push.cs b/src/Commands/Push.cs index 7784c581..8839666b 100644 --- a/src/Commands/Push.cs +++ b/src/Commands/Push.cs @@ -1,16 +1,12 @@ -using System; +using System; namespace SourceGit.Commands { - /// - /// 推送 - /// public class Push : Command { - private Action handler = null; - public Push(string repo, string local, string remote, string remoteBranch, bool withTags, bool force, bool track, Action onProgress) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; TraitErrorAsOutput = true; - handler = onProgress; + _outputHandler = onProgress; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); if (!string.IsNullOrEmpty(sshKey)) { @@ -28,8 +24,16 @@ namespace SourceGit.Commands { Args += $"{remote} {local}:{remoteBranch}"; } + /// + /// Only used to delete a remote branch!!!!!! + /// + /// + /// + /// public Push(string repo, string remote, string branch) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; + TraitErrorAsOutput = true; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); if (!string.IsNullOrEmpty(sshKey)) { @@ -42,7 +46,8 @@ namespace SourceGit.Commands { } public Push(string repo, string remote, string tag, bool isDelete) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; var sshKey = new Config(repo).Get($"remote.{remote}.sshkey"); if (!string.IsNullOrEmpty(sshKey)) { @@ -56,8 +61,10 @@ namespace SourceGit.Commands { Args += $"{remote} refs/tags/{tag}"; } - public override void OnReadline(string line) { - handler?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler = null; } } diff --git a/src/Commands/Branches.cs b/src/Commands/QueryBranches.cs similarity index 80% rename from src/Commands/Branches.cs rename to src/Commands/QueryBranches.cs index 8dfdfae1..8c2db9a2 100644 --- a/src/Commands/Branches.cs +++ b/src/Commands/QueryBranches.cs @@ -1,31 +1,26 @@ -using System; +using System; using System.Collections.Generic; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 解析所有的分支 - /// - public class Branches : Command { + public class QueryBranches : Command { private static readonly string PREFIX_LOCAL = "refs/heads/"; private static readonly string PREFIX_REMOTE = "refs/remotes/"; - private static readonly string CMD = "branch -l --all -v --format=\"%(refname)$%(objectname)$%(HEAD)$%(upstream)$%(upstream:track)\""; private static readonly Regex REG_AHEAD = new Regex(@"ahead (\d+)"); private static readonly Regex REG_BEHIND = new Regex(@"behind (\d+)"); - private List loaded = new List(); - - public Branches(string path) { - Cwd = path; - Args = CMD; + public QueryBranches(string repo) { + WorkingDirectory = repo; + Context = repo; + Args = "branch -l --all -v --format=\"%(refname)$%(objectname)$%(HEAD)$%(upstream)$%(upstream:track)\""; } public List Result() { Exec(); - return loaded; + return _branches; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { var parts = line.Split('$'); if (parts.Length != 5) return; @@ -55,7 +50,7 @@ namespace SourceGit.Commands { branch.Upstream = parts[3]; branch.UpstreamTrackStatus = ParseTrackStatus(parts[4]); - loaded.Add(branch); + _branches.Add(branch); } private string ParseTrackStatus(string data) { @@ -75,5 +70,7 @@ namespace SourceGit.Commands { return track.Trim(); } + + private List _branches = new List(); } } diff --git a/src/Commands/QueryCommitChanges.cs b/src/Commands/QueryCommitChanges.cs new file mode 100644 index 00000000..7b252efd --- /dev/null +++ b/src/Commands/QueryCommitChanges.cs @@ -0,0 +1,38 @@ +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class QueryCommitChanges : Command { + private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); + + public QueryCommitChanges(string repo, string commitSHA) { + WorkingDirectory = repo; + Context = repo; + Args = $"show --name-status {commitSHA}"; + } + + public List Result() { + Exec(); + _changes.Sort((l, r) => l.Path.CompareTo(r.Path)); + return _changes; + } + + protected override void OnReadline(string line) { + var match = REG_FORMAT.Match(line); + if (!match.Success) return; + + var change = new Models.Change() { Path = match.Groups[2].Value }; + var status = match.Groups[1].Value; + + switch (status[0]) { + case 'M': change.Set(Models.ChangeState.Modified); _changes.Add(change); break; + case 'A': change.Set(Models.ChangeState.Added); _changes.Add(change); break; + case 'D': change.Set(Models.ChangeState.Deleted); _changes.Add(change); break; + case 'R': change.Set(Models.ChangeState.Renamed); _changes.Add(change); break; + case 'C': change.Set(Models.ChangeState.Copied); _changes.Add(change); break; + } + } + + private List _changes = new List(); + } +} diff --git a/src/Commands/Commits.cs b/src/Commands/QueryCommits.cs similarity index 92% rename from src/Commands/Commits.cs rename to src/Commands/QueryCommits.cs index f70528db..0d6c31e2 100644 --- a/src/Commands/Commits.cs +++ b/src/Commands/QueryCommits.cs @@ -1,13 +1,8 @@ -using System; +using System; using System.Collections.Generic; -using System.Linq; namespace SourceGit.Commands { - - /// - /// 取得提交列表 - /// - public class Commits : Command { + public class QueryCommits : Command { private static readonly string GPGSIG_START = "gpgsig -----BEGIN PGP SIGNATURE-----"; private static readonly string GPGSIG_END = " -----END PGP SIGNATURE-----"; @@ -17,8 +12,8 @@ namespace SourceGit.Commands { private bool isHeadFounded = false; private bool findFirstMerged = true; - public Commits(string path, string limits, bool needFindHead = true) { - Cwd = path; + public QueryCommits(string repo, string limits, bool needFindHead = true) { + WorkingDirectory = repo; Args = "log --date-order --decorate=full --pretty=raw " + limits; findFirstMerged = needFindHead; } @@ -38,7 +33,7 @@ namespace SourceGit.Commands { return commits; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { if (isSkipingGpgsig) { if (line.StartsWith(GPGSIG_END, StringComparison.Ordinal)) isSkipingGpgsig = false; return; @@ -137,10 +132,10 @@ namespace SourceGit.Commands { } private void MarkFirstMerged() { - Args = $"log --since=\"{commits.Last().CommitterTimeStr}\" --format=\"%H\""; + Args = $"log --since=\"{commits[commits.Count - 1].CommitterTimeStr}\" --format=\"%H\""; var rs = ReadToEnd(); - var shas = rs.Output.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); + var shas = rs.StdOut.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries); if (shas.Length == 0) return; var set = new HashSet(); diff --git a/src/Commands/QueryFileContent.cs b/src/Commands/QueryFileContent.cs index 04eab006..172134c5 100644 --- a/src/Commands/QueryFileContent.cs +++ b/src/Commands/QueryFileContent.cs @@ -1,26 +1,23 @@ -using System.Collections.Generic; +using System.Text; namespace SourceGit.Commands { - /// - /// 取得指定提交下的某文件内容 - /// public class QueryFileContent : Command { - private List lines = new List(); - private int added = 0; - - public QueryFileContent(string repo, string commit, string path) { - Cwd = repo; - Args = $"show {commit}:\"{path}\""; + public QueryFileContent(string repo, string revision, string file) { + WorkingDirectory = repo; + Context = repo; + Args = $"show {revision}:\"{file}\""; } - public List Result() { + public string Result() { Exec(); - return lines; + return _builder.ToString(); } - public override void OnReadline(string line) { - added++; - lines.Add(new Models.TextLine() { Number = added, Data = line }); + protected override void OnReadline(string line) { + _builder.Append(line); + _builder.Append('\n'); } + + private StringBuilder _builder = new StringBuilder(); } } diff --git a/src/Commands/QueryFileSize.cs b/src/Commands/QueryFileSize.cs new file mode 100644 index 00000000..e16bf9e6 --- /dev/null +++ b/src/Commands/QueryFileSize.cs @@ -0,0 +1,29 @@ +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class QueryFileSize : Command { + private static readonly Regex REG_FORMAT = new Regex(@"^\d+\s+\w+\s+[0-9a-f]+\s+(\d+)\s+.*$"); + + public QueryFileSize(string repo, string file, string revision) { + WorkingDirectory = repo; + Context = repo; + Args = $"ls-tree {revision} -l -- {file}"; + } + + public long Result() { + if (_result != 0) return _result; + + var rs = ReadToEnd(); + if (rs.IsSuccess) { + var match = REG_FORMAT.Match(rs.StdOut); + if (match.Success) { + return long.Parse(match.Groups[1].Value); + } + } + + return 0; + } + + private long _result = 0; + } +} diff --git a/src/Commands/QueryFileSizeChange.cs b/src/Commands/QueryFileSizeChange.cs deleted file mode 100644 index 70792e2a..00000000 --- a/src/Commands/QueryFileSizeChange.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.IO; - -namespace SourceGit.Commands { - /// - /// 查询文件大小变化 - /// - public class QueryFileSizeChange { - - class QuerySizeCmd : Command { - public QuerySizeCmd(string repo, string path, string revision) { - Cwd = repo; - Args = $"cat-file -s {revision}:\"{path}\""; - } - - public long Result() { - string data = ReadToEnd().Output; - long size; - if (!long.TryParse(data, out size)) size = 0; - return size; - } - } - - private Models.FileSizeChange change = new Models.FileSizeChange(); - - public QueryFileSizeChange(string repo, string[] revisions, string path, string orgPath) { - if (revisions.Length == 0) { - change.NewSize = new FileInfo(Path.Combine(repo, path)).Length; - change.OldSize = new QuerySizeCmd(repo, path, "HEAD").Result(); - } else if (revisions.Length == 1) { - change.NewSize = new QuerySizeCmd(repo, path, "HEAD").Result(); - if (string.IsNullOrEmpty(orgPath)) { - change.OldSize = new QuerySizeCmd(repo, path, revisions[0]).Result(); - } else { - change.OldSize = new QuerySizeCmd(repo, orgPath, revisions[0]).Result(); - } - } else { - change.NewSize = new QuerySizeCmd(repo, path, revisions[1]).Result(); - if (string.IsNullOrEmpty(orgPath)) { - change.OldSize = new QuerySizeCmd(repo, path, revisions[0]).Result(); - } else { - change.OldSize = new QuerySizeCmd(repo, orgPath, revisions[0]).Result(); - } - } - } - - public Models.FileSizeChange Result() { - return change; - } - } -} diff --git a/src/Commands/QueryGitDir.cs b/src/Commands/QueryGitDir.cs index af45273d..dcdc216b 100644 --- a/src/Commands/QueryGitDir.cs +++ b/src/Commands/QueryGitDir.cs @@ -1,23 +1,20 @@ -using System.IO; +using System.IO; namespace SourceGit.Commands { - - /// - /// 取得GitDir - /// public class QueryGitDir : Command { public QueryGitDir(string workDir) { - Cwd = workDir; + WorkingDirectory = workDir; Args = "rev-parse --git-dir"; + RaiseError = false; } public string Result() { - var rs = ReadToEnd().Output; + var rs = ReadToEnd().StdOut; if (string.IsNullOrEmpty(rs)) return null; rs = rs.Trim(); if (Path.IsPathRooted(rs)) return rs; - return Path.GetFullPath(Path.Combine(Cwd, rs)); + return Path.GetFullPath(Path.Combine(WorkingDirectory, rs)); } } } diff --git a/src/Commands/QueryLFSObject.cs b/src/Commands/QueryLFSObject.cs deleted file mode 100644 index 8db8bbe0..00000000 --- a/src/Commands/QueryLFSObject.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; - -namespace SourceGit.Commands { - /// - /// 取得一个LFS对象的信息 - /// - public class QueryLFSObject : Command { - private Models.LFSObject obj = new Models.LFSObject(); - - public QueryLFSObject(string repo, string commit, string path) { - Cwd = repo; - Args = $"show {commit}:\"{path}\""; - } - - public Models.LFSObject Result() { - Exec(); - return obj; - } - - public override void OnReadline(string line) { - if (line.StartsWith("oid sha256:", StringComparison.Ordinal)) { - obj.OID = line.Substring(11).Trim(); - } else if (line.StartsWith("size")) { - obj.Size = int.Parse(line.Substring(4).Trim()); - } - } - } -} diff --git a/src/Commands/QueryLFSObjectChange.cs b/src/Commands/QueryLFSObjectChange.cs deleted file mode 100644 index 5f9e1631..00000000 --- a/src/Commands/QueryLFSObjectChange.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace SourceGit.Commands { - /// - /// 查询LFS对象变更 - /// - public class QueryLFSObjectChange : Command { - private Models.LFSChange change = new Models.LFSChange(); - - public QueryLFSObjectChange(string repo, string args) { - Cwd = repo; - Args = $"diff --ignore-cr-at-eol {args}"; - } - - public Models.LFSChange Result() { - Exec(); - return change; - } - - public override void OnReadline(string line) { - var ch = line[0]; - if (ch == '-') { - if (change.Old == null) change.Old = new Models.LFSObject(); - line = line.Substring(1); - if (line.StartsWith("oid sha256:")) { - change.Old.OID = line.Substring(11); - } else if (line.StartsWith("size ")) { - change.Old.Size = int.Parse(line.Substring(5)); - } - } else if (ch == '+') { - if (change.New == null) change.New = new Models.LFSObject(); - line = line.Substring(1); - if (line.StartsWith("oid sha256:")) { - change.New.OID = line.Substring(11); - } else if (line.StartsWith("size ")) { - change.New.Size = int.Parse(line.Substring(5)); - } - } else if (line.StartsWith(" size ")) { - change.New.Size = change.Old.Size = int.Parse(line.Substring(6)); - } - } - } -} diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs new file mode 100644 index 00000000..260885d5 --- /dev/null +++ b/src/Commands/QueryLocalChanges.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class QueryLocalChanges : Command { + private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); + private static readonly string[] UNTRACKED = [ "no", "all" ]; + + public QueryLocalChanges(string repo, bool includeUntracked = true) { + WorkingDirectory = repo; + Context = repo; + Args = $"status -u{UNTRACKED[includeUntracked ? 1 : 0]} --ignore-submodules=dirty --porcelain"; + } + + public List Result() { + Exec(); + return _changes; + } + + protected override void OnReadline(string line) { + var match = REG_FORMAT.Match(line); + if (!match.Success) return; + if (line.EndsWith("/", StringComparison.Ordinal)) return; // Ignore changes with git-worktree + + var change = new Models.Change() { Path = match.Groups[2].Value }; + var status = match.Groups[1].Value; + + switch (status) { + case " M": change.Set(Models.ChangeState.None, Models.ChangeState.Modified); break; + case " A": change.Set(Models.ChangeState.None, Models.ChangeState.Added); break; + case " D": change.Set(Models.ChangeState.None, Models.ChangeState.Deleted); break; + case " R": change.Set(Models.ChangeState.None, Models.ChangeState.Renamed); break; + case " C": change.Set(Models.ChangeState.None, Models.ChangeState.Copied); break; + case "M": change.Set(Models.ChangeState.Modified, Models.ChangeState.None); break; + case "MM": change.Set(Models.ChangeState.Modified, Models.ChangeState.Modified); break; + case "MD": change.Set(Models.ChangeState.Modified, Models.ChangeState.Deleted); break; + case "A": change.Set(Models.ChangeState.Added, Models.ChangeState.None); break; + case "AM": change.Set(Models.ChangeState.Added, Models.ChangeState.Modified); break; + case "AD": change.Set(Models.ChangeState.Added, Models.ChangeState.Deleted); break; + case "D": change.Set(Models.ChangeState.Deleted, Models.ChangeState.None); break; + case "R": change.Set(Models.ChangeState.Renamed, Models.ChangeState.None); break; + case "RM": change.Set(Models.ChangeState.Renamed, Models.ChangeState.Modified); break; + case "RD": change.Set(Models.ChangeState.Renamed, Models.ChangeState.Deleted); break; + case "C": change.Set(Models.ChangeState.Copied, Models.ChangeState.None); break; + case "CM": change.Set(Models.ChangeState.Copied, Models.ChangeState.Modified); break; + case "CD": change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted); break; + case "DR": change.Set(Models.ChangeState.Deleted, Models.ChangeState.Renamed); break; + case "DC": change.Set(Models.ChangeState.Deleted, Models.ChangeState.Copied); break; + case "DD": change.Set(Models.ChangeState.Deleted, Models.ChangeState.Deleted); break; + case "AU": change.Set(Models.ChangeState.Added, Models.ChangeState.Unmerged); break; + case "UD": change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Deleted); break; + case "UA": change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Added); break; + case "DU": change.Set(Models.ChangeState.Deleted, Models.ChangeState.Unmerged); break; + case "AA": change.Set(Models.ChangeState.Added, Models.ChangeState.Added); break; + case "UU": change.Set(Models.ChangeState.Unmerged, Models.ChangeState.Unmerged); break; + case "??": change.Set(Models.ChangeState.Untracked, Models.ChangeState.Untracked); break; + default: return; + } + + _changes.Add(change); + } + + private List _changes = new List(); + } +} diff --git a/src/Commands/Remotes.cs b/src/Commands/QueryRemotes.cs similarity index 54% rename from src/Commands/Remotes.cs rename to src/Commands/QueryRemotes.cs index 1866b7f2..e8e21b4a 100644 --- a/src/Commands/Remotes.cs +++ b/src/Commands/QueryRemotes.cs @@ -1,25 +1,22 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 获取远程列表 - /// - public class Remotes : Command { + public class QueryRemotes : Command { private static readonly Regex REG_REMOTE = new Regex(@"^([\w\.\-]+)\s*(\S+).*$"); - private List loaded = new List(); - public Remotes(string repo) { - Cwd = repo; + public QueryRemotes(string repo) { + WorkingDirectory = repo; + Context = repo; Args = "remote -v"; } public List Result() { Exec(); - return loaded; + return _loaded; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { var match = REG_REMOTE.Match(line); if (!match.Success) return; @@ -28,8 +25,10 @@ namespace SourceGit.Commands { URL = match.Groups[2].Value, }; - if (loaded.Find(x => x.Name == remote.Name) != null) return; - loaded.Add(remote); + if (_loaded.Find(x => x.Name == remote.Name) != null) return; + _loaded.Add(remote); } + + private List _loaded = new List(); } } diff --git a/src/Commands/QueryRepositoryRootPath.cs b/src/Commands/QueryRepositoryRootPath.cs new file mode 100644 index 00000000..51a1a15a --- /dev/null +++ b/src/Commands/QueryRepositoryRootPath.cs @@ -0,0 +1,15 @@ +namespace SourceGit.Commands { + public class QueryRepositoryRootPath : Command { + public QueryRepositoryRootPath(string path) { + WorkingDirectory = path; + Args = "rev-parse --show-toplevel"; + RaiseError = false; + } + + public string Result() { + var rs = ReadToEnd().StdOut; + if (string.IsNullOrEmpty(rs)) return null; + return rs.Trim(); + } + } +} diff --git a/src/Commands/RevisionObjects.cs b/src/Commands/QueryRevisionObjects.cs similarity index 77% rename from src/Commands/RevisionObjects.cs rename to src/Commands/QueryRevisionObjects.cs index 25a190ec..b0c48f2a 100644 --- a/src/Commands/RevisionObjects.cs +++ b/src/Commands/QueryRevisionObjects.cs @@ -1,16 +1,14 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 取出指定Revision下的文件列表 - /// - public class RevisionObjects : Command { + public class QueryRevisionObjects : Command { private static readonly Regex REG_FORMAT = new Regex(@"^\d+\s+(\w+)\s+([0-9a-f]+)\s+(.*)$"); private List objects = new List(); - public RevisionObjects(string cwd, string sha) { - Cwd = cwd; + public QueryRevisionObjects(string repo, string sha) { + WorkingDirectory = repo; + Context = repo; Args = $"ls-tree -r {sha}"; } @@ -19,7 +17,7 @@ namespace SourceGit.Commands { return objects; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { var match = REG_FORMAT.Match(line); if (!match.Success) return; diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs new file mode 100644 index 00000000..c2d50d45 --- /dev/null +++ b/src/Commands/QueryStashChanges.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class QueryStashChanges : Command { + private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); + + public QueryStashChanges(string repo, string sha) { + WorkingDirectory = repo; + Context = repo; + Args = $"diff --name-status --pretty=format: {sha}^ {sha}"; + } + + public List Result() { + Exec(); + return _changes; + } + + protected override void OnReadline(string line) { + var match = REG_FORMAT.Match(line); + if (!match.Success) return; + + var change = new Models.Change() { Path = match.Groups[2].Value }; + var status = match.Groups[1].Value; + + switch (status[0]) { + case 'M': change.Set(Models.ChangeState.Modified); _changes.Add(change); break; + case 'A': change.Set(Models.ChangeState.Added); _changes.Add(change); break; + case 'D': change.Set(Models.ChangeState.Deleted); _changes.Add(change); break; + case 'R': change.Set(Models.ChangeState.Renamed); _changes.Add(change); break; + case 'C': change.Set(Models.ChangeState.Copied); _changes.Add(change); break; + } + } + + private List _changes = new List(); + } +} diff --git a/src/Commands/Stashes.cs b/src/Commands/QueryStashes.cs similarity index 52% rename from src/Commands/Stashes.cs rename to src/Commands/QueryStashes.cs index 5668ff64..7e159500 100644 --- a/src/Commands/Stashes.cs +++ b/src/Commands/QueryStashes.cs @@ -1,48 +1,47 @@ -using System; +using System; using System.Collections.Generic; using System.Text.RegularExpressions; namespace SourceGit.Commands { - /// - /// 解析当前仓库中的贮藏 - /// - public class Stashes : Command { + public class QueryStashes : Command { private static readonly Regex REG_STASH = new Regex(@"^Reflog: refs/(stash@\{\d+\}).*$"); - private List parsed = new List(); - private Models.Stash current = null; - - public Stashes(string path) { - Cwd = path; + + public QueryStashes(string repo) { + WorkingDirectory = repo; + Context = repo; Args = "stash list --pretty=raw"; } public List Result() { Exec(); - if (current != null) parsed.Add(current); - return parsed; + if (_current != null) _stashes.Add(_current); + return _stashes; } - public override void OnReadline(string line) { + protected override void OnReadline(string line) { if (line.StartsWith("commit ", StringComparison.Ordinal)) { - if (current != null && !string.IsNullOrEmpty(current.Name)) parsed.Add(current); - current = new Models.Stash() { SHA = line.Substring(7, 8) }; + if (_current != null && !string.IsNullOrEmpty(_current.Name)) _stashes.Add(_current); + _current = new Models.Stash() { SHA = line.Substring(7, 8) }; return; } - if (current == null) return; + if (_current == null) return; if (line.StartsWith("Reflog: refs/stash@", StringComparison.Ordinal)) { var match = REG_STASH.Match(line); - if (match.Success) current.Name = match.Groups[1].Value; + if (match.Success) _current.Name = match.Groups[1].Value; } else if (line.StartsWith("Reflog message: ", StringComparison.Ordinal)) { - current.Message = line.Substring(16); + _current.Message = line.Substring(16); } else if (line.StartsWith("author ", StringComparison.Ordinal)) { Models.User user = Models.User.Invalid; ulong time = 0; Models.Commit.ParseUserAndTime(line.Substring(7), ref user, ref time); - current.Author = user; - current.Time = time; + _current.Author = user; + _current.Time = time; } } + + private List _stashes = new List(); + private Models.Stash _current = null; } } diff --git a/src/Commands/QuerySubmodules.cs b/src/Commands/QuerySubmodules.cs new file mode 100644 index 00000000..0013ff49 --- /dev/null +++ b/src/Commands/QuerySubmodules.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace SourceGit.Commands { + public class QuerySubmodules : Command { + private readonly Regex REG_FORMAT = new Regex(@"^[\-\+ ][0-9a-f]+\s(.*)\s\(.*\)$"); + + public QuerySubmodules(string repo) { + WorkingDirectory = repo; + Context = repo; + Args = "submodule status"; + } + + public List Result() { + Exec(); + return _submodules; + } + + protected override void OnReadline(string line) { + var match = REG_FORMAT.Match(line); + if (!match.Success) return; + _submodules.Add(match.Groups[1].Value); + } + + private List _submodules = new List(); + } +} diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs new file mode 100644 index 00000000..470301a3 --- /dev/null +++ b/src/Commands/QueryTags.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; + +namespace SourceGit.Commands { + public class QueryTags : Command { + public QueryTags(string repo) { + Context = repo; + WorkingDirectory = repo; + Args = "for-each-ref --sort=-creatordate --format=\"$%(refname:short)$%(objectname)$%(*objectname)\" refs/tags"; + } + + public List Result() { + Exec(); + return _loaded; + } + + protected override void OnReadline(string line) { + var subs = line.Split(new char[] { '$' }, StringSplitOptions.RemoveEmptyEntries); + if (subs.Length == 2) { + _loaded.Add(new Models.Tag() { + Name = subs[0], + SHA = subs[1], + }); + } else if (subs.Length == 3) { + _loaded.Add(new Models.Tag() { + Name = subs[0], + SHA = subs[2], + }); + } + } + + private List _loaded = new List(); + } +} diff --git a/src/Commands/Rebase.cs b/src/Commands/Rebase.cs index 791233af..88d304aa 100644 --- a/src/Commands/Rebase.cs +++ b/src/Commands/Rebase.cs @@ -1,11 +1,8 @@ -namespace SourceGit.Commands { - /// - /// 变基命令 - /// +namespace SourceGit.Commands { public class Rebase : Command { - public Rebase(string repo, string basedOn, bool autoStash) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = "rebase "; if (autoStash) Args += "--autostash "; Args += basedOn; diff --git a/src/Commands/Remote.cs b/src/Commands/Remote.cs index 09326afd..1a526045 100644 --- a/src/Commands/Remote.cs +++ b/src/Commands/Remote.cs @@ -1,11 +1,8 @@ -namespace SourceGit.Commands { - /// - /// 远程操作 - /// +namespace SourceGit.Commands { public class Remote : Command { - public Remote(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; } public bool Add(string name, string url) { diff --git a/src/Commands/Reset.cs b/src/Commands/Reset.cs index b60ca174..445890bd 100644 --- a/src/Commands/Reset.cs +++ b/src/Commands/Reset.cs @@ -1,33 +1,32 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; namespace SourceGit.Commands { - /// - /// 重置命令 - /// public class Reset : Command { - public Reset(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = "reset"; } - public Reset(string repo, string revision, string mode) { - Cwd = repo; - Args = $"reset {mode} {revision}"; - } + public Reset(string repo, List changes) { + WorkingDirectory = repo; + Context = repo; - public Reset(string repo, List files) { - Cwd = repo; - - StringBuilder builder = new StringBuilder(); + var builder = new StringBuilder(); builder.Append("reset --"); - foreach (var f in files) { + foreach (var c in changes) { builder.Append(" \""); - builder.Append(f); + builder.Append(c.Path); builder.Append("\""); } Args = builder.ToString(); } + + public Reset(string repo, string revision, string mode) { + WorkingDirectory = repo; + Context = repo; + Args = $"reset {mode} {revision}"; + } } } diff --git a/src/Commands/Revert.cs b/src/Commands/Revert.cs index 2a656fc8..6b9549f5 100644 --- a/src/Commands/Revert.cs +++ b/src/Commands/Revert.cs @@ -1,11 +1,8 @@ -namespace SourceGit.Commands { - /// - /// 撤销提交 - /// +namespace SourceGit.Commands { public class Revert : Command { - public Revert(string repo, string commit, bool autoCommit) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; Args = $"revert {commit} --no-edit"; if (!autoCommit) Args += " --no-commit"; } diff --git a/src/Commands/Reword.cs b/src/Commands/Reword.cs deleted file mode 100644 index 3296c37c..00000000 --- a/src/Commands/Reword.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.IO; - -namespace SourceGit.Commands { - /// - /// 编辑HEAD的提交信息 - /// - public class Reword : Command { - public Reword(string repo, string msg) { - var tmp = Path.GetTempFileName(); - File.WriteAllText(tmp, msg); - - Cwd = repo; - Args = $"commit --amend --allow-empty --file=\"{tmp}\""; - } - } -} diff --git a/src/Commands/SaveChangesAsPatch.cs b/src/Commands/SaveChangesAsPatch.cs new file mode 100644 index 00000000..fa8203ac --- /dev/null +++ b/src/Commands/SaveChangesAsPatch.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; + +namespace SourceGit.Commands { + public static class SaveChangesAsPatch { + public static bool Exec(string repo, List changes, bool isUnstaged, string saveTo) { + using (var sw = File.Create(saveTo)) { + foreach (var change in changes) { + if (!ProcessSingleChange(repo, new Models.DiffOption(change, isUnstaged), sw)) return false; + } + } + + return true; + } + + private static bool ProcessSingleChange(string repo, Models.DiffOption opt, FileStream writer) { + var starter = new ProcessStartInfo(); + starter.WorkingDirectory = repo; + starter.FileName = Native.OS.GitExecutableFile; + starter.Arguments = $"diff --ignore-cr-at-eol --unified=4 {opt}"; + starter.UseShellExecute = false; + starter.CreateNoWindow = true; + starter.WindowStyle = ProcessWindowStyle.Hidden; + starter.RedirectStandardOutput = true; + + try { + var proc = new Process() { StartInfo = starter }; + proc.Start(); + proc.StandardOutput.BaseStream.CopyTo(writer); + proc.WaitForExit(); + var rs = proc.ExitCode == 0; + proc.Close(); + + return rs; + } catch (Exception e) { + App.RaiseException(repo, "Save change to patch failed: " + e.Message); + return false; + } + } + } +} diff --git a/src/Commands/SaveChangesToPatch.cs b/src/Commands/SaveChangesToPatch.cs deleted file mode 100644 index b40b9bee..00000000 --- a/src/Commands/SaveChangesToPatch.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.IO; - -namespace SourceGit.Commands { - /// - /// 将Changes保存到文件流中 - /// - public class SaveChangeToStream : Command { - private StreamWriter writer = null; - - public SaveChangeToStream(string repo, Models.Change change, StreamWriter to) { - Cwd = repo; - if (change.WorkTree == Models.Change.Status.Added || change.WorkTree == Models.Change.Status.Untracked) { - Args = $"diff --no-index --no-ext-diff --find-renames -- /dev/null \"{change.Path}\""; - } else { - var pathspec = $"\"{change.Path}\""; - if (!string.IsNullOrEmpty(change.OriginalPath)) pathspec = $"\"{change.OriginalPath}\" \"{change.Path}\""; - Args = $"diff --binary --no-ext-diff --find-renames --full-index -- {pathspec}"; - } - writer = to; - } - - public override void OnReadline(string line) { - writer.WriteLine(line); - } - } -} diff --git a/src/Commands/SaveRevisionFile.cs b/src/Commands/SaveRevisionFile.cs index a83fc618..61f49df1 100644 --- a/src/Commands/SaveRevisionFile.cs +++ b/src/Commands/SaveRevisionFile.cs @@ -1,44 +1,60 @@ +using System; using System.Diagnostics; using System.IO; namespace SourceGit.Commands { - /// - /// 保存指定版本的文件 - /// - public class SaveRevisionFile { - private string cwd = ""; - private string bat = ""; - - public SaveRevisionFile(string repo, string path, string sha, string saveTo) { - var tmp = Path.GetTempFileName(); - var cmd = $"\"{Models.Preference.Instance.Git.Path}\" --no-pager "; - - var isLFS = new LFS(repo).IsFiltered(path); - if (isLFS) { - cmd += $"show {sha}:\"{path}\" > {tmp}.lfs\n"; - cmd += $"\"{Models.Preference.Instance.Git.Path}\" --no-pager lfs smudge < {tmp}.lfs > \"{saveTo}\"\n"; + public static class SaveRevisionFile { + public static void Run(string repo, string revision, string file, string saveTo) { + var isLFSFiltered = new IsLFSFiltered(repo, file).Result(); + if (isLFSFiltered) { + var tmpFile = saveTo + ".tmp"; + if (ExecCmd(repo, $"show {revision}:\"{file}\"", tmpFile)) { + ExecCmd(repo, $"lfs smudge", saveTo, tmpFile); + } + File.Delete(tmpFile); } else { - cmd += $"show {sha}:\"{path}\" > \"{saveTo}\"\n"; + ExecCmd(repo, $"show {revision}:\"{file}\"", saveTo); } - - cwd = repo; - bat = tmp + ".bat"; - - File.WriteAllText(bat, cmd); } - - public void Exec() { + + private static bool ExecCmd(string repo, string args, string outputFile, string inputFile = null) { var starter = new ProcessStartInfo(); - starter.FileName = bat; - starter.WorkingDirectory = cwd; + starter.WorkingDirectory = repo; + starter.FileName = Native.OS.GitExecutableFile; + starter.Arguments = args; + starter.UseShellExecute = false; starter.CreateNoWindow = true; starter.WindowStyle = ProcessWindowStyle.Hidden; + starter.RedirectStandardInput = true; + starter.RedirectStandardOutput = true; + starter.RedirectStandardError = true; - var proc = Process.Start(starter); - proc.WaitForExit(); - proc.Close(); + using (var sw = File.OpenWrite(outputFile)) { + try { + var proc = new Process() { StartInfo = starter }; + proc.Start(); - File.Delete(bat); + if (inputFile != null) { + using (StreamReader sr = new StreamReader(inputFile)) { + while (true) { + var line = sr.ReadLine(); + if (line == null) break; + proc.StandardInput.WriteLine(line); + } + } + } + + proc.StandardOutput.BaseStream.CopyTo(sw); + proc.WaitForExit(); + var rs = proc.ExitCode == 0; + proc.Close(); + + return rs; + } catch (Exception e) { + App.RaiseException(repo, "Save file failed: " + e.Message); + return false; + } + } } } } diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs index 0a923f2c..720129a7 100644 --- a/src/Commands/Stash.cs +++ b/src/Commands/Stash.cs @@ -1,68 +1,49 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; namespace SourceGit.Commands { - /// - /// 单个贮藏相关操作 - /// public class Stash : Command { - public Stash(string repo) { - Cwd = repo; + WorkingDirectory = repo; + Context = repo; } - public bool Push(List changes, string message, bool bFull) { - if (bFull) { - var needAdd = new List(); - foreach (var c in changes) { - if (c.WorkTree == Models.Change.Status.Added || c.WorkTree == Models.Change.Status.Untracked) { - needAdd.Add(c.Path); - if (needAdd.Count > 10) { - new Add(Cwd, needAdd).Exec(); - needAdd.Clear(); - } + public bool Push(string message) { + Args = $"stash push -m \"{message}\""; + return Exec(); + } + + public bool Push(List changes, string message) { + var temp = Path.GetTempFileName(); + var stream = new FileStream(temp, FileMode.Create); + var writer = new StreamWriter(stream); + + var needAdd = new List(); + foreach (var c in changes) { + writer.WriteLine(c.Path); + + if (c.WorkTree == Models.ChangeState.Added || c.WorkTree == Models.ChangeState.Untracked) { + needAdd.Add(c); + if (needAdd.Count > 10) { + new Add(WorkingDirectory, needAdd).Exec(); + needAdd.Clear(); } } + } + if (needAdd.Count > 0) { + new Add(WorkingDirectory, needAdd).Exec(); + needAdd.Clear(); + } - if (needAdd.Count > 0) { - new Add(Cwd, needAdd).Exec(); - needAdd.Clear(); - } + writer.Flush(); + stream.Flush(); + writer.Close(); + stream.Close(); - Args = $"stash push -m \"{message}\""; - return Exec(); - } else { - var temp = Path.GetTempFileName(); - var stream = new FileStream(temp, FileMode.Create); - var writer = new StreamWriter(stream); - - var needAdd = new List(); - foreach (var c in changes) { - writer.WriteLine(c.Path); - - if (c.WorkTree == Models.Change.Status.Added || c.WorkTree == Models.Change.Status.Untracked) { - needAdd.Add(c.Path); - if (needAdd.Count > 10) { - new Add(Cwd, needAdd).Exec(); - needAdd.Clear(); - } - } - } - if (needAdd.Count > 0) { - new Add(Cwd, needAdd).Exec(); - needAdd.Clear(); - } - - writer.Flush(); - stream.Flush(); - writer.Close(); - stream.Close(); - - Args = $"stash push -m \"{message}\" --pathspec-from-file=\"{temp}\""; - var succ = Exec(); - File.Delete(temp); - return succ; - } + Args = $"stash push -m \"{message}\" --pathspec-from-file=\"{temp}\""; + var succ = Exec(); + File.Delete(temp); + return succ; } public bool Apply(string name) { @@ -79,5 +60,10 @@ namespace SourceGit.Commands { Args = $"stash drop -q {name}"; return Exec(); } + + public bool Clear() { + Args = "stash clear"; + return Exec(); + } } } diff --git a/src/Commands/StashChanges.cs b/src/Commands/StashChanges.cs deleted file mode 100644 index 459a3776..00000000 --- a/src/Commands/StashChanges.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - /// - /// 查看Stash中的修改 - /// - public class StashChanges : Command { - private static readonly Regex REG_FORMAT = new Regex(@"^(\s?[\w\?]{1,4})\s+(.+)$"); - private List changes = new List(); - - public StashChanges(string repo, string sha) { - Cwd = repo; - Args = $"diff --name-status --pretty=format: {sha}^ {sha}"; - } - - public List Result() { - Exec(); - return changes; - } - - public override void OnReadline(string line) { - var match = REG_FORMAT.Match(line); - if (!match.Success) return; - - var change = new Models.Change() { Path = match.Groups[2].Value }; - var status = match.Groups[1].Value; - - switch (status[0]) { - case 'M': change.Set(Models.Change.Status.Modified); changes.Add(change); break; - case 'A': change.Set(Models.Change.Status.Added); changes.Add(change); break; - case 'D': change.Set(Models.Change.Status.Deleted); changes.Add(change); break; - case 'R': change.Set(Models.Change.Status.Renamed); changes.Add(change); break; - case 'C': change.Set(Models.Change.Status.Copied); changes.Add(change); break; - } - } - } -} diff --git a/src/Commands/SubTree.cs b/src/Commands/SubTree.cs deleted file mode 100644 index 62f632fe..00000000 --- a/src/Commands/SubTree.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.IO; - -namespace SourceGit.Commands { - /// - /// 子树相关操作 - /// - public class SubTree : Command { - private Action handler = null; - - public SubTree(string repo) { - Cwd = repo; - TraitErrorAsOutput = true; - } - - public override void OnReadline(string line) { - handler?.Invoke(line); - } - - public bool Add(string prefix, string source, string revision, bool squash, Action onProgress) { - var path = Path.Combine(Cwd, prefix); - if (Directory.Exists(path)) return true; - - handler = onProgress; - Args = $"subtree add --prefix=\"{prefix}\" {source} {revision}"; - if (squash) Args += " --squash"; - return Exec(); - } - - public void Pull(string prefix, string source, string branch, bool squash, Action onProgress) { - handler = onProgress; - Args = $"subtree pull --prefix=\"{prefix}\" {source} {branch}"; - if (squash) Args += " --squash"; - Exec(); - } - - public void Push(string prefix, string source, string branch, Action onProgress) { - handler = onProgress; - Args = $"subtree push --prefix=\"{prefix}\" {source} {branch}"; - Exec(); - } - } -} diff --git a/src/Commands/Submodule.cs b/src/Commands/Submodule.cs index bf3ba87d..a6aeee83 100644 --- a/src/Commands/Submodule.cs +++ b/src/Commands/Submodule.cs @@ -1,25 +1,22 @@ -using System; +using System; namespace SourceGit.Commands { - /// - /// 子模块 - /// public class Submodule : Command { - private Action onProgress = null; - - public Submodule(string cwd) { - Cwd = cwd; + public Submodule(string repo) { + WorkingDirectory = repo; + Context = repo; } - public bool Add(string url, string path, bool recursive, Action handler) { - Args = $"submodule add {url} {path}"; - onProgress = handler; + public bool Add(string url, string relativePath, bool recursive, Action outputHandler) { + _outputHandler = outputHandler; + Args = $"submodule add {url} {relativePath}"; if (!Exec()) return false; if (recursive) { - Args = $"submodule update --init --recursive -- {path}"; + Args = $"submodule update --init --recursive -- {relativePath}"; return Exec(); } else { + Args = $"submodule update --init -- {relativePath}"; return true; } } @@ -29,16 +26,18 @@ namespace SourceGit.Commands { return Exec(); } - public bool Delete(string path) { - Args = $"submodule deinit -f {path}"; + public bool Delete(string relativePath) { + Args = $"submodule deinit -f {relativePath}"; if (!Exec()) return false; - Args = $"rm -rf {path}"; + Args = $"rm -rf {relativePath}"; return Exec(); } - public override void OnReadline(string line) { - onProgress?.Invoke(line); + protected override void OnReadline(string line) { + _outputHandler?.Invoke(line); } + + private Action _outputHandler; } } diff --git a/src/Commands/Submodules.cs b/src/Commands/Submodules.cs deleted file mode 100644 index 4daf69f6..00000000 --- a/src/Commands/Submodules.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using System.Text.RegularExpressions; - -namespace SourceGit.Commands { - /// - /// 获取子模块列表 - /// - public class Submodules : Command { - private readonly Regex REG_FORMAT = new Regex(@"^[\-\+ ][0-9a-f]+\s(.*)\s\(.*\)$"); - private List modules = new List(); - - public Submodules(string repo) { - Cwd = repo; - Args = "submodule status"; - } - - public List Result() { - Exec(); - return modules; - } - - public override void OnReadline(string line) { - var match = REG_FORMAT.Match(line); - if (!match.Success) return; - modules.Add(match.Groups[1].Value); - } - } -} diff --git a/src/Commands/Tag.cs b/src/Commands/Tag.cs index 88942878..d0ab3bcb 100644 --- a/src/Commands/Tag.cs +++ b/src/Commands/Tag.cs @@ -1,38 +1,35 @@ +using System.Collections.Generic; using System.IO; namespace SourceGit.Commands { - - /// - /// 标签相关指令 - /// - public class Tag : Command { - - public Tag(string repo) { - Cwd = repo; - } - - public bool Add(string name, string basedOn, string message) { - Args = $"tag -a {name} {basedOn} "; + public static class Tag { + public static bool Add(string repo, string name, string basedOn, string message) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; + cmd.Args = $"tag -a {name} {basedOn} "; if (!string.IsNullOrEmpty(message)) { string tmp = Path.GetTempFileName(); File.WriteAllText(tmp, message); - Args += $"-F \"{tmp}\""; + cmd.Args += $"-F \"{tmp}\""; } else { - Args += $"-m {name}"; + cmd.Args += $"-m {name}"; } - return Exec(); + return cmd.Exec(); } - public bool Delete(string name, bool push) { - Args = $"tag --delete {name}"; - if (!Exec()) return false; + public static bool Delete(string repo, string name, List remotes) { + var cmd = new Command(); + cmd.WorkingDirectory = repo; + cmd.Context = repo; + cmd.Args = $"tag --delete {name}"; + if (!cmd.Exec()) return false; - if (push) { - var remotes = new Remotes(Cwd).Result(); + if (remotes != null) { foreach (var r in remotes) { - new Push(Cwd, r.Name, name, true).Exec(); + new Push(repo, r.Name, name, true).Exec(); } } diff --git a/src/Commands/Tags.cs b/src/Commands/Tags.cs deleted file mode 100644 index 738c86db..00000000 --- a/src/Commands/Tags.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SourceGit.Commands { - /// - /// 解析所有的Tags - /// - public class Tags : Command { - public static readonly string CMD = "for-each-ref --sort=-creatordate --format=\"$%(refname:short)$%(objectname)$%(*objectname)\" refs/tags"; - private List loaded = new List(); - - public Tags(string path) { - Cwd = path; - Args = CMD; - } - - public List Result() { - Exec(); - return loaded; - } - - public override void OnReadline(string line) { - var subs = line.Split(new char[] { '$' }, StringSplitOptions.RemoveEmptyEntries); - if (subs.Length == 2) { - loaded.Add(new Models.Tag() { - Name = subs[0], - SHA = subs[1], - }); - } else if (subs.Length == 3) { - loaded.Add(new Models.Tag() { - Name = subs[0], - SHA = subs[2], - }); - } - } - } -} diff --git a/src/Commands/Version.cs b/src/Commands/Version.cs index 1911f34a..f4da1767 100644 --- a/src/Commands/Version.cs +++ b/src/Commands/Version.cs @@ -1,18 +1,14 @@ -using System; - -namespace SourceGit.Commands { - /// - /// 检测git是否可用，并获取git版本信息 - /// +namespace SourceGit.Commands { public class Version : Command { - const string GitVersionPrefix = "git version "; + public Version() { + Args = "-v"; + RaiseError = false; + } + public string Query() { - Args = $"--version"; - var result = ReadToEnd(); - if (!result.IsSuccess || string.IsNullOrEmpty(result.Output)) return null; - var version = result.Output.Trim(); - if (!version.StartsWith(GitVersionPrefix, StringComparison.Ordinal)) return null; - return version.Substring(GitVersionPrefix.Length); + var rs = ReadToEnd(); + if (!rs.IsSuccess || string.IsNullOrWhiteSpace(rs.StdOut)) return string.Empty; + return rs.StdOut.Trim().Substring("git version ".Length); } } } diff --git a/src/Converters/BookmarkConverters.cs b/src/Converters/BookmarkConverters.cs new file mode 100644 index 00000000..1eca567b --- /dev/null +++ b/src/Converters/BookmarkConverters.cs @@ -0,0 +1,12 @@ +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters { + public static class BookmarkConverters { + public static FuncValueConverter ToBrush = + new FuncValueConverter(bookmark => Models.Bookmarks.Brushes[bookmark]); + + public static FuncValueConverter ToStrokeThickness = + new FuncValueConverter(bookmark => bookmark == 0 ? 1.0 : 0); + } +} diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs new file mode 100644 index 00000000..65593f8f --- /dev/null +++ b/src/Converters/BoolConverters.cs @@ -0,0 +1,8 @@ +using Avalonia.Data.Converters; + +namespace SourceGit.Converters { + public static class BoolConverters { + public static FuncValueConverter ToCommitOpacity = + new FuncValueConverter(x => x ? 1 : 0.5); + } +} diff --git a/src/Converters/BranchConverters.cs b/src/Converters/BranchConverters.cs new file mode 100644 index 00000000..c067a481 --- /dev/null +++ b/src/Converters/BranchConverters.cs @@ -0,0 +1,8 @@ +using Avalonia.Data.Converters; + +namespace SourceGit.Converters { + public static class BranchConverters { + public static FuncValueConverter ToName = + new FuncValueConverter(v => v.IsLocal ? v.Name : $"{v.Remote}/{v.Name}"); + } +} diff --git a/src/Converters/ChangeViewModeConverters.cs b/src/Converters/ChangeViewModeConverters.cs new file mode 100644 index 00000000..8bfb0898 --- /dev/null +++ b/src/Converters/ChangeViewModeConverters.cs @@ -0,0 +1,28 @@ +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters { + public static class ChangeViewModeConverters { + public static FuncValueConverter ToIcon = + new FuncValueConverter(v => { + switch (v) { + case Models.ChangeViewMode.List: + return App.Current?.FindResource("Icons.List") as StreamGeometry; + case Models.ChangeViewMode.Grid: + return App.Current?.FindResource("Icons.Grid") as StreamGeometry; + default: + return App.Current?.FindResource("Icons.Tree") as StreamGeometry; + } + }); + + public static FuncValueConverter IsList = + new FuncValueConverter(v => v == Models.ChangeViewMode.List); + + public static FuncValueConverter IsGrid = + new FuncValueConverter(v => v == Models.ChangeViewMode.Grid); + + public static FuncValueConverter IsTree = + new FuncValueConverter(v => v == Models.ChangeViewMode.Tree); + } +} diff --git a/src/Converters/DecoratorTypeConverters.cs b/src/Converters/DecoratorTypeConverters.cs new file mode 100644 index 00000000..2e9460c9 --- /dev/null +++ b/src/Converters/DecoratorTypeConverters.cs @@ -0,0 +1,34 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; + +namespace SourceGit.Converters { + public static class DecoratorTypeConverters { + public static FuncValueConverter ToBackground = + new FuncValueConverter(v => { + if (v == Models.DecoratorType.Tag) return Models.DecoratorResources.Backgrounds[0]; + return Models.DecoratorResources.Backgrounds[1]; + }); + + public static FuncValueConverter ToIcon = + new FuncValueConverter(v => { + var key = "Icons.Tag"; + switch (v) { + case Models.DecoratorType.CurrentBranchHead: + key = "Icons.Check"; + break; + case Models.DecoratorType.RemoteBranchHead: + key = "Icons.Remote"; + break; + case Models.DecoratorType.LocalBranchHead: + key = "Icons.Branch"; + break; + default: + break; + } + + return Application.Current?.FindResource(key) as StreamGeometry; + }); + } +} diff --git a/src/Converters/IntConverters.cs b/src/Converters/IntConverters.cs new file mode 100644 index 00000000..95f4a57a --- /dev/null +++ b/src/Converters/IntConverters.cs @@ -0,0 +1,27 @@ +using Avalonia.Data.Converters; +using System; +using System.Globalization; + +namespace SourceGit.Converters { + public static class IntConverters { + public static FuncValueConverter IsGreaterThanZero = + new FuncValueConverter(v => v > 0); + + public static FuncValueConverter IsZero = + new FuncValueConverter(v => v == 0); + + public class NotEqualConverter : IValueConverter { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + int v = (int)value; + int target = (int)parameter; + return v != target; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + throw new NotImplementedException(); + } + } + + public static NotEqualConverter NotEqual = new NotEqualConverter(); + } +} diff --git a/src/Converters/LauncherPageConverters.cs b/src/Converters/LauncherPageConverters.cs new file mode 100644 index 00000000..6ba2a0a4 --- /dev/null +++ b/src/Converters/LauncherPageConverters.cs @@ -0,0 +1,28 @@ +using Avalonia.Collections; +using Avalonia.Data.Converters; +using System.Collections.Generic; + +namespace SourceGit.Converters { + public static class LauncherPageConverters { + public static FuncMultiValueConverter ToTabSeperatorVisible = + new FuncMultiValueConverter(v => { + if (v == null) return false; + + var array = new List(); + array.AddRange(v); + if (array.Count != 3) return false; + + var self = array[0] as ViewModels.LauncherPage; + if (self == null) return false; + + var selected = array[1] as ViewModels.LauncherPage; + var collections = array[2] as AvaloniaList; + + if (selected != null && collections != null && (self == selected || collections.IndexOf(self) + 1 == collections.IndexOf(selected))) { + return false; + } else { + return true; + } + }); + } +} diff --git a/src/Converters/ListConverters.cs b/src/Converters/ListConverters.cs new file mode 100644 index 00000000..bf52a281 --- /dev/null +++ b/src/Converters/ListConverters.cs @@ -0,0 +1,12 @@ +using Avalonia.Data.Converters; +using System.Collections; + +namespace SourceGit.Converters { + public static class ListConverters { + public static FuncValueConverter ToCount = + new FuncValueConverter(v => $" ({v.Count})"); + + public static FuncValueConverter IsNotNullOrEmpty = + new FuncValueConverter(v => v != null && v.Count > 0); + } +} diff --git a/src/Converters/PathConverters.cs b/src/Converters/PathConverters.cs new file mode 100644 index 00000000..e1de3795 --- /dev/null +++ b/src/Converters/PathConverters.cs @@ -0,0 +1,18 @@ +using Avalonia.Data.Converters; +using System.IO; + +namespace SourceGit.Converters { + public static class PathConverters { + public static FuncValueConverter PureFileName = + new FuncValueConverter(fullpath => Path.GetFileName(fullpath) ?? ""); + + public static FuncValueConverter PureDirectoryName = + new FuncValueConverter(fullpath => Path.GetDirectoryName(fullpath) ?? ""); + + public static FuncValueConverter TruncateIfTooLong = + new FuncValueConverter(fullpath => { + if (fullpath.Length <= 50) return fullpath; + return fullpath.Substring(0, 20) + ".../" + Path.GetFileName(fullpath); + }); + } +} diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs new file mode 100644 index 00000000..0f305700 --- /dev/null +++ b/src/Converters/StringConverters.cs @@ -0,0 +1,56 @@ +using Avalonia.Data.Converters; +using Avalonia.Styling; +using System; +using System.Globalization; + +namespace SourceGit.Converters { + public static class StringConverters { + public class ToLocaleConverter : IValueConverter { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + return Models.Locale.Supported.Find(x => x.Key == value as string); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + return (value as Models.Locale).Key; + } + } + + public static ToLocaleConverter ToLocale = new ToLocaleConverter(); + + public class ToThemeConverter : IValueConverter { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + var theme = (string)value; + if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase)) { + return ThemeVariant.Light; + } else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase)) { + return ThemeVariant.Dark; + } else { + return ThemeVariant.Default; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + var theme = (ThemeVariant)value; + return theme.Key; + } + } + + public static ToThemeConverter ToTheme = new ToThemeConverter(); + + public class FormatByResourceKeyConverter : IValueConverter { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + var key = parameter as string; + return App.Text(key, value); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + throw new NotImplementedException(); + } + } + + public static FormatByResourceKeyConverter FormatByResourceKey = new FormatByResourceKeyConverter(); + + public static FuncValueConverter ToShortSHA = + new FuncValueConverter(v => v.Length > 10 ? v.Substring(0, 10) : v); + } +} diff --git a/src/Converters/WindowStateConverters.cs b/src/Converters/WindowStateConverters.cs new file mode 100644 index 00000000..67e5a3be --- /dev/null +++ b/src/Converters/WindowStateConverters.cs @@ -0,0 +1,36 @@ +using Avalonia.Controls; +using Avalonia.Data.Converters; +using Avalonia.Media; +using Avalonia; +using System.Runtime.InteropServices; + +namespace SourceGit.Converters { + public static class WindowStateConverters { + public static FuncValueConverter ToContentMargin = + new FuncValueConverter(state => { + if (state == WindowState.Maximized && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { + return new Thickness(6); + } else { + return new Thickness(0); + } + }); + + public static FuncValueConverter ToTitleBarHeight = + new FuncValueConverter(state => { + if (state == WindowState.Maximized && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { + return new GridLength(30); + } else { + return new GridLength(38); + } + }); + + public static FuncValueConverter ToMaxOrRestoreIcon = + new FuncValueConverter(state => { + if (state == WindowState.Maximized) { + return Application.Current?.FindResource("Icons.Window.Restore") as StreamGeometry; + } else { + return Application.Current?.FindResource("Icons.Window.Maximize") as StreamGeometry; + } + }); + } +} diff --git a/src/FodyWeavers.xml b/src/FodyWeavers.xml deleted file mode 100644 index 5029e706..00000000 --- a/src/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/FodyWeavers.xsd b/src/FodyWeavers.xsd deleted file mode 100644 index 05e92c11..00000000 --- a/src/FodyWeavers.xsd +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/src/Models/ApplyWhiteSpaceMode.cs b/src/Models/ApplyWhiteSpaceMode.cs new file mode 100644 index 00000000..b35fa5f2 --- /dev/null +++ b/src/Models/ApplyWhiteSpaceMode.cs @@ -0,0 +1,13 @@ +namespace SourceGit.Models { + public class ApplyWhiteSpaceMode { + public string Name { get; set; } + public string Desc { get; set; } + public string Arg { get; set; } + + public ApplyWhiteSpaceMode(string n, string d, string a) { + Name = App.Text(n); + Desc = App.Text(d); + Arg = a; + } + } +} diff --git a/src/Models/AvatarManager.cs b/src/Models/AvatarManager.cs new file mode 100644 index 00000000..b5f90ae0 --- /dev/null +++ b/src/Models/AvatarManager.cs @@ -0,0 +1,120 @@ +using Avalonia.Media.Imaging; +using Avalonia.Threading; +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace SourceGit.Models { + public interface IAvatarHost { + void OnAvatarResourceReady(string md5, Bitmap bitmap); + } + + public static class AvatarManager { + static AvatarManager() { + _storePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SourceGit", "avatars"); + if (!Directory.Exists(_storePath)) Directory.CreateDirectory(_storePath); + + Task.Run(() => { + while (true) { + var md5 = null as string; + + lock (_synclock) { + foreach (var one in _requesting) { + md5 = one; + break; + } + } + + if (md5 == null) { + Thread.Sleep(100); + continue; + } + + var localFile = Path.Combine(_storePath, md5); + var img = null as Bitmap; + try { + var client = new HttpClient() { Timeout = TimeSpan.FromSeconds(2) }; + var task = client.GetAsync($"https://cravatar.cn/avatar/{md5}?d=404"); + task.Wait(); + + var rsp = task.Result; + if (rsp.IsSuccessStatusCode) { + using (var stream = rsp.Content.ReadAsStream()) { + using (var writer = File.OpenWrite(localFile)) { + stream.CopyTo(writer); + } + } + + using (var reader = File.OpenRead(localFile)) { + img = Bitmap.DecodeToWidth(reader, 128); + } + } + } catch { } + + lock (_synclock) { + _requesting.Remove(md5); + } + + Dispatcher.UIThread.InvokeAsync(() => { + if (_resources.ContainsKey(md5)) _resources[md5] = img; + else _resources.Add(md5, img); + if (img != null) NotifyResourceReady(md5, img); + }); + } + }); + } + + public static void Subscribe(IAvatarHost host) { + _avatars.Add(new WeakReference(host)); + } + + public static Bitmap Request(string md5, bool forceRefetch = false) { + if (forceRefetch) { + if (_resources.ContainsKey(md5)) _resources.Remove(md5); + } else { + if (_resources.ContainsKey(md5)) return _resources[md5]; + + var localFile = Path.Combine(_storePath, md5); + if (File.Exists(localFile)) { + try { + using (var stream = File.OpenRead(localFile)) { + var img = Bitmap.DecodeToWidth(stream, 128); + _resources.Add(md5, img); + return img; + } + } catch { } + } + } + + lock (_synclock) { + if (!_requesting.Contains(md5)) _requesting.Add(md5); + } + + return null; + } + + private static void NotifyResourceReady(string md5, Bitmap bitmap) { + List> invalids = new List>(); + foreach (var avatar in _avatars) { + IAvatarHost retrived = null; + if (avatar.TryGetTarget(out retrived)) { + retrived.OnAvatarResourceReady(md5, bitmap); + break; + } else { + invalids.Add(avatar); + } + } + + foreach (var invalid in invalids) _avatars.Remove(invalid); + } + + private static object _synclock = new object(); + private static string _storePath = string.Empty; + private static List> _avatars = new List>(); + private static Dictionary _resources = new Dictionary(); + private static HashSet _requesting = new HashSet(); + } +} diff --git a/src/Models/Blame.cs b/src/Models/Blame.cs new file mode 100644 index 00000000..d9d3c9a4 --- /dev/null +++ b/src/Models/Blame.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace SourceGit.Models { + public class BlameLineInfo { + public bool IsFirstInGroup { get; set; } = false; + public string CommitSHA { get; set; } = string.Empty; + public string Author { get; set; } = string.Empty; + public string Time { get; set; } = string.Empty; + } + + public class BlameData { + public string File { get; set; } = string.Empty; + public List LineInfos { get; set; } = new List(); + public string Content { get; set; } = string.Empty; + public bool IsBinary { get; set; } = false; + } +} diff --git a/src/Models/BlameLine.cs b/src/Models/BlameLine.cs deleted file mode 100644 index e97a4f87..00000000 --- a/src/Models/BlameLine.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace SourceGit.Models { - /// - /// 追溯中的行信息 - /// - public class BlameLine { - public string LineNumber { get; set; } - public string CommitSHA { get; set; } - public string Author { get; set; } - public string Time { get; set; } - public string Content { get; set; } - } -} diff --git a/src/Models/Bookmarks.cs b/src/Models/Bookmarks.cs new file mode 100644 index 00000000..5c5e522c --- /dev/null +++ b/src/Models/Bookmarks.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace SourceGit.Models { + public static class Bookmarks { + public static readonly Avalonia.Media.IBrush[] Brushes = [ + Avalonia.Media.Brushes.Transparent, + Avalonia.Media.Brushes.Red, + Avalonia.Media.Brushes.Orange, + Avalonia.Media.Brushes.Gold, + Avalonia.Media.Brushes.ForestGreen, + Avalonia.Media.Brushes.DarkCyan, + Avalonia.Media.Brushes.DeepSkyBlue, + Avalonia.Media.Brushes.Purple, + ]; + + public static readonly List Supported = new List(); + + static Bookmarks() { + for (int i = 0; i < Brushes.Length; i++) Supported.Add(i); + } + } +} diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs index 9f88c4c8..f1041839 100644 --- a/src/Models/Branch.cs +++ b/src/Models/Branch.cs @@ -1,7 +1,4 @@ -namespace SourceGit.Models { - /// - /// 分支数据 - /// +namespace SourceGit.Models { public class Branch { public string Name { get; set; } public string FullName { get; set; } diff --git a/src/Models/BranchTreeNode.cs b/src/Models/BranchTreeNode.cs new file mode 100644 index 00000000..1635ff6e --- /dev/null +++ b/src/Models/BranchTreeNode.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections.Generic; + +namespace SourceGit.Models { + public enum BranchTreeNodeType { + Remote, + Folder, + Branch, + } + + public class BranchTreeNode { + public string Name { get; set; } + public BranchTreeNodeType Type { get; set; } + public object Backend { get; set; } + public bool IsExpanded { get; set; } + public List Children { get; set; } = new List(); + + public bool IsUpstreamTrackStatusVisible { + get => IsBranch && !string.IsNullOrEmpty((Backend as Branch).UpstreamTrackStatus); + } + + public string UpstreamTrackStatus { + get => Type == BranchTreeNodeType.Branch ? (Backend as Branch).UpstreamTrackStatus : ""; + } + + public bool IsRemote { + get => Type == BranchTreeNodeType.Remote; + } + + public bool IsFolder { + get => Type == BranchTreeNodeType.Folder; + } + + public bool IsBranch { + get => Type == BranchTreeNodeType.Branch; + } + + public bool IsCurrent { + get => IsBranch && (Backend as Branch).IsCurrent; + } + + public class Builder { + public List Locals => _locals; + public List Remotes => _remotes; + + public void Run(List branches, List remotes) { + foreach (var remote in remotes) { + var path = $"remote/{remote.Name}"; + var node = new BranchTreeNode() { + Name = remote.Name, + Type = BranchTreeNodeType.Remote, + Backend = remote, + IsExpanded = _expanded.Contains(path), + }; + + _maps.Add(path, node); + _remotes.Add(node); + } + + foreach (var branch in branches) { + if (branch.IsLocal) { + MakeBranchNode(branch, _locals, "local"); + } else { + var remote = _remotes.Find(x => x.Name == branch.Remote); + if (remote != null) MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}"); + } + } + + SortNodes(_locals); + SortNodes(_remotes); + } + + public void CollectExpandedNodes(List nodes, bool isLocal) { + CollectExpandedNodes(nodes, isLocal ? "local" : "remote"); + } + + private void CollectExpandedNodes(List nodes, string prefix) { + foreach (var node in nodes) { + var path = prefix + "/" + node.Name; + if (node.Type != BranchTreeNodeType.Branch && node.IsExpanded) _expanded.Add(path); + CollectExpandedNodes(node.Children, path); + } + } + + private void MakeBranchNode(Branch branch, List roots, string prefix) { + var subs = branch.Name.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (subs.Length == 1) { + var node = new BranchTreeNode() { + Name = subs[0], + Type = BranchTreeNodeType.Branch, + Backend = branch, + IsExpanded = false, + }; + roots.Add(node); + return; + } + + BranchTreeNode lastFolder = null; + string path = prefix; + for (int i = 0; i < subs.Length - 1; i++) { + path = string.Concat(path, "/", subs[i]); + if (_maps.ContainsKey(path)) { + lastFolder = _maps[path]; + } else if (lastFolder == null) { + lastFolder = new BranchTreeNode() { + Name = subs[i], + Type = BranchTreeNodeType.Folder, + IsExpanded = _expanded.Contains(path), + }; + roots.Add(lastFolder); + _maps.Add(path, lastFolder); + } else { + var folder = new BranchTreeNode() { + Name = subs[i], + Type = BranchTreeNodeType.Folder, + IsExpanded = _expanded.Contains(path), + }; + _maps.Add(path, folder); + lastFolder.Children.Add(folder); + lastFolder = folder; + } + } + + var last = new BranchTreeNode() { + Name = subs[subs.Length - 1], + Type = BranchTreeNodeType.Branch, + Backend = branch, + IsExpanded = false, + }; + lastFolder.Children.Add(last); + } + + private void SortNodes(List nodes) { + nodes.Sort((l, r) => { + if (l.Type == r.Type) { + return l.Name.CompareTo(r.Name); + } else { + return (int)(l.Type) - (int)(r.Type); + } + }); + + foreach (var node in nodes) SortNodes(node.Children); + } + + private List _locals = new List(); + private List _remotes = new List(); + private HashSet _expanded = new HashSet(); + private Dictionary _maps = new Dictionary(); + } + } +} diff --git a/src/Models/CRLFMode.cs b/src/Models/CRLFMode.cs new file mode 100644 index 00000000..a75c247c --- /dev/null +++ b/src/Models/CRLFMode.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; + +namespace SourceGit.Models { + public class CRLFMode { + public string Name { get; set; } + public string Value { get; set; } + public string Desc { get; set; } + + public static List Supported = new List() { + new CRLFMode("TRUE", "true", "Commit as LF, checkout as CRLF"), + new CRLFMode("INPUT", "input", "Only convert for commit"), + new CRLFMode("FALSE", "false", "Do NOT convert"), + }; + + public CRLFMode(string name, string value, string desc) { + Name = name; + Value = value; + Desc = desc; + } + } +} diff --git a/src/Models/CRLFOption.cs b/src/Models/CRLFOption.cs deleted file mode 100644 index 059b5060..00000000 --- a/src/Models/CRLFOption.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models { - - /// - /// 自动换行处理方式 - /// - public class CRLFOption { - public string Display { get; set; } - public string Value { get; set; } - public string Desc { get; set; } - - public static List Supported = new List() { - new CRLFOption("TRUE", "true", "Commit as LF, checkout as CRLF"), - new CRLFOption("INPUT", "input", "Only convert for commit"), - new CRLFOption("FALSE", "false", "Do NOT convert"), - }; - - public CRLFOption(string display, string value, string desc) { - Display = display; - Value = value; - Desc = desc; - } - } -} diff --git a/src/Models/Change.cs b/src/Models/Change.cs index 2bfc2c91..15596a13 100644 --- a/src/Models/Change.cs +++ b/src/Models/Change.cs @@ -1,52 +1,41 @@ -namespace SourceGit.Models { +namespace SourceGit.Models { + public enum ChangeViewMode { + List, + Grid, + Tree, + } + + public enum ChangeState { + None, + Modified, + Added, + Deleted, + Renamed, + Copied, + Unmerged, + Untracked + } - /// - /// Git变更 - /// public class Change { - - /// - /// 显示模式 - /// - public enum DisplayMode { - Tree, - List, - Grid, - } - - /// - /// 变更状态码 - /// - public enum Status { - None, - Modified, - Added, - Deleted, - Renamed, - Copied, - Unmerged, - Untracked, - } - - public Status Index { get; set; } - public Status WorkTree { get; set; } = Status.None; + public ChangeState Index { get; set; } + public ChangeState WorkTree { get; set; } = ChangeState.None; public string Path { get; set; } = ""; public string OriginalPath { get; set; } = ""; public bool IsConflit { get { - if (Index == Status.Unmerged || WorkTree == Status.Unmerged) return true; - if (Index == Status.Added && WorkTree == Status.Added) return true; - if (Index == Status.Deleted && WorkTree == Status.Deleted) return true; + if (Index == ChangeState.Unmerged || WorkTree == ChangeState.Unmerged) return true; + if (Index == ChangeState.Added && WorkTree == ChangeState.Added) return true; + if (Index == ChangeState.Deleted && WorkTree == ChangeState.Deleted) return true; return false; } } - public void Set(Status index, Status workTree = Status.None) { + public void Set(ChangeState index, ChangeState workTree = ChangeState.None) { Index = index; WorkTree = workTree; - if (index == Status.Renamed || workTree == Status.Renamed) { + if (index == ChangeState.Renamed || workTree == ChangeState.Renamed) { var idx = Path.IndexOf('\t'); if (idx >= 0) { OriginalPath = Path.Substring(0, idx); diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs index 141f6b9e..36261cf4 100644 --- a/src/Models/Commit.cs +++ b/src/Models/Commit.cs @@ -1,16 +1,10 @@ +using Avalonia; using System; using System.Collections.Generic; -using System.Windows; namespace SourceGit.Models { - /// - /// 提交记录 - /// public class Commit { - private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); - public string SHA { get; set; } = string.Empty; - public string ShortSHA => SHA.Substring(0, 8); public User Author { get; set; } = User.Invalid; public ulong AuthorTime { get; set; } = 0; public User Committer { get; set; } = User.Invalid; @@ -23,10 +17,18 @@ namespace SourceGit.Models { public bool IsMerged { get; set; } = false; public Thickness Margin { get; set; } = new Thickness(0); - public string AuthorTimeStr => UTC_START.AddSeconds(AuthorTime).ToString("yyyy-MM-dd HH:mm:ss"); - public string CommitterTimeStr => UTC_START.AddSeconds(CommitterTime).ToString("yyyy-MM-dd HH:mm:ss"); - public string AuthorTimeShortStr => UTC_START.AddSeconds(AuthorTime).ToString("yyyy/MM/dd"); - public string CommitterTimeShortStr => UTC_START.AddSeconds(CommitterTime).ToString("yyyy/MM/dd"); + public string AuthorTimeStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd HH:mm:ss"); + public string CommitterTimeStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd HH:mm:ss"); + public string AuthorTimeShortStr => _utcStart.AddSeconds(AuthorTime).ToString("yyyy/MM/dd"); + public string CommitterTimeShortStr => _utcStart.AddSeconds(CommitterTime).ToString("yyyy/MM/dd"); + + public bool IsCommitterVisible { + get => Author != Committer || AuthorTime != CommitterTime; + } + + public string FullMessage { + get => string.IsNullOrWhiteSpace(Message) ? Subject : $"{Subject}\n\n{Message}"; + } public static void ParseUserAndTime(string data, ref User user, ref ulong time) { var userEndIdx = data.IndexOf('>'); @@ -36,5 +38,7 @@ namespace SourceGit.Models { user = User.FindOrAdd(data.Substring(0, userEndIdx)); time = timeEndIdx < 0 ? 0 : ulong.Parse(data.Substring(userEndIdx + 2, timeEndIdx - userEndIdx - 2)); } + + private static readonly DateTime _utcStart = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); } } diff --git a/src/Models/CommitGraph.cs b/src/Models/CommitGraph.cs new file mode 100644 index 00000000..cabaff14 --- /dev/null +++ b/src/Models/CommitGraph.cs @@ -0,0 +1,205 @@ +using Avalonia; +using System; +using System.Collections.Generic; + +namespace SourceGit.Models { + public class CommitGraph { + public class Path { + public List Points = new List(); + public int Color = 0; + } + + public class PathHelper { + public string Next; + public bool IsMerged; + public double LastX; + public double LastY; + public double EndY; + public Path Path; + + public PathHelper(string next, bool isMerged, int color, Point start) { + Next = next; + IsMerged = isMerged; + LastX = start.X; + LastY = start.Y; + EndY = LastY; + + Path = new Path(); + Path.Color = color; + Path.Points.Add(start); + } + + public PathHelper(string next, bool isMerged, int color, Point start, Point to) { + Next = next; + IsMerged = isMerged; + LastX = to.X; + LastY = to.Y; + EndY = LastY; + + Path = new Path(); + Path.Color = color; + Path.Points.Add(start); + Path.Points.Add(to); + } + + public void Add(double x, double y, double halfHeight, bool isEnd = false) { + if (x > LastX) { + Add(new Point(LastX, LastY)); + Add(new Point(x, y - halfHeight)); + if (isEnd) Add(new Point(x, y)); + } else if (x < LastX) { + if (y > LastY + halfHeight) Add(new Point(LastX, LastY + halfHeight)); + Add(new Point(x, y)); + } else if (isEnd) { + Add(new Point(x, y)); + } + + LastX = x; + LastY = y; + } + + private void Add(Point p) { + if (EndY < p.Y) { + Path.Points.Add(p); + EndY = p.Y; + } + } + } + + public class Link { + public Point Start; + public Point Control; + public Point End; + public int Color; + } + + public class Dot { + public Point Center; + public int Color; + } + + public List Paths { get; set; } = new List(); + public List Links { get; set; } = new List(); + public List Dots { get; set; } = new List(); + + public static CommitGraph Parse(List commits, double rowHeight, int colorCount) { + double UNIT_WIDTH = 12; + double HALF_WIDTH = 6; + double UNIT_HEIGHT = rowHeight; + double HALF_HEIGHT = rowHeight / 2; + + var temp = new CommitGraph(); + var unsolved = new List(); + var mapUnsolved = new Dictionary(); + var ended = new List(); + var offsetY = -HALF_HEIGHT; + var colorIdx = 0; + + foreach (var commit in commits) { + var major = null as PathHelper; + var isMerged = commit.IsMerged; + var oldCount = unsolved.Count; + + // Update current y offset + offsetY += UNIT_HEIGHT; + + // Find first curves that links to this commit and marks others that links to this commit ended. + double offsetX = -HALF_WIDTH; + foreach (var l in unsolved) { + if (l.Next == commit.SHA) { + if (major == null) { + offsetX += UNIT_WIDTH; + major = l; + + if (commit.Parents.Count > 0) { + major.Next = commit.Parents[0]; + if (!mapUnsolved.ContainsKey(major.Next)) mapUnsolved.Add(major.Next, major); + } else { + major.Next = "ENDED"; + ended.Add(l); + } + + major.Add(offsetX, offsetY, HALF_HEIGHT); + } else { + ended.Add(l); + } + + isMerged = isMerged || l.IsMerged; + } else { + if (!mapUnsolved.ContainsKey(l.Next)) mapUnsolved.Add(l.Next, l); + offsetX += UNIT_WIDTH; + l.Add(offsetX, offsetY, HALF_HEIGHT); + } + } + + // Create new curve for branch head + if (major == null && commit.Parents.Count > 0) { + offsetX += UNIT_WIDTH; + major = new PathHelper(commit.Parents[0], isMerged, colorIdx, new Point(offsetX, offsetY)); + unsolved.Add(major); + temp.Paths.Add(major.Path); + colorIdx = (colorIdx + 1) % colorCount; + } + + // Calculate link position of this commit. + Point position = new Point(offsetX, offsetY); + if (major != null) { + major.IsMerged = isMerged; + position = new Point(major.LastX, offsetY); + temp.Dots.Add(new Dot() { Center = position, Color = major.Path.Color }); + } else { + temp.Dots.Add(new Dot() { Center = position, Color = 0 }); + } + + // Deal with parents + for (int j = 1; j < commit.Parents.Count; j++) { + var parent = commit.Parents[j]; + if (mapUnsolved.ContainsKey(parent)) { + var l = mapUnsolved[parent]; + var link = new Link(); + + link.Start = position; + link.End = new Point(l.LastX, offsetY + HALF_HEIGHT); + link.Control = new Point(link.End.X, link.Start.Y); + link.Color = l.Path.Color; + temp.Links.Add(link); + } else { + offsetX += UNIT_WIDTH; + + // Create new curve for parent commit that not includes before + var l = new PathHelper(commit.Parents[j], isMerged, colorIdx, position, new Point(offsetX, position.Y + HALF_HEIGHT)); + unsolved.Add(l); + temp.Paths.Add(l.Path); + colorIdx = (colorIdx + 1) % colorCount; + } + } + + // Remove ended curves from unsolved + foreach (var l in ended) { + l.Add(position.X, position.Y, HALF_HEIGHT, true); + unsolved.Remove(l); + } + + // Margins & merge state (used by datagrid). + commit.IsMerged = isMerged; + commit.Margin = new Thickness(Math.Max(offsetX + HALF_WIDTH, oldCount * UNIT_WIDTH), 0, 0, 0); + + // Clean up + ended.Clear(); + mapUnsolved.Clear(); + } + + // Deal with curves haven't ended yet. + for (int i = 0; i < unsolved.Count; i++) { + var path = unsolved[i]; + var endY = (commits.Count - 0.5) * UNIT_HEIGHT; + + if (path.Path.Points.Count == 1 && path.Path.Points[0].Y == endY) continue; + path.Add((i + 0.5) * UNIT_WIDTH, endY + HALF_HEIGHT, HALF_HEIGHT, true); + } + unsolved.Clear(); + + return temp; + } + } +} diff --git a/src/Models/CrashInfo.cs b/src/Models/CrashInfo.cs deleted file mode 100644 index 02318bac..00000000 --- a/src/Models/CrashInfo.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Reflection; -using System.IO; -using System.Text; -using System.Diagnostics; - -namespace SourceGit.Models { - /// - /// 崩溃日志生成 - /// - public class CrashInfo { - public static void Create(Exception e) { - var builder = new StringBuilder(); - builder.Append("Crash: "); - builder.Append(e.Message); - builder.Append("\n\n"); - builder.Append("----------------------------\n"); - builder.Append($"Windows OS: {Environment.OSVersion}\n"); - builder.Append($"Version: {Assembly.GetExecutingAssembly().GetName().Version}\n"); - builder.Append($"Platform: {AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}\n"); - builder.Append($"Source: {e.Source}\n"); - builder.Append($"---------------------------\n\n"); - builder.Append(e.StackTrace); - - var time = DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss"); - var file = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName); - file = Path.Combine(file, $"sourcegit_crash_{time}.log"); - File.WriteAllText(file, builder.ToString()); - } - } -} diff --git a/src/Models/Decorator.cs b/src/Models/Decorator.cs index 4197b6d0..5c306b7f 100644 --- a/src/Models/Decorator.cs +++ b/src/Models/Decorator.cs @@ -1,8 +1,6 @@ -namespace SourceGit.Models { +using Avalonia.Media; - /// - /// 修饰类型 - /// +namespace SourceGit.Models { public enum DecoratorType { None, CurrentBranchHead, @@ -11,11 +9,15 @@ namespace SourceGit.Models { Tag, } - /// - /// 提交的附加修饰 - /// public class Decorator { public DecoratorType Type { get; set; } = DecoratorType.None; public string Name { get; set; } = ""; } + + public static class DecoratorResources { + public static readonly IBrush[] Backgrounds = [ + new SolidColorBrush(0xFF02C302), + new SolidColorBrush(0xFFFFB835), + ]; + } } diff --git a/src/Models/DiffOption.cs b/src/Models/DiffOption.cs new file mode 100644 index 00000000..3a26145f --- /dev/null +++ b/src/Models/DiffOption.cs @@ -0,0 +1,95 @@ +using System.Collections.Generic; +using System.Text; + +namespace SourceGit.Models { + public class DiffOption { + public List Revisions => _revisions; + public string Path => _path; + public string OrgPath => _orgPath; + + /// + /// Only used for working copy changes + /// + /// + /// + public DiffOption(Change change, bool isUnstaged) { + if (isUnstaged) { + switch (change.WorkTree) { + case ChangeState.Added: + case ChangeState.Untracked: + _extra = "--no-index"; + _path = change.Path; + _orgPath = "/dev/null"; + break; + default: + _path = change.Path; + _orgPath = change.OriginalPath; + break; + } + } else { + _extra = "--cached"; + _path = change.Path; + _orgPath = change.OriginalPath; + } + } + + /// + /// Only used for commit changes. + /// + /// + /// + public DiffOption(Commit commit, Change change) { + var baseRevision = commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : $"{commit.SHA}^"; + _revisions.Add(baseRevision); + _revisions.Add(commit.SHA); + _path = change.Path; + _orgPath = change.OriginalPath; + } + + /// + /// Diff with filepath. + /// + /// + /// + public DiffOption(Commit commit, string file) { + var baseRevision = commit.Parents.Count == 0 ? "4b825dc642cb6eb9a060e54bf8d69288fbee4904" : $"{commit.SHA}^"; + _revisions.Add(baseRevision); + _revisions.Add(commit.SHA); + _path = file; + } + + /// + /// Used to show differences between two revisions. + /// + /// + /// + /// + public DiffOption(string baseRevision, string targetRevision, Change change) { + _revisions.Add(baseRevision); + _revisions.Add(targetRevision); + _path = change.Path; + _orgPath = change.OriginalPath; + } + + /// + /// Converts to diff command arguments. + /// + /// + public override string ToString() { + var builder = new StringBuilder(); + if (!string.IsNullOrEmpty(_extra)) builder.Append($"{_extra} "); + foreach (var r in _revisions) builder.Append($"{r} "); + + builder.Append("-- "); + if (!string.IsNullOrEmpty(_orgPath)) builder.Append($"\"{_orgPath}\" "); + builder.Append($"\"{_path}\""); + + return builder.ToString(); + } + + private string _orgPath = string.Empty; + private string _path = string.Empty; + private string _extra = string.Empty; + private List _revisions = new List(); + } +} diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs new file mode 100644 index 00000000..debbd48d --- /dev/null +++ b/src/Models/DiffResult.cs @@ -0,0 +1,56 @@ +using System.Collections.Generic; + +namespace SourceGit.Models { + public enum TextDiffLineType { + None, + Normal, + Indicator, + Added, + Deleted, + } + + public class TextInlineRange { + public int Start { get; set; } + public int Count { get; set; } + public TextInlineRange(int p, int n) { Start = p; Count = n; } + } + + public class TextDiffLine { + public TextDiffLineType Type { get; set; } = TextDiffLineType.None; + public string Content { get; set; } = ""; + public string OldLine { get; set; } = ""; + public string NewLine { get; set; } = ""; + public List Highlights { get; set; } = new List(); + + public TextDiffLine() { } + public TextDiffLine(TextDiffLineType type, string content, string oldLine, string newLine) { + Type = type; + Content = content; + OldLine = oldLine; + NewLine = newLine; + } + } + + public class TextDiff { + public string File { get; set; } = string.Empty; + public List Lines { get; set; } = new List(); + public int MaxLineNumber = 0; + } + + public class LFSDiff { + public LFSObject Old { get; set; } = new LFSObject(); + public LFSObject New { get; set; } = new LFSObject(); + } + + public class BinaryDiff { + public long OldSize { get; set; } = 0; + public long NewSize { get; set; } = 0; + } + + public class DiffResult { + public bool IsBinary { get; set; } = false; + public bool IsLFS { get; set; } = false; + public TextDiff TextDiff { get; set; } = null; + public LFSDiff LFSDiff { get; set; } = null; + } +} diff --git a/src/Models/ExecutableFinder.cs b/src/Models/ExecutableFinder.cs deleted file mode 100644 index 7f36522e..00000000 --- a/src/Models/ExecutableFinder.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Runtime.InteropServices; -using System.Text; - -namespace SourceGit.Models { - /// - /// 用于在PATH中检测可执行文件 - /// - public class ExecutableFinder { - - // https://docs.microsoft.com/en-us/windows/desktop/api/shlwapi/nf-shlwapi-pathfindonpathw - // https://www.pinvoke.net/default.aspx/shlwapi.PathFindOnPath - [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)] - private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs); - - /// - /// 从PATH中找到可执行文件路径 - /// - /// - /// - public static string Find(string exec) { - var builder = new StringBuilder(exec, 259); - var rs = PathFindOnPath(builder, null); - return rs ? builder.ToString() : null; - } - } -} diff --git a/src/Models/ExternalMergeTools.cs b/src/Models/ExternalMergeTools.cs new file mode 100644 index 00000000..0df275e0 --- /dev/null +++ b/src/Models/ExternalMergeTools.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; + +namespace SourceGit.Models { + public class ExternalMergeTools { + public int Type { get; set; } + public string Name { get; set; } + public string Exec { get; set; } + public string Cmd { get; set; } + public string DiffCmd { get; set; } + + public static List Supported; + + static ExternalMergeTools() { + if (OperatingSystem.IsWindows()) { + Supported = new List() { + new ExternalMergeTools(0, "Custom", "", "", ""), + new ExternalMergeTools(1, "Visual Studio Code", "Code.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""), + new ExternalMergeTools(2, "Visual Studio 2017/2019", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\""), + new ExternalMergeTools(3, "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\""), + new ExternalMergeTools(4, "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), + new ExternalMergeTools(5, "Beyond Compare 4", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""), + new ExternalMergeTools(6, "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""), + }; + } + } + + public ExternalMergeTools(int type, string name, string exec, string cmd, string diffCmd) { + Type = type; + Name = name; + Exec = exec; + Cmd = cmd; + DiffCmd = diffCmd; + } + } +} diff --git a/src/Models/FileSizeChange.cs b/src/Models/FileSizeChange.cs deleted file mode 100644 index cced7392..00000000 --- a/src/Models/FileSizeChange.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SourceGit.Models { - /// - /// 文件大小变化 - /// - public class FileSizeChange { - public long OldSize = 0; - public long NewSize = 0; - } -} diff --git a/src/Models/GitFlow.cs b/src/Models/GitFlow.cs index 07c787df..dca2aa91 100644 --- a/src/Models/GitFlow.cs +++ b/src/Models/GitFlow.cs @@ -1,7 +1,4 @@ -namespace SourceGit.Models { - /// - /// GitFlow的分支类型 - /// +namespace SourceGit.Models { public enum GitFlowBranchType { None, Feature, @@ -9,9 +6,6 @@ namespace SourceGit.Models { Hotfix, } - /// - /// GitFlow相关设置 - /// public class GitFlow { public string Feature { get; set; } public string Release { get; set; } diff --git a/src/Models/InstalledFonts.cs b/src/Models/InstalledFonts.cs deleted file mode 100644 index 7855b493..00000000 --- a/src/Models/InstalledFonts.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Windows.Markup; -using System.Windows.Media; - -namespace SourceGit.Models { - public class InstalledFont { - public string Name { get; set; } - public int FamilyIndex { get; set; } - - public static List GetFonts { - get { - var fontList = new List(); - - var fontCollection = Fonts.SystemFontFamilies; - var familyCount = fontCollection.Count; - - for (int i = 0; i < familyCount; i++) { - var fontFamily = fontCollection.ElementAt(i); - var familyNames = fontFamily.FamilyNames; - - if (!familyNames.TryGetValue(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name), out var name)) { - if (!familyNames.TryGetValue(XmlLanguage.GetLanguage("en-us"), out name)) { - name = familyNames.FirstOrDefault().Value; - } - } - - fontList.Add(new InstalledFont() { - Name = name, - FamilyIndex = i - }); - } - - fontList.Sort((p, n) => string.Compare(p.Name, n.Name, StringComparison.Ordinal)); - - return fontList; - } - } - } -} diff --git a/src/Models/LFSChange.cs b/src/Models/LFSChange.cs deleted file mode 100644 index e77f78ac..00000000 --- a/src/Models/LFSChange.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace SourceGit.Models { - /// - /// LFS对象变更 - /// - public class LFSChange { - public LFSObject Old; - public LFSObject New; - public bool IsValid => Old != null || New != null; - } -} diff --git a/src/Models/LFSObject.cs b/src/Models/LFSObject.cs index 4bbc08e6..13bf0b32 100644 --- a/src/Models/LFSObject.cs +++ b/src/Models/LFSObject.cs @@ -1,9 +1,6 @@ -namespace SourceGit.Models { - /// - /// LFS对象 - /// +namespace SourceGit.Models { public class LFSObject { - public string OID { get; set; } - public long Size { get; set; } + public string Oid { get; set; } = string.Empty; + public long Size { get; set; } = 0; } } diff --git a/src/Models/Locale.cs b/src/Models/Locale.cs deleted file mode 100644 index d3abb25c..00000000 --- a/src/Models/Locale.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace SourceGit.Models { - - /// - /// 支持的语言 - /// - public class Locale { - public string Name { get; set; } - public string Resource { get; set; } - - public static List Supported = new List() { - new Locale("English", "en_US"), - new Locale("简体中文", "zh_CN"), - }; - - public Locale(string name, string res) { - Name = name; - Resource = res; - } - - public static void Change() { - var lang = Preference.Instance.General.Locale; - foreach (var rs in App.Current.Resources.MergedDictionaries) { - if (rs.Source != null && rs.Source.OriginalString.StartsWith("pack://application:,,,/Resources/Locales/", StringComparison.Ordinal)) { - rs.Source = new Uri($"pack://application:,,,/Resources/Locales/{lang}.xaml", UriKind.Absolute); - break; - } - } - } - } -} diff --git a/src/Models/Locales.cs b/src/Models/Locales.cs new file mode 100644 index 00000000..35bb7a29 --- /dev/null +++ b/src/Models/Locales.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; + +namespace SourceGit.Models { + public class Locale { + public string Name { get; set; } + public string Key { get; set; } + + public static List Supported = new List() { + new Locale("English", "en_US"), + new Locale("简体中文", "zh_CN"), + }; + + public Locale(string name, string key) { + Name = name; + Key = key; + } + } +} diff --git a/src/Models/MergeOption.cs b/src/Models/MergeOption.cs deleted file mode 100644 index 778c1a12..00000000 --- a/src/Models/MergeOption.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models { - /// - /// 合并方式 - /// - public class MergeOption { - public string Name { get; set; } - public string Desc { get; set; } - public string Arg { get; set; } - - public static List Supported = new List() { - new MergeOption("Default", "Fast-forward if possible", ""), - new MergeOption("No Fast-forward", "Always create a merge commit", "--no-ff"), - new MergeOption("Squash", "Use '--squash'", "--squash"), - new MergeOption("Don't commit", "Merge without commit", "--no-commit"), - }; - - public MergeOption(string n, string d, string a) { - Name = n; - Desc = d; - Arg = a; - } - } -} diff --git a/src/Models/MergeTool.cs b/src/Models/MergeTool.cs deleted file mode 100644 index 1f991023..00000000 --- a/src/Models/MergeTool.cs +++ /dev/null @@ -1,134 +0,0 @@ -using Microsoft.Win32; -using System; -using System.Collections.Generic; -using System.IO; - -namespace SourceGit.Models { - - /// - /// 外部合并工具 - /// - public class MergeTool { - public int Type { get; set; } - public string Name { get; set; } - public string Exec { get; set; } - public string Cmd { get; set; } - public string DiffCmd { get; set; } - public Func Finder { get; set; } - - public static List Supported = new List() { - new MergeTool(0, "--", "", "", "", () => ""), - new MergeTool(1, "Visual Studio Code", "Code.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\"", FindVSCode), - new MergeTool(2, "Visual Studio 2017/2019", "vsDiffMerge.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m", "\"$LOCAL\" \"$REMOTE\"", FindVSMerge), - new MergeTool(3, "Tortoise Merge", "TortoiseMerge.exe;TortoiseGitMerge.exe", "-base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\"", "-base:\"$LOCAL\" -theirs:\"$REMOTE\"", FindTortoiseMerge), - new MergeTool(4, "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\"", FindKDiff3), - new MergeTool(5, "Beyond Compare 4", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\"", FindBCompare), - new MergeTool(6, "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\"", FindWinMerge), - }; - - public MergeTool(int type, string name, string exec, string cmd, string diffCmd, Func finder) { - Type = type; - Name = name; - Exec = exec; - Cmd = cmd; - DiffCmd = diffCmd; - Finder = finder; - } - - private static string FindVSCode() { - var root = RegistryKey.OpenBaseKey( - RegistryHive.LocalMachine, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1"); - if (vscode != null) { - return vscode.GetValue("DisplayIcon") as string; - } - - vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1"); - if (vscode != null) { - return vscode.GetValue("DisplayIcon") as string; - } - - vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1"); - if (vscode != null) { - return vscode.GetValue("DisplayIcon") as string; - } - - vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1"); - if (vscode != null) { - return vscode.GetValue("DisplayIcon") as string; - } - - return ""; - } - - private static string FindVSMerge() { - var dir = @"C:\Program Files (x86)\Microsoft Visual Studio"; - if (Directory.Exists($"{dir}\\2019")) { - dir += "\\2019"; - } else if (Directory.Exists($"{dir}\\2017")) { - dir += "\\2017"; - } else { - return ""; - } - - if (Directory.Exists($"{dir}\\Community")) { - dir += "\\Community"; - } else if (Directory.Exists($"{dir}\\Enterprise")) { - dir += "\\Enterprise"; - } else if (Directory.Exists($"{dir}\\Professional")) { - dir += "\\Professional"; - } else { - return ""; - } - - return $"{dir}\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsDiffMerge.exe"; - } - - private static string FindTortoiseMerge() { - var root = RegistryKey.OpenBaseKey( - RegistryHive.LocalMachine, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var tortoise = root.OpenSubKey("SOFTWARE\\TortoiseGit") ?? root.OpenSubKey("SOFTWARE\\TortoiseSVN"); - if (tortoise == null) return ""; - return tortoise.GetValue("TMergePath") as string; - } - - private static string FindKDiff3() { - var root = RegistryKey.OpenBaseKey( - RegistryHive.LocalMachine, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var kdiff = root.OpenSubKey(@"SOFTWARE\KDiff3\diff-ext"); - if (kdiff == null) return ""; - return kdiff.GetValue("diffcommand") as string; - } - - private static string FindBCompare() { - var root = RegistryKey.OpenBaseKey( - RegistryHive.LocalMachine, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var bc = root.OpenSubKey(@"SOFTWARE\Scooter Software\Beyond Compare"); - if (bc == null) return ""; - - var exec = bc.GetValue("ExePath") as string; - var dir = Path.GetDirectoryName(exec); - return $"{dir}\\BComp.exe"; - } - - private static string FindWinMerge() { - var root = RegistryKey.OpenBaseKey( - RegistryHive.CurrentUser, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var merge = root.OpenSubKey(@"SOFTWARE\Thingamahoochie\WinMerge"); - if (merge == null) return ""; - - var exec = merge.GetValue("Executable") as string; - return exec; - } - } -} diff --git a/src/Models/Notification.cs b/src/Models/Notification.cs new file mode 100644 index 00000000..08c888b9 --- /dev/null +++ b/src/Models/Notification.cs @@ -0,0 +1,10 @@ +namespace SourceGit.Models { + public class Notification { + public bool IsError { get; set; } = false; + public string Message { get; set; } = string.Empty; + } + + public interface INotificationReceiver { + void OnReceiveNotification(string ctx, Notification notice); + } +} diff --git a/src/Models/Object.cs b/src/Models/Object.cs index 01552f8c..c2f27a31 100644 --- a/src/Models/Object.cs +++ b/src/Models/Object.cs @@ -1,7 +1,4 @@ -namespace SourceGit.Models { - /// - /// 提交中元素类型 - /// +namespace SourceGit.Models { public enum ObjectType { None, Blob, @@ -10,9 +7,6 @@ namespace SourceGit.Models { Commit, } - /// - /// Git提交中的元素 - /// public class Object { public string SHA { get; set; } public ObjectType Type { get; set; } diff --git a/src/Models/Preference.cs b/src/Models/Preference.cs deleted file mode 100644 index 353a26f8..00000000 --- a/src/Models/Preference.cs +++ /dev/null @@ -1,297 +0,0 @@ -using Microsoft.Win32; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text.Json; -using System.Text.Json.Serialization; -using System.Windows; - -namespace SourceGit.Models { - - /// - /// 程序配置 - /// - public class Preference { - private static readonly string SAVE_PATH = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "SourceGit", - "preference_v4.json"); - private static Preference instance = null; - - /// - /// 起始页仓库列表排序方式 - /// - public enum SortMethod { - ByName, - ByRecentlyOpened, - ByBookmark, - } - - /// - /// 通用配置 - /// - public class GeneralInfo { - - /// - /// 显示语言 - /// - public string Locale { get; set; } = "en_US"; - - /// - /// 系统字体 - /// - public string FontFamilyWindowSetting { get; set; } = "Microsoft YaHei UI"; - - [JsonIgnore] - public string FontFamilyWindow { - get => FontFamilyWindowSetting + ",Microsoft YaHei UI"; - set => FontFamilyWindowSetting = value; - } - - /// - /// 用户字体（提交列表、提交日志、差异比较等） - /// - public string FontFamilyContentSetting { get; set; } = "Consolas"; - - [JsonIgnore] - public string FontFamilyContent { - get => FontFamilyContentSetting + ",Microsoft YaHei UI"; - set => FontFamilyContentSetting = value; - } - - /// - /// 是否启用深色主题 - /// - public bool UseDarkTheme { get; set; } = false; - - /// - /// 历史提交记录最多显示的条目数 - /// - public uint MaxHistoryCommits { get; set; } = 20000; - - /// - /// 起始页仓库列表排序规则 - /// - public SortMethod SortBy { get; set; } = SortMethod.ByName; - } - - /// - /// Git配置 - /// - public class GitInfo { - - /// - /// git.exe所在路径 - /// - public string Path { get; set; } - - /// - /// 默认克隆路径 - /// - public string DefaultCloneDir { get; set; } - - /// - /// 启用自动拉取远程变更（每10分钟一次） - /// - public bool AutoFetchRemotes { get; set; } = true; - - /// - /// 在本地变更列表中显示未跟踪文件 - /// - public bool IncludeUntrackedInWC { get; set; } = true; - } - - /// - /// 外部合并工具配置 - /// - public class MergeToolInfo { - /// - /// 合并工具类型 - /// - public int Type { get; set; } = 0; - - /// - /// 合并工具可执行文件路径 - /// - public string Path { get; set; } = ""; - } - - /// - /// 使用设置 - /// - public class WindowInfo { - - /// - /// 最近一次设置的宽度 - /// - public double Width { get; set; } = 800; - - /// - /// 最近一次设置的高度 - /// - public double Height { get; set; } = 600; - - /// - /// 保存上次关闭时是否最大化中 - /// - public WindowState State { get; set; } = WindowState.Normal; - - /// - /// 将提交信息面板与提交记录左右排布 - /// - public bool MoveCommitInfoRight { get; set; } = false; - - /// - /// 使用合并Diff视图 - /// - public bool UseCombinedDiff { get; set; } = false; - - /// - /// Pull时是否使用Rebase替换Merge - /// - public bool UseRebaseOnPull { get; set; } = true; - - /// - /// Pull时是否使用自动暂存 - /// - public bool UseAutoStashOnPull { get; set; } = true; - - /// - /// 未暂存视图中变更显示方式 - /// - public Change.DisplayMode ChangeInUnstaged { get; set; } = Change.DisplayMode.Tree; - - /// - /// 暂存视图中变更显示方式 - /// - public Change.DisplayMode ChangeInStaged { get; set; } = Change.DisplayMode.Tree; - - /// - /// 提交信息视图中变更显示方式 - /// - public Change.DisplayMode ChangeInCommitInfo { get; set; } = Change.DisplayMode.Tree; - } - - /// - /// 恢复上次打开的窗口 - /// - public class RestoreTabs { - - /// - /// 是否开启该功能 - /// - public bool IsEnabled { get; set; } = false; - - /// - /// 上次打开的仓库 - /// - public List Opened { get; set; } = new List(); - - /// - /// 最后浏览的仓库 - /// - public string Actived { get; set; } = null; - } - - /// - /// 全局配置 - /// - [JsonIgnore] - public static Preference Instance { - get { - if (instance == null) return Load(); - return instance; - } - } - - /// - /// 检测配置是否正常 - /// - [JsonIgnore] - public bool IsReady { - get => File.Exists(Git.Path) && new Commands.Version().Query() != null; - } - - #region DATA - public GeneralInfo General { get; set; } = new GeneralInfo(); - public GitInfo Git { get; set; } = new GitInfo(); - public MergeToolInfo MergeTool { get; set; } = new MergeToolInfo(); - public WindowInfo Window { get; set; } = new WindowInfo(); - public List Repositories { get; set; } = new List(); - public RestoreTabs Restore { get; set; } = new RestoreTabs(); - #endregion - - #region LOAD_SAVE - public static Preference Load() { - if (!File.Exists(SAVE_PATH)) { - instance = new Preference(); - } else { - try { - instance = JsonSerializer.Deserialize(File.ReadAllText(SAVE_PATH)); - } catch { - instance = new Preference(); - } - } - - if (!instance.IsReady) { - var reg = RegistryKey.OpenBaseKey( - RegistryHive.LocalMachine, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - var git = reg.OpenSubKey("SOFTWARE\\GitForWindows"); - if (git != null) { - instance.Git.Path = Path.Combine(git.GetValue("InstallPath") as string, "bin", "git.exe"); - } - } - - return instance; - } - - public static void Save() { - var dir = Path.GetDirectoryName(SAVE_PATH); - if (!Directory.Exists(dir)) Directory.CreateDirectory(dir); - var data = JsonSerializer.Serialize(instance, new JsonSerializerOptions() { WriteIndented = true }); - File.WriteAllText(SAVE_PATH, data); - } - #endregion - - #region METHOD_ON_REPOSITORIES - public Repository AddRepository(string path, string gitDir) { - var repo = FindRepository(path); - if (repo != null) return repo; - - var dir = new DirectoryInfo(path); - repo = new Repository() { - Path = dir.FullName, - GitDir = gitDir, - Name = dir.Name - }; - - Repositories.Add(repo); - Repositories.Sort((l, r) => l.Name.CompareTo(r.Name)); - return repo; - } - - public Repository FindRepository(string path) { - var dir = new DirectoryInfo(path); - foreach (var repo in Repositories) { - if (repo.Path == dir.FullName) return repo; - } - return null; - } - - public void RemoveRepository(string path) { - var dir = new DirectoryInfo(path); - var removedIdx = -1; - - for (int i = 0; i < Repositories.Count; i++) { - if (Repositories[i].Path == dir.FullName) { - removedIdx = i; - break; - } - } - - if (removedIdx >= 0) Repositories.RemoveAt(removedIdx); - } - #endregion - } -} \ No newline at end of file diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs index a4455975..021ccc67 100644 --- a/src/Models/Remote.cs +++ b/src/Models/Remote.cs @@ -1,10 +1,31 @@ -namespace SourceGit.Models { +using System.Text.RegularExpressions; - /// - /// 远程 - /// +namespace SourceGit.Models { public class Remote { + private static readonly Regex[] URL_FORMATS = [ + new Regex(@"^http[s]?://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-\.]+\.git$"), + new Regex(@"^[\w\-]+@[\w\.\-]+(\:[0-9]+)?:[\w\-]+/[\w\-\.]+\.git$"), + new Regex(@"^ssh://([\w\-]+@)?[\w\.\-]+(\:[0-9]+)?/[\w\-]+/[\w\-\.]+\.git$"), + ]; + public string Name { get; set; } public string URL { get; set; } + + public static bool IsSSH(string url) { + if (string.IsNullOrWhiteSpace(url)) return false; + + for (int i = 1; i < URL_FORMATS.Length; i++) { + if (URL_FORMATS[i].IsMatch(url)) return true; + } + + return false; + } + + public static bool IsValidURL(string url) { + foreach (var fmt in URL_FORMATS) { + if (fmt.IsMatch(url)) return true; + } + return false; + } } } diff --git a/src/Models/Repository.cs b/src/Models/Repository.cs deleted file mode 100644 index 9f8cfedc..00000000 --- a/src/Models/Repository.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Text.Json.Serialization; - -namespace SourceGit.Models { - /// - /// 用于更新过滤器的参数 - /// - public class FilterUpdateParam { - /// - /// 是否是添加过滤的操作，false代表删除 - /// - public bool IsAdd = false; - - /// - /// 过滤内容 - /// - public string Name = ""; - } - - /// - /// 仓库 - /// - public class Repository { - - #region PROPERTIES_SAVED - public string Name { - get => name; - set { - if (name != value) { - name = value; - Watcher.NotifyDisplayNameChanged(this); - } - } - } - - public string Path { get; set; } = ""; - public string GitDir { get; set; } = ""; - public long LastOpenTime { get; set; } = 0; - public List SubTrees { get; set; } = new List(); - public List Filters { get; set; } = new List(); - public List CommitMessages { get; set; } = new List(); - - public int Bookmark { - get { return bookmark; } - set { - if (value != bookmark) { - bookmark = value; - Watcher.NotifyBookmarkChanged(this); - } - } - } - #endregion - - #region PROPERTIES_RUNTIME - [JsonIgnore] public List Remotes = new List(); - [JsonIgnore] public List Branches = new List(); - [JsonIgnore] public GitFlow GitFlow = new GitFlow(); - #endregion - - /// - /// 记录历史输入的提交信息 - /// - /// - public void PushCommitMessage(string message) { - if (string.IsNullOrEmpty(message)) return; - - int exists = CommitMessages.Count; - if (exists > 0) { - var last = CommitMessages[0]; - if (last == message) return; - } - - if (exists >= 10) { - CommitMessages.RemoveRange(9, exists - 9); - } - - CommitMessages.Insert(0, message); - } - - /// - /// 判断一个文件是否在GitDir中 - /// - /// - /// - public bool ExistsInGitDir(string file) { - if (string.IsNullOrEmpty(file)) return false; - string fullpath = System.IO.Path.Combine(GitDir, file); - return Directory.Exists(fullpath) || File.Exists(fullpath); - } - - /// - /// 更新提交记录过滤器 - /// - /// 更新参数 - /// 是否发生了变化 - public bool UpdateFilters(FilterUpdateParam param = null) { - lock (updateFilterLock) { - bool changed = false; - - // 填写了参数就仅增删 - if (param != null) { - if (param.IsAdd) { - if (!Filters.Contains(param.Name)) { - Filters.Add(param.Name); - changed = true; - } - } else { - if (Filters.Contains(param.Name)) { - Filters.Remove(param.Name); - changed = true; - } - } - - return changed; - } - - // 未填写参数就检测，去掉无效的过滤 - if (Filters.Count > 0) { - var invalidFilters = new List(); - var branches = new Commands.Branches(Path).Result(); - var tags = new Commands.Tags(Path).Result(); - - foreach (var filter in Filters) { - if (filter.StartsWith("refs/")) { - if (branches.FindIndex(b => b.FullName == filter) < 0) invalidFilters.Add(filter); - } else { - if (tags.FindIndex(t => t.Name == filter) < 0) invalidFilters.Add(filter); - } - } - - if (invalidFilters.Count > 0) { - foreach (var filter in invalidFilters) Filters.Remove(filter); - return true; - } - } - - return false; - } - } - - private readonly object updateFilterLock = new object(); - private string name = string.Empty; - private int bookmark = 0; - } -} diff --git a/src/Models/ResetMode.cs b/src/Models/ResetMode.cs deleted file mode 100644 index 4532bcf1..00000000 --- a/src/Models/ResetMode.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using System.Windows.Media; - -namespace SourceGit.Models { - /// - /// 重置方式 - /// - public class ResetMode { - public string Name { get; set; } - public string Desc { get; set; } - public string Arg { get; set; } - public Brush Color { get; set; } - - public static List Supported = new List() { - new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green), - new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange), - new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red), - }; - - public ResetMode(string n, string d, string a, Brush b) { - Name = n; - Desc = d; - Arg = a; - Color = b; - } - } -} diff --git a/src/Models/RevisionFile.cs b/src/Models/RevisionFile.cs new file mode 100644 index 00000000..9dd49545 --- /dev/null +++ b/src/Models/RevisionFile.cs @@ -0,0 +1,17 @@ +namespace SourceGit.Models { + public class RevisionBinaryFile { + } + + public class RevisionTextFile { + public string FileName { get; set; } + public string Content { get; set; } + } + + public class RevisionLFSObject { + public LFSObject Object { get; set; } + } + + public class RevisionSubmodule { + public string SHA { get; set; } + } +} diff --git a/src/Models/Stash.cs b/src/Models/Stash.cs index f079277f..8b2973b9 100644 --- a/src/Models/Stash.cs +++ b/src/Models/Stash.cs @@ -1,9 +1,6 @@ -using System; +using System; namespace SourceGit.Models { - /// - /// 贮藏 - /// public class Stash { private static readonly DateTime UTC_START = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); @@ -13,6 +10,6 @@ namespace SourceGit.Models { public ulong Time { get; set; } = 0; public string Message { get; set; } = ""; - public string TimeStr => UTC_START.AddSeconds(Time).ToString("yyyy-MM-dd HH:mm:ss"); + public string TimeStr => UTC_START.AddSeconds(Time).ToString("yyyy/MM/dd HH:mm:ss"); } } diff --git a/src/Models/StatisticSample.cs b/src/Models/StatisticSample.cs deleted file mode 100644 index 1fa7283b..00000000 --- a/src/Models/StatisticSample.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace SourceGit.Models { - /// - /// 统计图表样品 - /// - public class StatisticSample { - /// - /// 在图表中的顺序 - /// - public int Index { get; set; } - /// - /// 样品名 - /// - public string Name { get; set; } - /// - /// 提交个数 - /// - public int Count { get; set; } - } -} diff --git a/src/Models/SubTree.cs b/src/Models/SubTree.cs deleted file mode 100644 index fdbad2fe..00000000 --- a/src/Models/SubTree.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace SourceGit.Models { - /// - /// 子树 - /// - public class SubTree { - public string Prefix { get; set; } - public string Remote { get; set; } - public string Branch { get; set; } = "master"; - } -} diff --git a/src/Models/Tag.cs b/src/Models/Tag.cs index 20d6f09b..a6e10db4 100644 --- a/src/Models/Tag.cs +++ b/src/Models/Tag.cs @@ -1,10 +1,6 @@ -namespace SourceGit.Models { - /// - /// 标签 - /// +namespace SourceGit.Models { public class Tag { public string Name { get; set; } public string SHA { get; set; } - public bool IsFiltered { get; set; } } } diff --git a/src/Models/TextChanges.cs b/src/Models/TextChanges.cs deleted file mode 100644 index c563c5a7..00000000 --- a/src/Models/TextChanges.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models { - /// - /// Diff文本文件变化 - /// - public class TextChanges { - - public enum LineMode { - None, - Normal, - Indicator, - Added, - Deleted, - } - - public class HighlightRange { - public int Start { get; set; } - public int Count { get; set; } - public HighlightRange(int p, int n) { Start = p; Count = n; } - } - - public class Line { - public int Index { get; set; } = 0; - public LineMode Mode { get; set; } = LineMode.None; - public string Content { get; set; } = ""; - public string OldLine { get; set; } = ""; - public string NewLine { get; set; } = ""; - public List Highlights { get; set; } = new List(); - - public bool IsContent { - get { - return Mode == LineMode.Added - || Mode == LineMode.Deleted - || Mode == LineMode.Normal; - } - } - - public bool IsDifference { - get { - return Mode == LineMode.Added - || Mode == LineMode.Deleted - || Mode == LineMode.None; - } - } - - public Line() { } - - public Line(int index, LineMode mode, string content, string oldLine, string newLine) { - Index = index; - Mode = mode; - Content = content; - OldLine = oldLine; - NewLine = newLine; - } - } - - public bool IsBinary = false; - public List Lines = new List(); - } -} diff --git a/src/Models/TextCompare.cs b/src/Models/TextInlineChange.cs similarity index 85% rename from src/Models/TextCompare.cs rename to src/Models/TextInlineChange.cs index e59e3424..6ce4c374 100644 --- a/src/Models/TextCompare.cs +++ b/src/Models/TextInlineChange.cs @@ -1,34 +1,13 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SourceGit.Models { + public class TextInlineChange { + public int DeletedStart { get; set; } + public int DeletedCount { get; set; } + public int AddedStart { get; set; } + public int AddedCount { get; set; } - /// - /// 字串差异对比，改写自DiffPlex - /// - public class TextCompare { - private static readonly HashSet SEPS = new HashSet(" \t+-*/=!,:;.'\"/?|&#@%`<>()[]{}\\".ToCharArray()); - - /// - /// 差异信息 - /// - public class Different { - public int DeletedStart { get; set; } - public int DeletedCount { get; set; } - public int AddedStart { get; set; } - public int AddedCount { get; set; } - - public Different(int dp, int dc, int ap, int ac) { - DeletedStart = dp; - DeletedCount = dc; - AddedStart = ap; - AddedCount = ac; - } - } - - /// - /// 分片 - /// - public class Chunk { + class Chunk { public int Hash; public bool Modified; public int Start; @@ -42,10 +21,7 @@ namespace SourceGit.Models { } } - /// - /// 区间修改状态 - /// - public enum Edit { + enum Edit { None, DeletedRight, DeletedLeft, @@ -53,10 +29,7 @@ namespace SourceGit.Models { AddedLeft, } - /// - /// 当前区间检测结果 - /// - public class EditResult { + class EditResult { public Edit State; public int DeleteStart; public int DeleteEnd; @@ -64,13 +37,14 @@ namespace SourceGit.Models { public int AddEnd; } - /// - /// 对比字串 - /// - /// - /// - /// - public static List Process(string oldValue, string newValue) { + public TextInlineChange(int dp, int dc, int ap, int ac) { + DeletedStart = dp; + DeletedCount = dc; + AddedStart = ap; + AddedCount = ac; + } + + public static List Compare(string oldValue, string newValue) { var hashes = new Dictionary(); var chunksOld = MakeChunks(hashes, oldValue); var chunksNew = MakeChunks(hashes, newValue); @@ -81,10 +55,10 @@ namespace SourceGit.Models { var reverse = new int[max]; CheckModified(chunksOld, 0, sizeOld, chunksNew, 0, sizeNew, forward, reverse); - var ret = new List(); + var ret = new List(); var posOld = 0; var posNew = 0; - var last = null as Different; + var last = null as TextInlineChange; do { while (posOld < sizeOld && posNew < sizeNew && !chunksOld[posOld].Modified && !chunksNew[posNew].Modified) { posOld++; @@ -100,7 +74,7 @@ namespace SourceGit.Models { if (countOld + countNew == 0) continue; - var diff = new Different( + var diff = new TextInlineChange( countOld > 0 ? chunksOld[beginOld].Start : 0, countOld, countNew > 0 ? chunksNew[beginNew].Start : 0, @@ -126,10 +100,11 @@ namespace SourceGit.Models { var start = 0; var size = text.Length; var chunks = new List(); + var delims = new HashSet(" \t+-*/=!,:;.'\"/?|&#@%`<>()[]{}\\".ToCharArray()); for (int i = 0; i < size; i++) { var ch = text[i]; - if (SEPS.Contains(ch)) { + if (delims.Contains(ch)) { if (start != i) AddChunk(chunks, hashes, text.Substring(start, i - start), start); AddChunk(chunks, hashes, text.Substring(i, 1), i); start = i + 1; @@ -190,7 +165,6 @@ namespace SourceGit.Models { for (int i = 0; i <= half; i++) { - // 正向 for (int j = -i; j <= i; j += 2) { var idx = j + half; int o, n; @@ -231,7 +205,6 @@ namespace SourceGit.Models { } } - // 反向 for (int j = -i; j <= i; j += 2) { var idx = j + half; int o, n; diff --git a/src/Models/TextLine.cs b/src/Models/TextLine.cs deleted file mode 100644 index 72084cc0..00000000 --- a/src/Models/TextLine.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SourceGit.Models { - /// - /// 文件中的一行内容 - /// - public class TextLine { - public int Number { get; set; } - public string Data { get; set; } - } -} diff --git a/src/Models/Theme.cs b/src/Models/Theme.cs deleted file mode 100644 index 7eafb22d..00000000 --- a/src/Models/Theme.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Windows; - -namespace SourceGit.Models { - /// - /// 主题 - /// - public static class Theme { - /// - /// 主题切换事件 - /// - public static event Action Changed; - - /// - /// 启用主题变化监听 - /// - /// - public static void AddListener(FrameworkElement elem, Action callback) { - elem.Loaded += (_, __) => Changed += callback; - elem.Unloaded += (_, __) => Changed -= callback; - } - - /// - /// 切换主题 - /// - public static void Change() { - var theme = Preference.Instance.General.UseDarkTheme ? "Dark" : "Light"; - foreach (var rs in App.Current.Resources.MergedDictionaries) { - if (rs.Source != null && rs.Source.OriginalString.StartsWith("pack://application:,,,/Resources/Themes/", StringComparison.Ordinal)) { - rs.Source = new Uri($"pack://application:,,,/Resources/Themes/{theme}.xaml", UriKind.Absolute); - break; - } - } - - Changed?.Invoke(); - } - } -} diff --git a/src/Models/User.cs b/src/Models/User.cs index 9af6bdcf..e5ed39ef 100644 --- a/src/Models/User.cs +++ b/src/Models/User.cs @@ -1,9 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace SourceGit.Models { - /// - /// Git用户 - /// public class User { public static User Invalid = new User(); public static Dictionary Caches = new Dictionary(); @@ -12,8 +9,8 @@ namespace SourceGit.Models { public string Email { get; set; } = string.Empty; public override bool Equals(object obj) { - if (obj == null || !(obj is User)) return false; - + if (obj == null || !(obj is User)) return false; + var other = obj as User; return Name == other.Name && Email == other.Email; } diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs index 090b512f..74441dc7 100644 --- a/src/Models/Watcher.cs +++ b/src/Models/Watcher.cs @@ -1,268 +1,167 @@ -using System; -using System.Collections.Generic; +using System; using System.IO; using System.Threading; +using System.Threading.Tasks; namespace SourceGit.Models { + public interface IRepository { + string FullPath { get; set; } + string GitDir { get; set; } - /// - /// 文件系统更新监视 - /// - public class Watcher { - /// - /// 打开仓库事件 - /// - public static event Action Opened; + void RefreshBranches(); + void RefreshTags(); + void RefreshCommits(); + void RefreshSubmodules(); + void RefreshWorkingCopyChanges(); + void RefreshStashes(); + } - /// - /// 仓库的显示名变化了 - /// - public static event Action DisplayNameChanged; + public class Watcher : IDisposable { + public Watcher(IRepository repo) { + _repo = repo; - /// - /// 仓库的书签变化了 - /// - public static event Action BookmarkChanged; + _wcWatcher = new FileSystemWatcher(); + _wcWatcher.Path = _repo.FullPath; + _wcWatcher.Filter = "*"; + _wcWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.Size | NotifyFilters.CreationTime; + _wcWatcher.IncludeSubdirectories = true; + _wcWatcher.Created += OnWorkingCopyChanged; + _wcWatcher.Renamed += OnWorkingCopyChanged; + _wcWatcher.Changed += OnWorkingCopyChanged; + _wcWatcher.Deleted += OnWorkingCopyChanged; + _wcWatcher.EnableRaisingEvents = true; - /// - /// 跳转到指定提交的事件 - /// - public event Action Navigate; - /// - /// 工作副本变更 - /// - public event Action WorkingCopyChanged; - /// - /// 分支数据变更 - /// - public event Action BranchChanged; - /// - /// 标签变更 - /// - public event Action TagChanged; - /// - /// 贮藏变更 - /// - public event Action StashChanged; - /// - /// 子模块变更 - /// - public event Action SubmoduleChanged; - /// - /// 树更新 - /// - public event Action SubTreeChanged; + _repoWatcher = new FileSystemWatcher(); + _repoWatcher.Path = _repo.GitDir; + _repoWatcher.Filter = "*"; + _repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName; + _repoWatcher.IncludeSubdirectories = true; + _repoWatcher.Created += OnRepositoryChanged; + _repoWatcher.Renamed += OnRepositoryChanged; + _repoWatcher.Changed += OnRepositoryChanged; + _repoWatcher.Deleted += OnRepositoryChanged; + _repoWatcher.EnableRaisingEvents = true; - /// - /// 打开仓库事件 - /// - /// - public static void Open(Repository repo) { - if (all.ContainsKey(repo.Path)) { - Opened?.Invoke(repo); - return; + _timer = new Timer(Tick, null, 100, 100); + } + + public void SetEnabled(bool enabled) { + if (enabled) { + if (_lockCount > 0) _lockCount--; + } else { + _lockCount++; } - - var watcher = new Watcher(); - watcher.Start(repo.Path, repo.GitDir); - all.Add(repo.Path, watcher); - repo.LastOpenTime = DateTime.Now.ToFileTime(); - - Opened?.Invoke(repo); } - /// - /// 停止指定的监视器 - /// - /// - public static void Close(string repoPath) { - if (!all.ContainsKey(repoPath)) return; - all[repoPath].Stop(); - all.Remove(repoPath); + public void MarkWorkingCopyRefreshed() { + _updateWC = 0; } - /// - /// 取得一个仓库的监视器 - /// - /// - /// - public static Watcher Get(string repoPath) { - if (all.ContainsKey(repoPath)) return all[repoPath]; - return null; + public void Dispose() { + _repoWatcher.EnableRaisingEvents = false; + _repoWatcher.Created -= OnRepositoryChanged; + _repoWatcher.Renamed -= OnRepositoryChanged; + _repoWatcher.Changed -= OnRepositoryChanged; + _repoWatcher.Deleted -= OnRepositoryChanged; + _repoWatcher.Dispose(); + _repoWatcher = null; + + _wcWatcher.EnableRaisingEvents = false; + _wcWatcher.Created -= OnWorkingCopyChanged; + _wcWatcher.Renamed -= OnWorkingCopyChanged; + _wcWatcher.Changed -= OnWorkingCopyChanged; + _wcWatcher.Deleted -= OnWorkingCopyChanged; + _wcWatcher.Dispose(); + _wcWatcher = null; + + _timer.Dispose(); + _timer = null; } - /// - /// 暂停或启用监听 - /// - /// - /// - public static void SetEnabled(string repoPath, bool enabled) { - if (all.ContainsKey(repoPath)) { - var watcher = all[repoPath]; - if (enabled) { - if (watcher.lockCount > 0) watcher.lockCount--; + private void Tick(object sender) { + if (_lockCount > 0) return; + + var now = DateTime.Now.ToFileTime(); + if (_updateBranch > 0 && now > _updateBranch) { + _updateBranch = 0; + _updateWC = 0; + + if (_updateTags > 0) { + _updateTags = 0; + Task.Run(() => { + _repo.RefreshTags(); + _repo.RefreshBranches(); + _repo.RefreshCommits(); + }); } else { - watcher.lockCount++; + Task.Run(() => { + _repo.RefreshBranches(); + _repo.RefreshCommits(); + }); } + + Task.Run(_repo.RefreshWorkingCopyChanges); } - } - /// - /// 通知仓库显示名变化 - /// - /// - public static void NotifyDisplayNameChanged(Repository repo) { - DisplayNameChanged?.Invoke(repo.Path, repo.Name); - } + if (_updateWC > 0 && now > _updateWC) { + _updateWC = 0; + Task.Run(_repo.RefreshWorkingCopyChanges); + } - /// - /// 通知仓库标签变化 - /// - /// - public static void NotifyBookmarkChanged(Repository repo) { - BookmarkChanged?.Invoke(repo.Path, repo.Bookmark); - } + if (_updateSubmodules > 0 && now > _updateSubmodules) { + _updateSubmodules = 0; + _repo.RefreshSubmodules(); + } - /// - /// 跳转到指定的提交 - /// - /// - public void NavigateTo(string commit) { - Navigate?.Invoke(commit); - } + if (_updateStashes > 0 && now > _updateStashes) { + _updateStashes = 0; + _repo.RefreshStashes(); + } - /// - /// 仅强制更新本地变化 - /// - public void RefreshWC() { - updateWC = 0; - WorkingCopyChanged?.Invoke(); - } - - /// - /// 通知更新子树列表 - /// - public void RefreshSubTrees() { - SubTreeChanged?.Invoke(); - } - - private void Start(string repo, string gitDir) { - wcWatcher = new FileSystemWatcher(); - wcWatcher.Path = repo; - wcWatcher.Filter = "*"; - wcWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName | NotifyFilters.Size | NotifyFilters.CreationTime; - wcWatcher.IncludeSubdirectories = true; - wcWatcher.Created += OnWorkingCopyChanged; - wcWatcher.Renamed += OnWorkingCopyChanged; - wcWatcher.Changed += OnWorkingCopyChanged; - wcWatcher.Deleted += OnWorkingCopyChanged; - wcWatcher.EnableRaisingEvents = true; - - repoWatcher = new FileSystemWatcher(); - repoWatcher.Path = gitDir; - repoWatcher.Filter = "*"; - repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName; - repoWatcher.IncludeSubdirectories = true; - repoWatcher.Created += OnRepositoryChanged; - repoWatcher.Renamed += OnRepositoryChanged; - repoWatcher.Changed += OnRepositoryChanged; - repoWatcher.Deleted += OnRepositoryChanged; - repoWatcher.EnableRaisingEvents = true; - - timer = new Timer(Tick, null, 100, 100); - } - - private void Stop() { - repoWatcher.EnableRaisingEvents = false; - repoWatcher.Dispose(); - repoWatcher = null; - - wcWatcher.EnableRaisingEvents = false; - wcWatcher.Dispose(); - wcWatcher = null; - - timer.Dispose(); - timer = null; - - Navigate = null; - WorkingCopyChanged = null; - BranchChanged = null; - TagChanged = null; - StashChanged = null; - SubmoduleChanged = null; - SubTreeChanged = null; + if (_updateTags > 0 && now > _updateTags) { + _updateTags = 0; + _repo.RefreshTags(); + _repo.RefreshCommits(); + } } private void OnRepositoryChanged(object o, FileSystemEventArgs e) { if (string.IsNullOrEmpty(e.Name)) return; - if (e.Name.StartsWith("modules", StringComparison.Ordinal)) { - updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); - } else if (e.Name.StartsWith("refs\\tags", StringComparison.Ordinal)) { - updateTags = DateTime.Now.AddSeconds(.5).ToFileTime(); - } else if (e.Name.StartsWith("refs\\stash", StringComparison.Ordinal)) { - updateStashes = DateTime.Now.AddSeconds(.5).ToFileTime(); - } else if (e.Name.Equals("HEAD", StringComparison.Ordinal) || - e.Name.StartsWith("refs\\heads\\", StringComparison.Ordinal) || - e.Name.StartsWith("refs\\remotes\\", StringComparison.Ordinal) || - e.Name.StartsWith("worktrees\\")) { - updateBranch = DateTime.Now.AddSeconds(.5).ToFileTime(); - } else if (e.Name.StartsWith("objects\\", StringComparison.Ordinal) || e.Name.Equals("index", StringComparison.Ordinal)) { - updateWC = DateTime.Now.AddSeconds(.5).ToFileTime(); + var name = e.Name.Replace("\\", "/"); + if (name.StartsWith("modules", StringComparison.Ordinal)) { + _updateSubmodules = DateTime.Now.AddSeconds(1).ToFileTime(); + } else if (name.StartsWith("refs/tags", StringComparison.Ordinal)) { + _updateTags = DateTime.Now.AddSeconds(.5).ToFileTime(); + } else if (name.StartsWith("refs/stash", StringComparison.Ordinal)) { + _updateStashes = DateTime.Now.AddSeconds(.5).ToFileTime(); + } else if (name.Equals("HEAD", StringComparison.Ordinal) || + name.StartsWith("refs/heads/", StringComparison.Ordinal) || + name.StartsWith("refs/remotes/", StringComparison.Ordinal) || + name.StartsWith("worktrees/")) { + _updateBranch = DateTime.Now.AddSeconds(.5).ToFileTime(); + } else if (name.StartsWith("objects/", StringComparison.Ordinal) || name.Equals("index", StringComparison.Ordinal)) { + _updateWC = DateTime.Now.AddSeconds(.5).ToFileTime(); } } private void OnWorkingCopyChanged(object o, FileSystemEventArgs e) { if (string.IsNullOrEmpty(e.Name)) return; - if (e.Name == ".git" || e.Name.StartsWith(".git\\", StringComparison.Ordinal)) return; - updateWC = DateTime.Now.AddSeconds(1).ToFileTime(); + var name = e.Name.Replace("\\", "/"); + if (name == ".git" || name.StartsWith(".git/", StringComparison.Ordinal)) return; + if (_updateWC == 0) _updateWC = DateTime.Now.AddSeconds(1).ToFileTime(); } - private void Tick(object sender) { - if (lockCount > 0) return; - - var now = DateTime.Now.ToFileTime(); - if (updateBranch > 0 && now > updateBranch) { - BranchChanged?.Invoke(); - WorkingCopyChanged?.Invoke(); - updateBranch = 0; - updateWC = 0; - } - - if (updateWC > 0 && now > updateWC) { - WorkingCopyChanged?.Invoke(); - updateWC = 0; - } - - if (updateSubmodules > 0 && now > updateSubmodules) { - SubmoduleChanged?.Invoke(); - updateSubmodules = 0; - } - - if (updateStashes > 0 && now > updateStashes) { - StashChanged?.Invoke(); - updateStashes = 0; - } - - if (updateTags > 0 && now > updateTags) { - TagChanged?.Invoke(); - updateTags = 0; - } - } - - #region PRIVATES - private static Dictionary all = new Dictionary(); - - private FileSystemWatcher repoWatcher = null; - private FileSystemWatcher wcWatcher = null; - private Timer timer = null; - private int lockCount = 0; - private long updateWC = 0; - private long updateBranch = 0; - private long updateSubmodules = 0; - private long updateStashes = 0; - private long updateTags = 0; - #endregion + private IRepository _repo = null; + private FileSystemWatcher _repoWatcher = null; + private FileSystemWatcher _wcWatcher = null; + private Timer _timer = null; + private int _lockCount = 0; + private long _updateWC = 0; + private long _updateBranch = 0; + private long _updateSubmodules = 0; + private long _updateStashes = 0; + private long _updateTags = 0; } } diff --git a/src/Models/WhitespaceOption.cs b/src/Models/WhitespaceOption.cs deleted file mode 100644 index 9e70437b..00000000 --- a/src/Models/WhitespaceOption.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; - -namespace SourceGit.Models { - /// - /// 应用补丁时空白字符的处理方式 - /// - public class WhitespaceOption { - public string Name { get; set; } - public string Desc { get; set; } - public string Arg { get; set; } - - public static List Supported = new List() { - new WhitespaceOption("Apply.NoWarn", "Apply.NoWarn.Desc", "nowarn"), - new WhitespaceOption("Apply.Warn", "Apply.Warn.Desc", "warn"), - new WhitespaceOption("Apply.Error", "Apply.Error.Desc", "error"), - new WhitespaceOption("Apply.ErrorAll", "Apply.ErrorAll.Desc", "error-all") - }; - - public WhitespaceOption(string n, string d, string a) { - Name = App.Text(n); - Desc = App.Text(d); - Arg = a; - } - } -} diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs new file mode 100644 index 00000000..0dc73802 --- /dev/null +++ b/src/Native/MacOS.cs @@ -0,0 +1,45 @@ +using System.Diagnostics; +using System.IO; +using System.Runtime.Versioning; + +namespace SourceGit.Native { + [SupportedOSPlatform("macOS")] + internal class MacOS : OS.IBackend { + public string FindGitInstallDir() { + if (File.Exists("/usr/bin/git")) return "/usr/bin/git"; + return string.Empty; + } + + public string FindVSCode() { + if (File.Exists("/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code")) { + return "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"; + } + + return string.Empty; + } + + public void OpenBrowser(string url) { + Process.Start("open", url); + } + + public void OpenInFileManager(string path, bool select) { + if (Directory.Exists(path)) { + Process.Start("open", path); + } else if (File.Exists(path)) { + Process.Start("open", $"\"{path}\" -a Finder"); + } + } + + public void OpenTerminal(string workdir) { + Process.Start(new ProcessStartInfo() { + WorkingDirectory = workdir, + FileName = "/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal", + UseShellExecute = false, + }); + } + + public void OpenWithDefaultEditor(string file) { + Process.Start("open", file); + } + } +} diff --git a/src/Native/OS.cs b/src/Native/OS.cs new file mode 100644 index 00000000..f21558a4 --- /dev/null +++ b/src/Native/OS.cs @@ -0,0 +1,79 @@ +using System; +using System.Diagnostics; +using System.IO; + +namespace SourceGit.Native { + public static class OS { + public interface IBackend { + string FindGitInstallDir(); + string FindVSCode(); + + void OpenTerminal(string workdir); + void OpenInFileManager(string path, bool select); + void OpenBrowser(string url); + void OpenWithDefaultEditor(string file); + } + + public static string GitInstallDir { + get; + set; + } + + public static string GitExecutableFile { + get => Path.Combine(GitInstallDir, "bin", OperatingSystem.IsWindows() ? "git.exe" : "git"); + } + + public static string VSCodeExecutableFile { + get; + set; + } + + static OS() { + if (OperatingSystem.IsMacOS()) { + _backend = new MacOS(); + VSCodeExecutableFile = _backend.FindVSCode(); + } else if (OperatingSystem.IsWindows()) { + _backend = new Windows(); + VSCodeExecutableFile = _backend.FindVSCode(); + } else { + throw new Exception("Platform unsupported!!!"); + } + } + + public static string FindGitInstallDir() { + return _backend?.FindGitInstallDir(); + } + + public static void OpenInFileManager(string path, bool select = false) { + _backend?.OpenInFileManager(path, select); + } + + public static void OpenBrowser(string url) { + _backend?.OpenBrowser(url); + } + + public static void OpenTerminal(string workdir) { + _backend?.OpenTerminal(workdir); + } + + public static void OpenWithDefaultEditor(string file) { + _backend?.OpenWithDefaultEditor(file); + } + + public static void OpenInVSCode(string repo) { + if (string.IsNullOrEmpty(VSCodeExecutableFile)) { + App.RaiseException(repo, "Visual Studio Code can NOT be found in your system!!!"); + return; + } + + Process.Start(new ProcessStartInfo() { + WorkingDirectory = repo, + FileName = VSCodeExecutableFile, + Arguments = $"\"{repo}\"", + UseShellExecute = false, + }); + } + + private static IBackend _backend = null; + } +} diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs new file mode 100644 index 00000000..b4973baa --- /dev/null +++ b/src/Native/Windows.cs @@ -0,0 +1,105 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; +using System.Text; + +namespace SourceGit.Native { + [SupportedOSPlatform("windows")] + internal class Windows : OS.IBackend { + [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)] + private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs); + + public string FindGitInstallDir() { + var reg = Microsoft.Win32.RegistryKey.OpenBaseKey( + Microsoft.Win32.RegistryHive.LocalMachine, + Microsoft.Win32.RegistryView.Registry64); + + var git = reg.OpenSubKey("SOFTWARE\\GitForWindows"); + if (git != null) { + return git.GetValue("InstallPath") as string; + } + + var builder = new StringBuilder("git.exe", 259); + if (!PathFindOnPath(builder, null)) { + return null; + } + + var exePath = builder.ToString(); + if (string.IsNullOrEmpty(exePath)) return null; + + var binDir = Path.GetDirectoryName(exePath); + var bashPath = Path.Combine(binDir, "bash.exe"); + if (File.Exists(bashPath)) return Path.GetDirectoryName(binDir); + + binDir = Path.Combine(Path.GetDirectoryName(binDir), "bin"); + bashPath = Path.Combine(binDir, "bash.exe"); + if (File.Exists(bashPath)) return Path.GetDirectoryName(binDir); + + return null; + } + + public string FindVSCode() { + var root = Microsoft.Win32.RegistryKey.OpenBaseKey( + Microsoft.Win32.RegistryHive.LocalMachine, + Environment.Is64BitOperatingSystem ? Microsoft.Win32.RegistryView.Registry64 : Microsoft.Win32.RegistryView.Registry32); + + var vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1"); + if (vscode != null) { + return vscode.GetValue("DisplayIcon") as string; + } + + vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1"); + if (vscode != null) { + return vscode.GetValue("DisplayIcon") as string; + } + + vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1"); + if (vscode != null) { + return vscode.GetValue("DisplayIcon") as string; + } + + vscode = root.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1"); + if (vscode != null) { + return vscode.GetValue("DisplayIcon") as string; + } + + return string.Empty; + } + + public void OpenBrowser(string url) { + var info = new ProcessStartInfo("cmd", $"/c start {url}"); + info.CreateNoWindow = true; + Process.Start(info); + } + + public void OpenTerminal(string workdir) { + var bash = Path.Combine(ViewModels.Preference.Instance.GitInstallDir, "bin", "bash.exe"); + if (!File.Exists(bash)) { + App.RaiseException("", $"Can NOT found bash.exe under '{ViewModels.Preference.Instance.GitInstallDir}'"); + return; + } + + var startInfo = new ProcessStartInfo(); + startInfo.UseShellExecute = true; + startInfo.FileName = bash; + if (!string.IsNullOrEmpty(workdir) && Path.Exists(workdir)) startInfo.WorkingDirectory = workdir; + Process.Start(startInfo); + } + + public void OpenInFileManager(string path, bool select) { + if (select) { + Process.Start("explorer", $"/select,\"{path}\""); + } else { + Process.Start("explorer", path); + } + } + + public void OpenWithDefaultEditor(string file) { + var info = new ProcessStartInfo("cmd", $"/c start {file}"); + info.CreateNoWindow = true; + Process.Start(info); + } + } +} diff --git a/src/Resources/Controls.xaml b/src/Resources/Controls.xaml deleted file mode 100644 index 30a338bc..00000000 --- a/src/Resources/Controls.xaml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Converters.xaml b/src/Resources/Converters.xaml deleted file mode 100644 index ef9b7eeb..00000000 --- a/src/Resources/Converters.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Fonts.axaml b/src/Resources/Fonts.axaml new file mode 100644 index 00000000..29681db5 --- /dev/null +++ b/src/Resources/Fonts.axaml @@ -0,0 +1,6 @@ + + avares://SourceGit/Resources/Fonts/JetBrainsMono-Regular.ttf#JetBrains Mono + avares://SourceGit/Resources/Fonts/JetBrainsMono-Bold.ttf#JetBrains Mono + avares://SourceGit/Resources/Fonts/JetBrainsMono-Italic.ttf#JetBrains Mono + diff --git a/src/Resources/Fonts/JetBrainsMono-Bold.ttf b/src/Resources/Fonts/JetBrainsMono-Bold.ttf new file mode 100644 index 00000000..8c93043d Binary files /dev/null and b/src/Resources/Fonts/JetBrainsMono-Bold.ttf differ diff --git a/src/Resources/Fonts/JetBrainsMono-Italic.ttf b/src/Resources/Fonts/JetBrainsMono-Italic.ttf new file mode 100644 index 00000000..ccc9d6a5 Binary files /dev/null and b/src/Resources/Fonts/JetBrainsMono-Italic.ttf differ diff --git a/src/Resources/Fonts/JetBrainsMono-Regular.ttf b/src/Resources/Fonts/JetBrainsMono-Regular.ttf new file mode 100644 index 00000000..dff66cc5 Binary files /dev/null and b/src/Resources/Fonts/JetBrainsMono-Regular.ttf differ diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml new file mode 100644 index 00000000..c41ec185 --- /dev/null +++ b/src/Resources/Icons.axaml @@ -0,0 +1,84 @@ + + M0 0M1024 1024 M960 544H64a32 32 0 1 1 0-64h896a32 32 0 1 1 0 64 + M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z + M256 128l0 192L64 320l0 576 704 0 0-192 192 0L960 128 256 128zM704 832 128 832 128 384l576 0L704 832zM896 640l-128 0L768 320 320 320 320 192l576 0L896 640z + M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z + M1024 750v110c0 50-41 91-91 91h-841A92 92 0 010 859v-110C0 699 41 658 91 658h841c50 0 91 41 91 91z + M0 4 0 20 16 20 0 4M4 0 20 0 20 16 4 0z + M851 755q0 23-16 39l-78 78q-16 16-39 16t-39-16l-168-168-168 168q-16 16-39 16t-39-16l-78-78q-16-16-16-39t16-39l168-168-168-168q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 168 168-168q16-16 39-16t39 16l78 78q16 16 16 39t-16 39l-168 168 168 168q16 16 16 39z + M30 0 30 30 0 15z + M0 0 0 30 30 15z + M512 945c-238 0-433-195-433-433S274 79 512 79c238 0 433 195 433 433S750 945 512 945M512 0C228 0 0 228 0 512s228 512 512 512 512-228 512-512-228-512-512-512zM752 477H364l128-128a38 38 0 000-55 38 38 0 00-55 0l-185 183a55 55 0 00-16 39c0 16 6 30 16 39l185 185a39 39 0 0028 12 34 34 0 0028-14 38 38 0 000-55l-128-128h386c22 0 41-18 41-39a39 39 0 00-39-39 + M1231 0v372H120V0zM1352 484v56H0v-56zM1147 939H205V737h942v203M1231 1024V652H120V1024z + M576 832C576 867 547 896 512 896 477 896 448 867 448 832 448 797 477 768 512 768 547 768 576 797 576 832ZM512 256C477 256 448 285 448 320L448 640C448 675 477 704 512 704 547 704 576 675 576 640L576 320C576 285 547 256 512 256ZM1024 896C1024 967 967 1024 896 1024L128 1024C57 1024 0 967 0 896 0 875 5 855 14 837L14 837 398 69 398 69C420 28 462 0 512 0 562 0 604 28 626 69L1008 835C1018 853 1024 874 1024 896ZM960 896C960 885 957 875 952 865L952 864 951 863 569 98C557 77 536 64 512 64 488 64 466 77 455 99L452 105 92 825 93 825 71 867C66 876 64 886 64 896 64 931 93 960 128 960L896 960C931 960 960 931 960 896Z + M352 64h320L960 352v320L672 960h-320L64 672v-320L352 64zm161 363L344 256 260 341 429 512l-169 171L344 768 513 597 682 768l85-85L598 512l169-171L682 256 513 427z + m186 532 287 0 0 287c0 11 9 20 20 20s20-9 20-20l0-287 287 0c11 0 20-9 20-20s-9-20-20-20l-287 0 0-287c0-11-9-20-20-20s-20 9-20 20l0 287-287 0c-11 0-20 9-20 20s9 20 20 20z + M716.3 383.1c0 38.4-6.5 76-19.4 111.8l-10.7 29.7 229.6 229.5c44.5 44.6 44.5 117.1 0 161.6a113.6 113.6 0 01-80.8 33.5a113.6 113.6 0 01-80.8-33.5L529 694l-32 13a331.6 331.6 0 01-111.9 19.4A333.5 333.5 0 0150 383.1c0-39 6.8-77.2 20-113.6L285 482l194-195-214-210A331 331 0 01383.1 50A333.5 333.5 0 01716.3 383.1zM231.6 31.6l-22.9 9.9a22.2 22.2 0 00-5.9 4.2a19.5 19.5 0 000 27.5l215 215.2L288.4 417.8 77.8 207.1a26 26 0 00-17.2-7.1a22.8 22.8 0 00-21.5 15a400.5 400.5 0 00-7.5 16.6A381.6 381.6 0 000 384c0 211.7 172.2 384 384 384c44.3 0 87.6-7.5 129-22.3L743.1 975.8A163.5 163.5 0 00859.5 1024c43.9 0 85.3-17.1 116.4-48.2a164.8 164.8 0 000-233L745.5 513C760.5 471.5 768 428 768 384C768 172 596 0 384 0c-53 0-104 10.5-152.5 31.5z + M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z + M512 0C229 0 0 229 0 512s229 512 512 512 512-229 512-512S795 0 512 0zM512 928c-230 0-416-186-416-416S282 96 512 96s416 186 416 416S742 928 512 928zM538 343c47 0 83-38 83-78 0-32-21-61-62-61-55 0-82 45-82 77C475 320 498 343 538 343zM533 729c-8 0-11-10-3-40l43-166c16-61 11-100-22-100-39 0-131 40-211 108l16 27c25-17 68-35 78-35 8 0 7 10 0 36l-38 158c-23 89 1 110 34 110 33 0 118-30 196-110l-19-25C575 717 543 729 533 729z + M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z + M512 57c251 0 455 204 455 455S763 967 512 967 57 763 57 512 261 57 512 57zm181 274c-11-11-29-11-40 0L512 472 371 331c-11-11-29-11-40 0-11 11-11 29 0 40L471 512 331 653c-11 11-11 29 0 40 11 11 29 11 40 0l141-141 141 141c11 11 29 11 40 0 11-11 11-29 0-40L552 512l141-141c11-11 11-29 0-40z + M899 870l-53-306H864c14 0 26-12 26-26V346c0-14-12-26-26-26H618V138c0-14-12-26-26-26H432c-14 0-26 12-26 26v182H160c-14 0-26 12-26 26v192c0 14 12 26 26 26h18l-53 306c0 2 0 3 0 4c0 14 12 26 26 26h723c2 0 3 0 4 0c14-2 24-16 21-30zM204 390h272V182h72v208h272v104H204V390zm468 440V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H416V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H203l45-260H776l45 260H672z + M960 146v91C960 318 759 384 512 384S64 318 64 238V146C64 66 265 0 512 0s448 66 448 146zM960 352v206C960 638 759 704 512 704S64 638 64 558V352c96 66 272 97 448 97S864 418 960 352zm0 320v206C960 958 759 1024 512 1024S64 958 64 878V672c96 66 272 97 448 97S864 738 960 672z + M800 928l-512 0 0-704 224 0 0 292 113-86 111 86 0-292 128 0 0 640c0 35-29 64-64 64zM625 388l-81 64 0-260 160 0 0 260-79-64zM192 160l0 32c0 18 14 32 32 32l32 0 0 704-32 0c-35 0-64-29-64-64l0-704c0-35 29-64 64-64l576 0c24 0 44 13 55 32l-631 0c-18 0-32 14-32 32z + M64 864h896V288h-396a64 64 0 01-57-35L460 160H64v704zm-64 32V128a32 32 0 0132-32h448a32 32 0 0129 18L564 224H992a32 32 0 0132 32v640a32 32 0 01-32 32H32a32 32 0 01-32-32z + M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z + M448 64l128 128h448v768H0V64z + M832 960l192-512H192L0 960zM128 384L0 960V128h288l128 128h416v128z + M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z + M683 85l213 213v598a42 42 0 01-42 42H170A43 43 0 01128 896V128C128 104 147 85 170 85H683zm-213 384H341v85h128v128h85v-128h128v-85h-128V341h-85v128z + M896 320c0-19-6-32-19-45l-192-192c-13-13-26-19-45-19H192c-38 0-64 26-64 64v768c0 38 26 64 64 64h640c38 0 64-26 64-64V320zm-256 384H384c-19 0-32-13-32-32s13-32 32-32h256c19 0 32 13 32 32s-13 32-32 32zm166-384H640V128l192 192h-26z + M416 832H128V128h384v192C512 355 541 384 576 384L768 384v32c0 19 13 32 32 32S832 435 832 416v-64c0-6 0-19-6-25l-256-256c-6-6-19-6-25-6H128A64 64 0 0064 128v704C64 867 93 896 129 896h288c19 0 32-13 32-32S435 832 416 832zM576 172 722 320H576V172zM736 512C614 512 512 614 512 736S614 960 736 960s224-102 224-224S858 512 736 512zM576 736C576 646 646 576 736 576c32 0 58 6 83 26l-218 218c-19-26-26-51-26-83zm160 160c-32 0-64-13-96-32l224-224c19 26 32 58 32 96 0 90-70 160-160 160z + M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z + M1024 896v128H0V704h128v192h768V704h128v192zM576 555 811 320 896 405l-384 384-384-384L213 320 448 555V0h128v555z + M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z + M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z + M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z + M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z + M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z + M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z + M652 157a113 113 0 11156 161L731 395 572 236l80-80 1 1zM334 792v0H175v-159l358-358 159 159-358 358zM62 850h900v113H62v-113z + M853 256h-43v512h43c47 0 85-38 85-85v-341c0-47-38-85-85-85zM725 768V171h128V85h-341v85H640v85H171c-47 0-85 38-85 85v341c0 47 38 85 85 85h469V853h-128v85h341v-85H725v-86zm-469-171v-171h384v171H256z + M762 1024C876 818 895 504 448 514V768L64 384l384-384v248c535-14 595 472 314 776z + M854 307 611 73c-6-6-14-9-22-9H296c-4 0-8 4-8 8v56c0 4 4 8 8 8h277l219 211V824c0 4 4 8 8 8h56c4 0 8-4 8-8V330c0-9-4-17-10-23zM553 201c-6-6-14-9-23-9H192c-18 0-32 14-32 32v704c0 18 14 32 32 32h512c18 0 32-14 32-32V397c0-9-3-17-9-23L553 201zM568 753c0 4-3 7-8 7h-225c-4 0-8-3-8-7v-42c0-4 3-7 8-7h225c4 0 8 3 8 7v42zm0-220c0 4-3 7-8 7H476v85c0 4-3 7-7 7h-42c-4 0-7-3-7-7V540h-85c-4 0-8-3-8-7v-42c0-4 3-7 8-7H420v-85c0-4 3-7 7-7h42c4 0 7 3 7 7V484h85c4 0 8 3 8 7v42z + M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z + M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688 + M529 511c115 0 212 79 239 185h224a62 62 0 017 123l-7 0-224 0a247 247 0 01-479 0H65a62 62 0 01-7-123l7-0h224a247 247 0 01239-185zm0 124a124 124 0 100 247 124 124 0 000-247zm0-618c32 0 58 24 61 55l0 7V206c89 11 165 45 225 103a74 74 0 0122 45l0 9v87a62 62 0 01-123 7l-0-7v-65l-6-4c-43-33-97-51-163-53l-17-0c-74 0-133 18-180 54l-6 4v65a62 62 0 01-55 61l-7 0a62 62 0 01-61-55l-0-7V362c0-20 8-39 23-53 60-58 135-92 224-103V79c0-34 28-62 62-62z + M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z + M826 498 538 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L826 526c8-7 8-21 0-28zm-320 0L218 250c-11-9-26-1-26 14v496c0 15 16 23 26 14L506 526c4-4 6-9 6-14 0-5-2-10-6-14z + M512 939C465 939 427 900 427 853 427 806 465 768 512 768 559 768 597 806 597 853 597 900 559 939 512 939M555 85 555 555 747 363 807 423 512 719 217 423 277 363 469 555 469 85 555 85Z + M883 567l-128-128c-17-17-43-17-60 0l-128 128c-17 17-17 43 0 60 17 17 43 17 60 0l55-55V683c0 21-21 43-43 43H418c-13-38-43-64-77-77V375c51-17 85-64 85-119 0-73-60-128-128-128-73 0-128 55-128 128 0 55 34 102 85 119v269c-51 17-85 64-85 119 0 73 55 128 128 128 55 0 102-34 119-85H640c73 0 128-55 128-128v-111l55 55c9 9 17 13 30 13 13 0 21-4 30-13 17-13 17-43 0-55zM299 213c26 0 43 17 43 43 0 21-21 43-43 43-26 0-43-21-43-43 0-26 17-43 43-43zm0 597c-26 0-43-21-43-43 0-26 17-43 43-43s43 17 43 43c0 21-17 43-43 43zM725 384c-73 0-128-60-128-128 0-73 55-128 128-128s128 55 128 128c0 68-55 128-128 128zm0-171c-26 0-43 17-43 43s17 43 43 43 43-17 43-43-17-43-43-43z + M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z + M0 586l404 119 498-410-386 441-2 251 155-205 279 83L1170 37z + M128 256h192a64 64 0 110 128H128a64 64 0 110-128zm576 192h192a64 64 0 010 128h-192a64 64 0 010-128zm-576 192h192a64 64 0 010 128H128a64 64 0 010-128zm576 0h192a64 64 0 010 128h-192a64 64 0 010-128zm0-384h192a64 64 0 010 128h-192a64 64 0 010-128zM128 448h192a64 64 0 110 128H128a64 64 0 110-128zm384-320a64 64 0 0164 64v640a64 64 0 01-128 0V192a64 64 0 0164-64z + M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z + M715 254h-405l-58 57h520zm-492 86v201h578V340zm405 143h-29v-29H425v29h-29v-57h231v57zm-405 295h578V559H223zm174-133h231v57h-29v-29H425v29h-29v-57z + M869 145a145 145 0 10-289 0c0 56 33 107 83 131c-5 96-77 128-201 175c-52 20-110 42-160 74V276A144 144 0 00242 0a145 145 0 00-145 145c0 58 35 108 84 131v461a144 144 0 00-84 131a145 145 0 10289 0a144 144 0 00-84-131c5-95 77-128 201-175c122-46 274-103 280-287a145 145 0 0085-132zM242 61a83 83 0 110 167a83 83 0 010-167zm0 891a84 84 0 110-167a84 84 0 010 167zM724 228a84 84 0 110-167a84 84 0 010 167z + M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z + M902 479v-1c0-133-112-242-250-242c-106 0-196 64-232 154c-28-20-62-32-100-32c-76 0-140 49-160 116c-52 37-86 97-86 165c0 112 90 202 202 202h503c112 0 202-90 202-202c0-65-31-123-79-160z + M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z + M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z + M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z + M557.7 545.3 789.9 402.7c24-15 31.3-46.5 16.4-70.5c-14.8-23.8-46-31.2-70-16.7L506.5 456.6 277.1 315.4c-24.1-14.8-55.6-7.3-70.5 16.8c-14.8 24.1-7.3 55.6 16.8 70.5l231.8 142.6V819.1c0 28.3 22.9 51.2 51.2 51.2c28.3 0 51.2-22.9 51.2-51.2V545.3h.1zM506.5 0l443.4 256v511.9L506.5 1023.9 63.1 767.9v-511.9L506.5 0z + M170 470l0 84 86 0 0-84-86 0zM86 598l0-172 852 0 0 172-852 0zM256 298l0-84-86 0 0 84 86 0zM86 170l852 0 0 172-852 0 0-172zM170 726l0 84 86 0 0-84-86 0zM86 854l0-172 852 0 0 172-852 0z + M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z + M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z + M888.8 0H135.2c-32.3 0-58.9 26.1-58.9 58.9v906.2c0 32.3 26.1 58.9 58.9 58.9h753.2c32.3 0 58.9-26.1 58.9-58.9v-906.2c.5-32.8-26.1-58.9-58.4-58.9zm-164.9 176.6c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s24.6-55.8 55.8-55.8zm-212 0c30.7 0 55.8 25.1 55.8 55.8S542.7 288.3 512 288.3s-55.8-25.1-55.8-55.8S481.3 176.6 512 176.6zm-212 0c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s25.1-55.8 55.8-55.8zm208.9 606.2H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h223.7c24.6 0 44 20 44 44c0 24.1-19.5 44-44 44zm229.9-212H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h453.1c24.6 0 44 20 44 44c.5 24.1-19.5 44-43.5 44z + M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z + M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z + M1024 610v-224H640v48H256V224h128V0H0v224h128v752h512v48h384V800H640v48H256V562h384v48z + M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z + M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z + M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z + M170 831l343-342L855 831l105-105-448-448L64 726 170 831z + M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z + M599 425 599 657 425 832 425 425 192 192 832 192Z + M280 145l243 341 0-0 45 63-0 0 79 110a143 143 0 11-36 75l-88-123-92 126c1 4 1 9 1 13l0 5a143 143 0 11-36-95l82-113L221 188l60-43zm473 541a70 70 0 100 140 70 70 0 000-140zm-463 0a70 70 0 100 140 70 70 0 000-140zM772 145l59 43-232 319-45-63L772 145z + M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z + M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z + M293 122v244h439V146l171 175V829a73 73 0 01-73 73h-98V536H293v366H195a73 73 0 01-73-73V195a73 73 0 0173-73h98zm366 512v268H366V634h293zm-49 49h-195v73h195v-73zm49-561v171H366V122h293z + M520 168C291 168 95 311 16 512c79 201 275 344 504 344 229 0 425-143 504-344-79-201-275-344-504-344zm0 573c-126 0-229-103-229-229s103-229 229-229c126 0 229 103 229 229s-103 229-229 229zm0-367c-76 0-137 62-137 137s62 137 137 137S657 588 657 512s-62-137-137-137z + M734 128c-33-19-74-8-93 25l-41 70c-28-6-58-9-90-9-294 0-445 298-445 298s82 149 231 236l-31 54c-19 33-8 74 25 93 33 19 74 8 93-25L759 222C778 189 767 147 734 128zM305 512c0-115 93-208 207-208 14 0 27 1 40 4l-37 64c-1 0-2 0-2 0-77 0-140 63-140 140 0 26 7 51 20 71l-37 64C324 611 305 564 305 512zM771 301 700 423c13 27 20 57 20 89 0 110-84 200-192 208l-51 89c12 1 24 2 36 2 292 0 446-298 446-298S895 388 771 301z + M469 235V107h85v128h-85zm-162-94 85 85-60 60-85-85 60-60zm469 60-85 85-60-60 85-85 60 60zm-549 183A85 85 0 01302 341H722a85 85 0 0174 42l131 225A85 85 0 01939 652V832a85 85 0 01-85 85H171a85 85 0 01-85-85v-180a85 85 0 0112-43l131-225zM722 427H302l-100 171h255l10 29a59 59 0 002 5c2 4 5 9 9 14 8 9 18 17 34 17 16 0 26-7 34-17a72 72 0 0011-18l0-0 10-29h255l-100-171zM853 683H624a155 155 0 01-12 17C593 722 560 747 512 747c-48 0-81-25-99-47a155 155 0 01-12-17H171v149h683v-149z + M719 85 388 417l-209-165L87 299v427l92 47 210-164L720 939 939 850V171zM186 610V412l104 104zm526 55L514 512l198-153z + diff --git a/src/Resources/Icons.xaml b/src/Resources/Icons.xaml deleted file mode 100644 index 1c6470cc..00000000 --- a/src/Resources/Icons.xaml +++ /dev/null @@ -1,76 +0,0 @@ - - M557.7 545.3 789.9 402.7c24-15 31.3-46.5 16.4-70.5c-14.8-23.8-46-31.2-70-16.7L506.5 456.6 277.1 315.4c-24.1-14.8-55.6-7.3-70.5 16.8c-14.8 24.1-7.3 55.6 16.8 70.5l231.8 142.6V819.1c0 28.3 22.9 51.2 51.2 51.2c28.3 0 51.2-22.9 51.2-51.2V545.3h.1zM506.5 0l443.4 256v511.9L506.5 1023.9 63.1 767.9v-511.9L506.5 0z - M491 256h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V128H256V64c0-13-9-21-21-21h-171c-13 0-21 9-21 21v171c0 13 9 21 21 21H128v597h341v64c0 13 9 21 21 21h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V811H171v-299h299v64c0 13 9 21 21 21h469c13 0 21-9 21-21v-171c0-13-9-21-21-21h-469c-13 0-21 9-21 21V469H171V256h64c13 0 21-9 21-21V171h213v64c0 13 9 21 21 21z - M170 470l0 84 86 0 0-84-86 0zM86 598l0-172 852 0 0 172-852 0zM256 298l0-84-86 0 0 84 86 0zM86 170l852 0 0 172-852 0 0-172zM170 726l0 84 86 0 0-84-86 0zM86 854l0-172 852 0 0 172-852 0z - M853.3 960H170.7V64h469.3l213.3 213.3zM821.3 298.7H618.7V96z - M888.8 0H135.2c-32.3 0-58.9 26.1-58.9 58.9v906.2c0 32.3 26.1 58.9 58.9 58.9h753.2c32.3 0 58.9-26.1 58.9-58.9v-906.2c.5-32.8-26.1-58.9-58.4-58.9zm-164.9 176.6c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s24.6-55.8 55.8-55.8zm-212 0c30.7 0 55.8 25.1 55.8 55.8S542.7 288.3 512 288.3s-55.8-25.1-55.8-55.8S481.3 176.6 512 176.6zm-212 0c30.7 0 55.8 25.1 55.8 55.8s-25.1 55.8-55.8 55.8s-55.8-25.1-55.8-55.8s25.1-55.8 55.8-55.8zm208.9 606.2H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h223.7c24.6 0 44 20 44 44c0 24.1-19.5 44-44 44zm229.9-212H285.2c-24.6 0-44-20-44-44c0-24.6 20-44 44-44h453.1c24.6 0 44 20 44 44c.5 24.1-19.5 44-43.5 44z - m186 532 287 0 0 287c0 11 9 20 20 20s20-9 20-20l0-287 287 0c11 0 20-9 20-20s-9-20-20-20l-287 0 0-287c0-11-9-20-20-20s-20 9-20 20l0 287-287 0c-11 0-20 9-20 20s9 20 20 20z - M682.7 42.7H85.3v682.7h85.3V128h512V42.7zM256 213.3l4.5 768H896V213.3H256zm554.7 682.7H341.3V298.7h469.3v597.3z - M204 291c45-11 77-49 77-96c0-53-43-98-98-98c-53 0-98 45-98 98c0 47 34 87 77 96v91c0 13 9 21 21 21h236c2 38 32 68 70 68h372c41 0 73-32 73-73v-38c0-41-32-73-73-73h-370c-38 0-70 30-70 68H204V291zm258 74h2c0-15 13-30 30-30h372c15 0 30 13 30 30v38c0 15-13 30-30 30h-375c-15 0-30-13-30-30v-38zM183 250c-30 0-55-26-55-55s26-55 55-55s55 26 55 55s-26 55-55 55zM679 495c-134 0-244 109-244 244s109 244 244 244c134 0 244-109 244-244s-109-244-244-244zm159 268h-134v134h-50V764H521v-50h134v-134h50v134h134V764zM244 766H185c-13 0-23-11-23-23s11-23 23-23h59c13 0 23 11 23 23s-11 23-23 23zM368 766h-42c-9 0-17-8-17-17v-13c0-9 8-17 17-17h42c9 0 17 8 17 17v13c0 9-8 17-17 17zM183 766c-12 0-21-9-21-21V320c0-12 9-21 21-21c12 0 21 9 21 21v425c0 12-10 21-21 21z - M785 898H341c-58 0-102-44-102-102v-188c0-10 7-17 17-17s17 7 17 17v188c0 38 31 68 68 68h444c38 0 68-31 68-68v-444c0-38-31-68-68-68h-222c-10 0-17-10-17-17s7-17 17-17H785c58 0 102 44 102 102v444c0 55-44 102-102 102zM181 488h-17c-10 0-17-7-17-17s7-17 17-17h17c10 0 17 7 17 17s-10 17-17 17zM461 181c-10 0-17-10-17-17v-17c0-10 7-17 17-17s17 7 17 17v17c0 7-7 17-17 17zM375 625H283c-61 0-113-65-113-119v-68-3l-14-14c-14-14-20-31-20-48 0-17 7-34 20-44 10-10 27-17 41-17v-10c0-17 7-34 20-44 14-14 38-20 58-17 0-14 7-27 17-38 20-17 48-24 72-14 3-10 10-20 17-31 27-20 68-20 92 3l68 68c44 44 72 102 72 164 0 126-106 232-239 232zm-171-160v41c0 38 38 85 79 85H375c113 0 205-89 205-201 0-51-20-102-58-140l-68-68c-14-10-31-10-44 0-7 7-10 14-10 20s3 14 10 20c7 7 7 17 0 24-7 7-17 7-24 0l-24-20c-14-10-31-10-44 0-3 7-7 14-7 20s3 14 10 20l20 24c7 7 7 17 0 24-7 7-17 7-24 0l-34-31c-14-14-31-14-44-3-3 7-7 14-7 20s3 14 7 20L297 375c7 7 7 17 0 24-7 7-17 7-24 0l-48-48c-14-10-31-10-44 0-7 7-10 14-10 20s3 14 10 20l106 99c7 7 7 17 0 24-7 7-17 7-24 0L205 464z - - M205 500h614v60H205z - M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z - M256 128l0 192L64 320l0 576 704 0 0-192 192 0L960 128 256 128zM704 832 128 832 128 384l576 0L704 832zM896 640l-128 0L768 320 320 320 320 192l576 0L896 640z - M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z - M512 597m-1 0a1 1 0 103 0a1 1 0 10-3 0ZM810 393 732 315 448 600 293 444 214 522l156 156 78 78 362-362z - M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z - M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z - M352 64h320L960 352v320L672 960h-320L64 672v-320L352 64zm161 363L344 256 260 341 429 512l-169 171L344 768 513 597 682 768l85-85L598 512l169-171L682 256 513 427z - M899 870l-53-306H864c14 0 26-12 26-26V346c0-14-12-26-26-26H618V138c0-14-12-26-26-26H432c-14 0-26 12-26 26v182H160c-14 0-26 12-26 26v192c0 14 12 26 26 26h18l-53 306c0 2 0 3 0 4c0 14 12 26 26 26h723c2 0 3 0 4 0c14-2 24-16 21-30zM204 390h272V182h72v208h272v104H204V390zm468 440V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H416V674c0-4-4-8-8-8h-48c-4 0-8 4-8 8v156H203l45-260H776l45 260H672z - M512 64C265 64 64 265 64 512s201 448 448 448s448-201 448-448S759 64 512 64zm238 642-46 46L512 558 318 750l-46-46L467 512 274 318l46-46L512 467l194-194 46 46L558 512l193 194z - M797 829a49 49 0 1049 49 49 49 0 00-49-49zm147-114A49 49 0 10992 764a49 49 0 00-49-49zM928 861a49 49 0 1049 49A49 49 0 00928 861zm-5-586L992 205 851 64l-71 71a67 67 0 00-94 0l235 235a67 67 0 000-94zm-853 128a32 32 0 00-32 50 1291 1291 0 0075 112L288 552c20 0 25 21 8 37l-93 86a1282 1282 0 00120 114l100-32c19-6 28 15 14 34l-40 55c26 19 53 36 82 53a89 89 0 00115-20 1391 1391 0 00256-485l-188-188s-306 224-595 198z - - M0 33h1024v160H0zM0 432h1024v160H0zM0 831h1024v160H0z - M1024 610v-224H640v48H256V224h128V0H0v224h128v752h512v48h384V800H640v48H256V562h384v48z - M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z - M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z - M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z - M170 831l343-342L855 831l105-105-448-448L64 726 170 831z - M768 800V685L512 480 256 685V800l256-205L768 800zM512 339 768 544V429L512 224 256 429V544l256-205z - M1231 0v372H120V0zM1352 484v56H0v-56zM1147 939H205V737h942v203M1231 1024V652H120V1024z - M75 100 27 51 76 3z - M27 3 L 75 51 L 27 100z - - M520 168C291 168 95 311 16 512c79 201 275 344 504 344 229 0 425-143 504-344-79-201-275-344-504-344zm0 573c-126 0-229-103-229-229s103-229 229-229c126 0 229 103 229 229s-103 229-229 229zm0-367c-76 0-137 62-137 137s62 137 137 137S657 588 657 512s-62-137-137-137z - M734 128c-33-19-74-8-93 25l-41 70c-28-6-58-9-90-9-294 0-445 298-445 298s82 149 231 236l-31 54c-19 33-8 74 25 93 33 19 74 8 93-25L759 222C778 189 767 147 734 128zM305 512c0-115 93-208 207-208 14 0 27 1 40 4l-37 64c-1 0-2 0-2 0-77 0-140 63-140 140 0 26 7 51 20 71l-37 64C324 611 305 564 305 512zM771 301 700 423c13 27 20 57 20 89 0 110-84 200-192 208l-51 89c12 1 24 2 36 2 292 0 446-298 446-298S895 388 771 301z - - M808 195h-592v634h592V195zm-32 602h-528V227h528v570zM429 322h246v16H429zM358 355c14 0 27-11 27-27s-11-27-27-27-27 11-27 27 13 27 27 27zm0-37c6 0 11 5 11 11 0 6-5 11-11 11s-11-5-11-11c2-6 6-11 11-11zM429 443h246v16H429zM358 478c14 0 27-11 27-27s-11-27-27-27-27 11-27 27 13 27 27 27zm0-38c6 0 11 5 11 11 0 6-5 11-11 11s-11-5-11-11c2-6 6-11 11-11zM429 565h246v16H429zM358 600c14 0 27-11 27-27s-11-27-27-27-27 11-27 27 13 27 27 27zm0-38c6 0 11 5 11 11 0 6-5 11-11 11s-11-5-11-11c2-6 6-11 11-11zM429 686h246v16H429zM358 722c14 0 27-11 27-27s-11-27-27-27-27 11-27 27 13 27 27 27zm0-37c6 0 11 5 11 11 0 6-5 11-11 11s-11-5-11-11c2-6 6-11 11-11z - M716.3 383.1c0 38.4-6.5 76-19.4 111.8l-10.7 29.7 229.6 229.5c44.5 44.6 44.5 117.1 0 161.6a113.6 113.6 0 01-80.8 33.5a113.6 113.6 0 01-80.8-33.5L529 694l-32 13a331.6 331.6 0 01-111.9 19.4A333.5 333.5 0 0150 383.1c0-39 6.8-77.2 20-113.6L285 482l194-195-214-210A331 331 0 01383.1 50A333.5 333.5 0 01716.3 383.1zM231.6 31.6l-22.9 9.9a22.2 22.2 0 00-5.9 4.2a19.5 19.5 0 000 27.5l215 215.2L288.4 417.8 77.8 207.1a26 26 0 00-17.2-7.1a22.8 22.8 0 00-21.5 15a400.5 400.5 0 00-7.5 16.6A381.6 381.6 0 000 384c0 211.7 172.2 384 384 384c44.3 0 87.6-7.5 129-22.3L743.1 975.8A163.5 163.5 0 00859.5 1024c43.9 0 85.3-17.1 116.4-48.2a164.8 164.8 0 000-233L745.5 513C760.5 471.5 768 428 768 384C768 172 596 0 384 0c-53 0-104 10.5-152.5 31.5z - M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z - M296 912H120c-4.4 0-8-3.6-8-8V520c0-4.4 3.6-8 8-8h176c4.4 0 8 3.6 8 8v384c0 4.4-3.6 8-8 8zM600 912H424c-4.4 0-8-3.6-8-8V121c0-4.4 3.6-8 8-8h176c4.4 0 8 3.6 8 8v783c0 4.4-3.6 8-8 8zM904 912H728c-4.4 0-8-3.6-8-8V280c0-4.4 3.6-8 8-8h176c4.4 0 8 3.6 8 8v624c0 4.4-3.6 8-8 8z - M550 627h-81v-21a142 142 0 0113-64a198 198 0 0152-57a390 390 0 0047-42a56 56 0 0012-34a58 58 0 00-21-45a81 81 0 00-56-19a85 85 0 00-57 20a103 103 0 00-32 59l-82-10a136 136 0 0149-96A172 172 0 01512 276a178 178 0 01123 40a122 122 0 0145 94a103 103 0 01-17 56a366 366 0 01-71 72A136 136 0 00556 576a128 128 0 00-6 51zm-81 120v-89h89v89zM512 64a448 448 0 10448 448A448 448 0 00512 64zm0 832a384 384 0 010-768a389 389 0 01384 384a389 389 0 01-384 384z - M64 864h896V288h-396a64 64 0 01-57-35L460 160H64v704zm-64 32V128a32 32 0 0132-32h448a32 32 0 0129 18L564 224H992a32 32 0 0132 32v640a32 32 0 01-32 32H32a32 32 0 01-32-32z - M448 64l128 128h448v768H0V64z - M832 960l192-512H192L0 960zM128 384L0 960V128h288l128 128h416v128z - M959 320H960v640A64 64 0 01896 1024H192A64 64 0 01128 960V64A64 64 0 01192 0H640v321h320L959 320zM320 544c0 17 14 32 32 32h384A32 32 0 00768 544c0-17-14-32-32-32H352A32 32 0 00320 544zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32zm0 128c0 17 14 32 32 32h384a32 32 0 0032-32c0-17-14-32-32-32H352a32 32 0 00-32 32z - M854 307 611 73c-6-6-14-9-22-9H296c-4 0-8 4-8 8v56c0 4 4 8 8 8h277l219 211V824c0 4 4 8 8 8h56c4 0 8-4 8-8V330c0-9-4-17-10-23zM553 201c-6-6-14-9-23-9H192c-18 0-32 14-32 32v704c0 18 14 32 32 32h512c18 0 32-14 32-32V397c0-9-3-17-9-23L553 201zM568 753c0 4-3 7-8 7h-225c-4 0-8-3-8-7v-42c0-4 3-7 8-7h225c4 0 8 3 8 7v42zm0-220c0 4-3 7-8 7H476v85c0 4-3 7-7 7h-42c-4 0-7-3-7-7V540h-85c-4 0-8-3-8-7v-42c0-4 3-7 8-7H420v-85c0-4 3-7 7-7h42c4 0 7 3 7 7V484h85c4 0 8 3 8 7v42z - M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z - M599 425 599 657 425 832 425 425 192 192 832 192Z - M71 1024V0h661L953 219V1024H71zm808-731-220-219H145V951h735V293zM439 512h-220V219h220V512zm-74-219H292v146h74v-146zm0 512h74v73h-220v-73H292v-146H218V585h147v219zm294-366h74V512H512v-73h74v-146H512V219h147v219zm74 439H512V585h220v293zm-74-219h-74v146h74v-146z - - M1024 896v128H0V704h128v192h768V704h128v192zM576 555 811 320 896 405l-384 384-384-384L213 320 448 555V0h128v555z - M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z - M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z - M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z - M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z - M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z - - M796 471A292 292 0 00512 256a293 293 0 00-284 215H0v144h228A293 293 0 00512 832a291 291 0 00284-217H1024V471h-228M512 688A146 146 0 01366 544A145 145 0 01512 400c80 0 146 63 146 144A146 146 0 01512 688 - M0 586l404 119 498-410-386 441-2 251 155-205 279 83L1170 37z - M24 512A488 488 0 01512 24A488 488 0 011000 512A488 488 0 01512 1000A488 488 0 0124 512zm447-325v327L243 619l51 111 300-138V187H471z - M715 254h-405l-58 57h520zm-492 86v201h578V340zm405 143h-29v-29H425v29h-29v-57h231v57zm-405 295h578V559H223zm174-133h231v57h-29v-29H425v29h-29v-57z - M869 145a145 145 0 10-289 0c0 56 33 107 83 131c-5 96-77 128-201 175c-52 20-110 42-160 74V276A144 144 0 00242 0a145 145 0 00-145 145c0 58 35 108 84 131v461a144 144 0 00-84 131a145 145 0 10289 0a144 144 0 00-84-131c5-95 77-128 201-175c122-46 274-103 280-287a145 145 0 0085-132zM242 61a83 83 0 110 167a83 83 0 010-167zm0 891a84 84 0 110-167a84 84 0 010 167zM724 228a84 84 0 110-167a84 84 0 010 167z - M896 128h-64V64c0-35-29-64-64-64s-64 29-64 64v64h-64c-35 0-64 29-64 64s29 64 64 64h64v64c0 35 29 64 64 64s64-29 64-64V256h64c35 0 64-29 64-64s-29-64-64-64zm-204 307C673 481 628 512 576 512H448c-47 0-90 13-128 35V372C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64z - M902 479v-1c0-133-112-242-250-242c-106 0-196 64-232 154c-28-20-62-32-100-32c-76 0-140 49-160 116c-52 37-86 97-86 165c0 112 90 202 202 202h503c112 0 202-90 202-202c0-65-31-123-79-160z - M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z - M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z - M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z - - M800 928l-512 0 0-704 224 0 0 292 113-86 111 86 0-292 128 0 0 640c0 35-29 64-64 64zM625 388l-81 64 0-260 160 0 0 260-79-64zM192 160l0 32c0 18 14 32 32 32l32 0 0 704-32 0c-35 0-64-29-64-64l0-704c0-35 29-64 64-64l576 0c24 0 44 13 55 32l-631 0c-18 0-32 14-32 32z - M719 85 388 417l-209-165L87 299v427l92 47 210-164L720 939 939 850V171zM186 610V412l104 104zm526 55L514 512l198-153z - M426.7 554.7v-85.3h341.3v85.3h-341.3m0 256v-85.3h170.7v85.3h-170.7m0-512V213.3h512v85.3H426.7M256 725.3h106.7L213.3 874.7 64 725.3H170.7V298.7H64L213.3 149.3 362.7 298.7H256v426.7z - M854 170c-189-189-495-189-684 0s-189 495 0 684 495 189 684 0 187-495 0-684zM213 706c-89-137-74-325 48-444 122-122 307-137 444-48L213 706zm106 105 493-493c89 137 74 325-48 444-120 122-307 137-444 48z - M469 235V107h85v128h-85zm-162-94 85 85-60 60-85-85 60-60zm469 60-85 85-60-60 85-85 60 60zm-549 183A85 85 0 01302 341H722a85 85 0 0174 42l131 225A85 85 0 01939 652V832a85 85 0 01-85 85H171a85 85 0 01-85-85v-180a85 85 0 0112-43l131-225zM722 427H302l-100 171h255l10 29a59 59 0 002 5c2 4 5 9 9 14 8 9 18 17 34 17 16 0 26-7 34-17a72 72 0 0011-18l0-0 10-29h255l-100-171zM853 683H624a155 155 0 01-12 17C593 722 560 747 512 747c-48 0-81-25-99-47a155 155 0 01-12-17H171v149h683v-149z - \ No newline at end of file diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml new file mode 100644 index 00000000..69844221 --- /dev/null +++ b/src/Resources/Locales/en_US.axaml @@ -0,0 +1,523 @@ + + START + SURE + SAVE + CLOSE + CANCEL + Reveal in File Explorer + Save As ... + Save File to ... + Copy Path + Bytes + FILTER + Optional. + SELECT FOLDER + NOTICE + Open With ... + Running. Please wait ... + Warnning + + Copy + Paste + Cut + + Refresh + + Name : + URL : + Git Repository URL + + SSH Private Key : + Private SSH key store path + + About + Copyright © 2023-2024 sourcegit-scm + • Build with + • TextEditor from + • Monospace fonts come from + + Patch + Apply Patch + Patch File : + Select .patch file to apply + Whitespace : + Ignore whitespace changes + No Warn + Turns off the trailing whitespace warning + Warn + Outputs warnings for a few such errors, but applies + Error + Raise errors and refuses to apply the patch + Error All + Similar to 'error', but shows more + + Archive ... + Archive + Revision : + Save Archive To : + Select archive file path + + Blame + + SUBMODULES + Add Submodule + Relative Path : + Relative foler to store this module. + Fetch nested submodules + Open Submodule Repository + Copy Relative Path + Delete Submodule + + Checkout Branch + Target : + + Cherry-Pick This Commit + Cherry Pick + Commit : + Commit all changes + + Clone Remote Repository + Repository URL : + Parent Folder : + Local Name : + Repository name. Optional. + Extra Parameters : + Additional arguments to clone repository. Optional. + + INFORMATION + AUTHOR + COMMITTER + SHA + PARENTS + REFS + MESSAGE + CHANGED + CHANGES + Search Files ... + FILES + LFS File + Submodule + Tag + Tree + + Configure + User Name + User name for this repository + Email Address + Email address + HTTP Proxy + HTTP proxy used by this repository + + Create Branch + Create Local Branch + Based On : + New Branch Name : + Enter branch name. + Local Changes : + Stash & Reapply + Discard + Check out after created + + Create Tag + New Tag At : + Tag Name : + Recommanded format ：v1.0.0-alpha + Tag Message : + Optional. + + Open In File Browser + Open In Visual Studio Code + Open In Git Bash + Refresh + Search Commit (Ctrl+F) + Search Author/Committer/Message/SHA + Statistics + Cleanup(GC & Prune) + Run `gc` command and do `lfs prune` if LFS is installed. + Configure this repository + WORKSPACE + LOCAL BRANCHES + NEW BRANCH + REMOTES + ADD REMOTE + TAGS + NEW TAG + SUBMODULES + ADD SUBMODULE + UPDATE SUBMODULE + SUBTREES + ADD/LINK SUBTREE + RESOLVE + CONTINUE + ABORT + + GIT FLOW + Initialize Git-Flow + Production Branch : + Development Branch : + Feature : + Release : + Hotfix : + Feature Prefix : + Release Prefix : + Hotfix Prefix : + Version Tag Prefix : + Start Feature ... + Start Release ... + Start Hotfix ... + FLOW - Start Feature + FLOW - Start Release + FLOW - Start Hotfix + Enter name + FLOW - Finish Feature + FLOW - Finish Release + FLOW - Finish Hotfix + Target : + Keep branch + + Bookmark + Open + Explore in File Manager + + Push '{0}' + Discard all changes + Fast-Forward to '{0}' + Pull '{0}' + Pull '{0}' into '{1}' + Checkout '{0}' + Merge '{0}' into '{1}' + Rebase '{0}' on '{1}' + Git Flow - Finish '{0}' + Rename '{0}' + Delete '{0}' + Tracking ... + Copy Branch Name + Unset Upstream + + Fetch ... + Prune + Target : + Edit ... + Delete ... + Copy URL + + Reset '{0}' to Here + Rebase '{0}' to Here + Cherry-Pick This Commit + Reword + Squash Into Parent + Revert Commit + Save as Patch ... + Copy SHA + + Push '{0}' + Delete '{0}' + Copy Tag Name + + Apply + Pop + Drop + + Unstage + Stage... + Discard... + Stash... + Unstage {0} files + Stage {0} files... + Discard {0} files... + Stash {0} files... + Save As Patch... + Assume unchaged + + Delete Branch + Branch : + + Delete Remote + Remote : + + Delete Tag + Tag : + Delete from remote repositories + + Delete Submodule + Submodule Path ： + + Next Difference + Previous Difference + Toggle One-Side/Two-Sides + Open With Merge Tool + SELECT FILE TO VIEW CHANGES + NO CHANGES OR ONLY EOL CHANGES + BINARY DIFF + OLD + NEW + LFS OBJECT CHANGE + Copy + + Discard Changes + Changes : + You can't undo this action!!! + All local changes in working copy. + Total {0} changes will be discard + + Fetch + Fetch Remote Changes + Remote : + Fetch all remotes + Prune remote dead branches + + Fast-Forward (without checkout) + + File History + USE THIS VERSION + + CHANGE DISPLAY MODE + Show as Grid + Show as List + Show as Tree + + SELECT FOLDER + SELECTED : + + Histories + SEARCH SHA/SUBJECT/AUTHOR. PRESS ENTER TO SEARCH, ESC TO QUIT + CLEAR + Switch Curve/Polyline Graph Mode + Switch Horizontal/Vertical Layout + SELECTED {0} COMMITS + + Initialize Repository + Path : + Invalid repository detected. Run `git init` under this path? + + Source Git + Open Main Menu + ERROR + NOTICE + + Create New Page (Ctrl+T) + Repositories + Close Tab + Close Other Tabs + Close Tabs to the Right + Bookmark + Copy Repository Path + + Merge Branch + Source Branch : + Into : + Merge Option : + + Open Repository + Open In Git Bash + Clone Repository + Edit + Create Group + Create Sub-Group + Delete + Search Repositories ... + Sort + DRAG & DROP FOLDER SUPPORTED + + Edit Selected Group + Edit Selected Repository + Target : + New Name : + Bookmark : + + Confirm Deleting Group + Confirm Deleting Repository + Target : + + Pull + Pull (Fetch & Merge) + Remote : + Branch : + Into : + Use rebase instead of merge + Stash & reapply local changes + + Push + Push Changes To Remote + Local Branch : + Remote : + Remote Branch : + Push all tags + Force push + + Push Tag To Remote + Tag : + Remote : + + Rebase Current Branch + Rebase : + On : + Stash & reapply local changes + + Add Remote + Edit Remote + Name : + Remote name + Repository URL : + Remote git repository URL + + Rename Branch + Branch : + New Name : + Unique name for this branch + + Reset Current Branch To Revision + Current Branch : + Move To : + Reset Mode : + + Revert Commit + Commit : + Commit revert changes + + Preference + GENERAL + Language + Theme + History Commits + Restore windows + Use macOS style titlebar + GIT + Install Path + Git version + Default Clone Dir + User Name + Global git user name + User Email + Global git user email + Enable Auto CRLF + Fetch remotes automatically (need restart) + GPG SIGNING + Commit GPG signing + Install Path + Input path for installed gpg program + User Signing Key + User's gpg signing key + MERGE + Merger + Install Path + Input path for merge tool + Merge Command + Diff Command + + Stash + Stash Local Changes + Message : + Optional. Name of this stash + Include untracked files + + Stashes + STASHES + CHANGES + + Drop Stash + Drop : + + COMMIT : {0} -> {1} + + Changes + UNSTAGED + VIEW ASSUME UNCHANGED + STAGE + STAGE ALL + STAGED + UNSTAGE + UNSTAGE ALL + CONFLICTS DETECTED + USE THEIRS + USE MINE + OPEN MERGE + Enter commit message + MESSAGE HISTORIES + Amend + COMMIT + CTRL + Enter + COMMIT & PUSH + NO RECENT INPUT MESSAGES + RECENT INPUT MESSAGES + INCLUDE UNTRACKED FILES + + Conflict detected! Press 'Abort' to restore original HEAD + + Clear Stashes + You are trying to clear all stashes. Are you sure to continue? + + Reword Commit Message + On : + Message : + + Squash HEAD Into Parent + HEAD : + To : + Reword : + + Statistics + WEEK + MONTH + YEAR + Total Committers: {0} + Total Commits：{0} + COMMITTER + COMMITS + + FILES ASSUME UNCHANGED + REMOVE + NO FILES ASSUMED AS UNCHANGED + + SUN + MON + TUE + WED + THU + FRI + SAT + + Jan + Feb + Mar + Apr + May + Jun + Jul + Aug + Sep + Oct + Nov + Dec + + By Name + By Recently Opened + By Bookmark Color + + Git has NOT been configured. Please to go [Preference] and configure it first. + Path[{0}] not exists! + Can NOT locate bash.exe. Make sure bash.exe exists under the same folder with git.exe + BINARY FILE NOT SUPPORTED!!! + BLAME ON THIS FILE IS NOT SUPPORTED!!! + GIT_DIR for this repository NOT FOUND! + Initialize Git-flow failed! + Bad git-flow branch type! + EXISTS and FULL ACCESS CONTROL needed + Remote git URL not supported + Bad local repository name + Remote name can NOT be null + Bad name for remote. Regex: ^[\\w\\-\\.]+$ + Duplicated remote name! + Branch name can NOT be null + Bad name for branch. Regex: ^[\\w\\-/\\.]+$ + Duplicated branch name! + Commit message can NOT be empty + Invalid path for patch file + Invalid relative path + Invalid path for archive file + This field is required + You are removing repository '{0}'. Are you sure to continue? + Patch has been saved successfully! + diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml deleted file mode 100644 index 1575c486..00000000 --- a/src/Resources/Locales/en_US.xaml +++ /dev/null @@ -1,549 +0,0 @@ - - START - SURE - SAVE - CLOSE - CANCEL - CLICK TO GO - Reveal in File Explorer - Save As ... - Save File to ... - Copy Path - {0} Bytes - FILTER - Optional. - SELECT FOLDER - NOTICE - Open With ... - - URL : - Git Repository URL - Parent Folder : - Relative foler to store this module. Optional. - - SSH Private Key : - Private SSH key store path - - About - SourceGit - OPEN SOURCE GIT CLIENT - - Patch - Apply Patch - Patch File : - Select .patch file to apply - Whitespace : - Ignore whitespace changes - No Warn - Turns off the trailing whitespace warning - Warn - Outputs warnings for a few such errors, but applies - Error - Raise errors and refuses to apply the patch - Error All - Similar to 'error', but shows more - - Archive ... - Archive - Revision : - Save Archive To : - Select archive file path - - Blame - - SUBMODULES - Add Submodule - Fetch nested submodules - Open Submodule Repository - Copy Relative Path - Delete Submodule - - Cherry-Pick This Commit - Cherry Pick - Commit : - Commit all changes - - Clone Remote Repository - Repository URL : - Git Repository URL - Parent Folder : - Folder to contain this repository - Local Name : - Repository name. Optional. - Remote Name : - Remote name. Optional. - Extra Parameters : - Additional arguments to clone repository. Optional. - - INFORMATION - AUTHOR - COMMITTER - SHA - PARENTS - REFS - MESSAGE - CHANGED - CHANGES - Search Files ... - FILES - - Configure - User Name - User name for this repository - Email Address - Email address - HTTP Proxy - HTTP proxy used by this repository - - Create Branch - Create Local Branch - Based On : - New Branch Name : - Enter branch name. - Local Changes : - Stash & Reapply - Discard - Check out after created - Git do not hold any branch until you do first commit. - - Create Tag - New Tag At : - Tag Name : - Recommanded format ：v1.0.0-alpha - Tag Message : - Optional. - - Open In File Browser - Open In Visual Studio Code - Open In Git Bash - Refresh - Search Commit - Statistics - Cleanup(GC & Prune) - Configure this repository - WORKSPACE - LOCAL BRANCHES - NEW BRANCH - REMOTES - ADD REMOTE - TAGS - NEW TAG - SUBMODULES - ADD SUBMODULE - UPDATE SUBMODULE - SUBTREES - ADD/LINK SUBTREE - RESOLVE - CONTINUE - ABORT - - GIT FLOW - Initialize Git-Flow - Production Branch : - Development Branch : - Feature : - Release : - Hotfix : - Feature Prefix : - Release Prefix : - Hotfix Prefix : - Version Tag Prefix : - Start Feature ... - Start Release ... - Start Hotfix ... - GIT FLOW - Start Feature - GIT FLOW - Start Release - GIT FLOW - Start Hotfix - Enter name - GIT FLOW - Finish Feature - GIT FLOW - Finish Release - GIT FLOW - Finish Hotfix - {0} branch name is required. - {0} branch name contains invalid characters. - {0} prefix is required. - {0} contains invalid characters. - Development branch is same with production! - Keep branch - - Bookmark - Open - Open Container Folder - - Push '{0}' - Discard all changes - Fast-Forward to '{0}' - Pull '{0}' - Pull '{0}' into '{1}' - Checkout '{0}' - Merge '{0}' into '{1}' - Rebase '{0}' on '{1}' - Git Flow - Finish '{0}' - Rename '{0}' - Delete '{0}' - Tracking ... - Copy Branch Name - Unset Upstream - - Fetch ... - Prune - Edit ... - Delete ... - Copy URL - - Reset '{0}' to Here - Rebase '{0}' to Here - Cherry-Pick This Commit - Reword - Squash Into Parent - Revert Commit - Save as Patch ... - Copy Commit SHA - Copy Commit Info - - Push '{0}' - Delete '{0}' - Copy Tag Name - - Apply - Pop - Drop - - Unstage - Stage... - Discard... - Stash... - Unstage {0} files - Stage {0} files... - Discard {0} files... - Stash {0} files... - Save As Patch... - Assume unchaged - - Confirm To Delete Branch - Branch : - - Confirm To Delete Remote - Remote : - - Confirm To Delete Tag - Tag : - Delete from remote repositories - - Confirm To Delete Submodule - Submodule Path ： - - Next Difference - Previous Difference - Toggle One-Side/Two-Sides - Open With Merge Tool - SELECT FILE TO VIEW CHANGES - NO CHANGES OR ONLY EOL CHANGES - BINARY DIFF - OLD : - NEW : - LFS OBJECT CHANGE - Copy - - Confirm To Discard Changes - Changes : - You can't undo this action!!! - All local changes in working copy. - Total {0} changes will be discard - - Fetch - Fetch Remote Changes - Remote : - Fetch all remotes - Prune remote dead branches - - File History - USE THIS VERSION - - CHANGE DISPLAY MODE - Show as Grid - Show as List - Show as Tree - - SELECT FOLDER - SELECTED : - - Histories - SEARCH SHA/SUBJECT/AUTHOR. PRESS ENTER TO SEARCH, ESC TO QUIT - CLEAR - Switch Curve/Polyline Graph Mode - Switch Horizontal/Vertical Layout - SELECTED {0} COMMITS - - Initialize Repository - Path : - Invalid repository detected. Run `git init` under this path? - - Source Git - Open Main Menu - ERROR - - NEW PAGE - Repositories - WELCOME PAGE - Close Tab - Close Other Tabs - Close Tabs to the Right - Bookmark - Copy Path - - Merge Branch - Source Branch : - Into : - Merge Option : - - Open Repository - Open Terminal - Clone Repository - REPOSITORIES - Delete - Search Repositories ... - Sort - DRAG & DROP FOLDER HERE - Edit Display Name - Display Name : - - Pull - Pull (Fetch & Merge) - Remote : - Branch : - Into : - Use rebase instead of merge - Stash & reapply local changes - - Push - Push Changes To Remote - Local Branch : - Remote : - Remote Branch : - Push all tags - Force push - - Push Tag To Remote - Tag : - Remote : - - Rebase Current Branch - Rebase : - On : - Stash & reapply local changes - - Add Remote - Edit Remote - Name : - Remote name - Repository URL : - Remote git repository URL - - Rename Branch - Branch : - New Name : - Unique name for this branch - - Reset Current Branch To Revision - Current Branch : - Move To : - Reset Mode : - - Confirm To Revert Commit - Commit : - Commit revert changes - - Preference - GENERAL - Display Language - Window Font - Content Font - Use dark theme - Restore windows - Max History Commits - GIT - Install Path - Input path for git.exe - Git version - Default Clone Dir - Default path to clone repo into - User Name - Global git user name - User Email - Global git user email - Enable Auto CRLF - Fetch remotes automatically (need restart) - MERGE - Merger - Install Path - Input path for merge tool - Select Git Executable File - Select {0} Install Path - - Stash - Stash Local Changes - Message : - Optional. Name of this stash - Include untracked files - - Stashes - STASHES - CHANGES - - Confirm To Drop Stash - Drop : - - COMMIT : {0} -> {1} - - Changes - UNSTAGED - VIEW ASSUME UNCHANGED - STAGE - STAGE ALL - STAGED - UNSTAGE - UNSTAGE ALL - CONFLICTS DETECTED - USE THEIRS - USE MINE - OPEN MERGE - Enter commit message - MESSAGE HISTORIES - Amend - COMMIT - CTRL + Enter - COMMIT & PUSH - NO RECENT INPUT MESSAGES - RECENT INPUT MESSAGES - INCLUDE UNTRACKED FILES - - Cherry-Pick merge request detected! Press 'Abort' to restore original HEAD - Rebase merge request detected! Press 'Abort' to restore original HEAD - Revert merge request detected! Press 'Abort' to restore original HEAD - Merge request detected! Press 'Abort' to restore original HEAD - - NOTICE - Restart required to apply changes in preference. Restart now? - - Add/Link SubTree - Source URL : - Branch/Commit : - Local Relative Path : - Squash commits? - - Edit SubTree - Source URL : - Local Relative Path : - - Unlink SubTree - Local Relative Path : - This will only remove links. - - Pull Changes Of SubTree - Push Changes Of SubTree - Local Relative Path : - Remote : - Branch : - Squash commits? - - Edit ... - Unlink ... - Pull ... - Push ... - - HOTKEYS - KEY - DESCRIPTION - Create a new page - Close current active page - Switch to next page - Switch to page at given index - Toggle search bar if possible - Reload current repository if possible - Stage or unstage selected files - Close current popup panel - - Reword Commit Message - On : - Message : - - Squash HEAD Into Parent - HEAD : - To : - Reword : - - Statistics - WEEK - MONTH - YEAR - Total Committers: {0} - Total Commits：{0} - COMMITTER - COMMITS - - FILES ASSUME UNCHANGED - REMOVE - NO FILES ASSUMED AS UNCHANGED - - SUN - MON - TUE - WED - THU - FRI - SAT - - Jan - Feb - Mar - Apr - May - Jun - Jul - Aug - Sep - Oct - Nov - Dec - - By Name - By Recently Opened - By Bookmark Color - - GPG SIGNING - Commit GPG signing - Install Path - Input path for installed gpg program - User Signing Key - User's gpg signing key - - Git has NOT been configured. Please to go [Preference] and configure it first. - Path[{0}] not exists! - Can NOT locate bash.exe. Make sure bash.exe exists under the same folder with git.exe - BINARY FILE NOT SUPPORTED!!! - BLAME ON THIS FILE IS NOT SUPPORTED!!! - GIT_DIR for this repository NOT FOUND! - Initialize Git-flow failed! - Bad git-flow branch type! - EXISTS and FULL ACCESS CONTROL needed - Remote git URL not supported - Bad local repository name - Remote name can NOT be null - Bad name for remote. Regex: ^[\\w\\-\\.]+$ - Duplicated remote name! - Branch name can NOT be null - Bad name for branch. Regex: ^[\\w\\-/\\.]+$ - Duplicated branch name! - Tag name can NOT be null - Bad name for tag. Regex: ^[\\w\\-\\.]+$ - Duplicated tag name! - Commit message can NOT be empty - Invalid path for patch file - Invalid relative path - Invalid path for archive file - This field is required - You are removing repository '{0}'. Are you sure to continue? - You are trying to clear all stashes. Are you sure to continue? - Patch has been saved successfully! - \ No newline at end of file diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml new file mode 100644 index 00000000..b733a23d --- /dev/null +++ b/src/Resources/Locales/zh_CN.axaml @@ -0,0 +1,522 @@ + + 开 始 + 确 定 + 保 存 + 关闭 + 取 消 + 在文件浏览器中查看 + 另存为... + 复制路径 + 字节 + 过滤 + 选填 + 选择文件夹 + 系统提示 + 打开文件... + 执行操作中，请耐心等待... + 警告 + + 复制 + 粘贴 + 剪切 + + 重新加载 + + 名称 ： + 仓库地址 ： + 远程仓库地址 + + SSH密钥 ： + SSH密钥文件 + + 关于软件 + Copyright © 2023-2024 sourcegit-scm + • 使用的框架为 + • 文本编辑器使用 + • 等宽字体来自于 + + 补丁 + 应用补丁 + 补丁文件 ： + 选择补丁文件 + 空白符号处理 ： + 忽略空白符号 + 忽略 + 关闭所有警告 + 警告 + 应用补丁，输出关于空白符的警告 + 错误 + 输出错误，并终止应用补丁 + 更多错误 + 与【错误】级别相似，但输出内容更多 + + 存档 ... + 存档 + 指定的提交： + 存档文件路径： + 选择存档文件的存放路径 + + 逐行追溯 + + 子模块 + 添加子模块 + 相对仓库路径 ： + 本地存放的相对路径 + 拉取子孙模块 + 打开仓库 + 复制路径 + 删除子模块 + + 检出分支 + 目标分支 ： + + 挑选此提交 + 挑选提交 + 提交ID ： + 提交变化 + + 克隆远程仓库 + 远程仓库 ： + 父级目录 ： + 本地仓库名 ： + 本地仓库目录的名字，选填 + 额外参数 ： + 其他克隆参数，选填 + + 基本信息 + 修改者 + 提交者 + 提交指纹 + 父提交 + 相关引用 + 提交信息 + 变更列表 + 变更对比 + 查找文件... + 文件列表 + LFS文件 + 子模块 + 标签文件 + 子树 + + 仓库配置 + 用户名 + 应用于本仓库的用户名 + 电子邮箱 + 邮箱地址 + HTTP代理 + HTTP网络代理 + + 新建分支 + 创建本地分支 + 新分支基于 ： + 新分支名 ： + 填写分支名称 + 未提交更改 ： + 贮藏并自动恢复 + 忽略 + 完成后切换到新分支 + + 新建标签 + 标签位于 ： + 标签名 ： + 推荐格式 ：v1.0.0-alpha + 标签描述 ： + 选填 + + 在文件浏览器中打开 + 在Visual Studio Code中打开 + 在GIT终端中打开 + 重新加载 + 查找提交(Ctrl+F) + 支持搜索作者/提交者/主题/指纹 + 提交统计 + 清理本仓库(GC) + 本操作将执行`gc`，对于启用LFS的仓库也会执行`lfs prune` + 配置本仓库 + 工作区 + 本地分支 + 新建分支 + 远程列表 + 添加远程 + 标签列表 + 新建标签 + 子模块列表 + 添加子模块 + 更新子模块 + 子树列表 + 添加子树 + 解决冲突 + 下一步 + 终止冲突解决 + + GIT工作流 + 初始化GIT工作流 + 发布分支 ： + 开发分支 ： + 特性分支 ： + 版本分支 ： + 修复分支 ： + 特性分支名前缀 ： + 版本分支名前缀 ： + 修复分支名前缀 ： + 版本标签前缀 ： + 开始特性分支... + 开始版本分支... + 开始修复分支... + 开始特性分支 + 开始版本分支 + 开始修复分支 + 输入分支名 + 结束特性分支 + 结束版本分支 + 结束修复分支 + 目标分支 ： + 保留分支 + + 书签 + 打开 + 在浏览器中查看 + + 推送 '{0}' + 放弃所有更改 + 快进到 '{0}' + 拉回 '{0}' + 拉回 '{0}' 内容至 '{1}' + 检出 '{0}' + 合并 '{0}' 到 '{1}' + 变基 '{0}' 分支至 '{1}' + GIT工作流 - 完成 '{0}' + 重命名 '{0}' + 删除 '{0}' + 切换上游分支... + 复制分支名 + 取消追踪 + + 拉取更新 ... + 清理远程已删除分支 + 目标 ： + 编辑 ... + 删除 ... + 复制远程地址 + + 重置 '{0}' 到此处 + 变基 '{0}' 到此处 + 挑选此提交 + 编辑提交信息 + 合并此提交到上一个提交 + 回滚此提交 + 另存为补丁 ... + 复制提交指纹 + + 推送 '{0}' + 删除 '{0}' + 复制标签名 + + 应用 + 应用并删除 + 删除 + + 从暂存中移除 + 暂存... + 放弃更改... + 贮藏... + 从暂存中移除 {0} 个文件 + 暂存 {0} 个文件... + 放弃 {0} 个文件的更改... + 贮藏选中的 {0} 个文件... + 另存为补丁... + 不跟踪此文件的更改 + + 确定要删除此分支吗？ + 分支名 ： + + 确定要移除该远程吗？ + 远程名 ： + + 确定要移除该标签吗？ + 标签名 ： + 同时删除远程仓库中的此标签 + + 确定要移除该子模块吗？ + 子模块路径 ： + + 下一个差异 + 上一个差异 + 切换显示模式 + 使用外部合并工具查看 + 请选择需要对比的文件 + 没有变更或仅有换行符差异 + 二进制文件 + 原始大小 + 当前大小 + LFS对象变更 + 复制 + + 放弃更改确认 + 需要放弃的变更 ： + 本操作不支持回退，请确认后继续！！！ + 所有本地址未提交的修改 + 总计{0}项选中更改 + + 拉取 + 拉取远程仓库内容 + 远程仓库 ： + 拉取所有的远程仓库 + 自动清理远程已删除分支 + + 快进（无需Checkout） + + 文件历史 + 使用该版本 + + 切换变更显示模式 + 网格模式 + 列表模式 + 树形模式 + + 选择目录... + 当前选择 ： + + 历史记录 + 查询提交指纹、信息、作者。回车键开始，ESC键取消 + 清空 + 切换曲线/折线显示 + 切换横向/纵向显示 + 已选中 {0} 项提交 + + 初始化新仓库 + 路径 ： + 点击【确定】将在此目录执行`git init`操作 + + Source Git + 主菜单 + 出错了 + 系统提示 + + 新建空白页 (Ctrl+T) + 新标签页 + 关闭标签页 (Ctrl+W) + 关闭其他标签页 + 关闭右侧标签页 + 设置书签 + 复制仓库路径 + + 合并分支 + 合并分支 ： + 目标分支 ： + 合并方式 ： + + 打开本地仓库 + 打开GIT终端 + 克隆远程仓库 + 编辑 + 新建分组 + 新建子分组 + 删除 + 快速查找仓库 + 排序 + 支持拖放目录添加 + + 编辑分组 + 编辑仓库 + 目标 ： + 名称 ： + 书签 ： + + 删除分组确认 + 删除仓库确认 + 目标 ： + + 拉回 + 拉回（拉取并合并） + 远程 ： + 拉取分支 ： + 本地分支 ： + 使用变基方式合并分支 + 自动贮藏并恢复本地变更 + + 推送 + 推送到远程仓库 + 本地分支 ： + 远程仓库 ： + 远程分支 ： + 同时推送标签 + 启用强制推送 + + 推送标签到远程仓库 + 标签 ： + 远程仓库 ： + + 变基操作 + 分支 ： + 目标提交 ： + 自动贮藏并恢复本地变更 + + 添加远程仓库 + 编辑远程仓库 + 远程名 ： + 唯一远程名 + 仓库地址 ： + 远程仓库的地址 + + 分支重命名 + 分支 ： + 新的名称 ： + 新的分支名不能与现有分支名相同 + + 重置当前分支到指定版本 + 当前分支 ： + 提交 ： + 重置模式 ： + + 确定要回滚吗？ + 目标提交 ： + 回滚后提交更改 + + 偏好设置 + 通用配置 + 显示语言 + 主题 + 最大历史提交数 + 启动时恢复上次打开的仓库 + 使用macOS风格的标题栏 + GIT配置 + 安装路径 + Git 版本 + 默认克隆路径 + 用户名 + 默认GIT用户名 + 邮箱 + 默认GIT用户邮箱 + 自动换行转换 + 启用定时自动拉取远程更新（重启生效） + GPG签名 + 启用提交签名 + 可执行文件位置 + gpg.exe所在路径 + 用户签名KEY + 输入签名提交所使用的KEY + 外部合并工具 + 工具 + 安装路径 + 填写工具可执行文件所在位置 + 合并模式启动参数 + 对比模式启动参数 + + 贮藏 + 贮藏本地变更 + 信息 ： + 选填，用于命名此贮藏 + 包含未跟踪的文件 + + 贮藏列表 + 贮藏列表 + 查看变更 + + 丢弃贮藏确认 + 丢弃贮藏 ： + + 对比提交 : {0} -> {1} + + 本地更改 + 未暂存 + 查看忽略变更文件 + 暂存选中 + 暂存所有 + 已暂存 + 从暂存区移除选中 + 从暂存区移除所有 + 检测到冲突 + 使用THEIRS + 使用MINE + 打开合并工具 + 填写提交信息 + 历史提交信息 + 修补 + 提交 + CTRL + Enter + 提交并推送 + 没有提交信息记录 + 最近输入的提交信息 + 显示未跟踪文件 + + 检测到本地冲突! + + 丢弃贮藏确认 + 您正在丢弃所有的贮藏，一经操作，无法回退，是否继续？ + + 编辑提交信息 + 提交： + 提交信息： + + 合并HEAD到上一个提交 + 当前提交 : + 合并到 : + 修改提交信息： + + 提交统计 + 本周 + 本月 + 本年 + 提交者人数：{0} + 总计提交次数：{0} + 提交者 + 提交次数 + + 不跟踪更改的文件 + 移除 + 没有不跟踪更改的文件 + + 星期日 + 星期一 + 星期二 + 星期三 + 星期四 + 星期五 + 星期六 + + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 + 10月 + 11月 + 12月 + + 按名称升序 + 按最近访问 + 按书签颜色 + + GIT尚未配置。请打开【偏好设置】配置GIT路径。 + 路径（{0}）不存在或不可读取! + 无法找到bash.exe，请确保其在git.exe同目录中！ + 二进制文件不支持该操作!!! + 选中文件不支持该操作!!! + 获取仓库GIT_DIR失败! + 初始化GIT FLOW失败! + 不支持的GIT FLOW分支! + 目录不存在或不可写!!! + 非法的远程仓库地址! + 非法的本地仓库地址! + 远程仓库地址不可为空 + 远程仓库地址包含非法字符！仅支持字母、数字、下划线、横线或英文点号！ + 远程仓库名已存在! + 分支名不可为空 + 分支名包含非法字符！仅支持字母、数字、下划线、横线或英文点号！ + 分支名已存在! + 提交信息未填写! + 补丁文件不存在或不可访问！ + 非法的子路径！ + 非法的存档文件路径！ + 内容未填写！ + 正在将 '{0}' 从列表中移除，是否要继续？ + 补丁已成功保存！ + diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml deleted file mode 100644 index 123f9cc0..00000000 --- a/src/Resources/Locales/zh_CN.xaml +++ /dev/null @@ -1,548 +0,0 @@ - - 开 始 - 确 定 - 保 存 - 关闭 - 取 消 - 点击前往 - 在文件浏览器中查看 - 另存为... - 复制路径 - {0} 字节 - 过滤 - 选填 - 选择文件夹 - 系统提示 - 打开文件... - - 仓库地址 ： - 远程仓库地址 - 本地目录 ： - 本地存放的父级目录，选填. - - SSH密钥 ： - SSH密钥文件 - - 关于软件 - SourceGit - 开源Git图形客户端 - - 补丁 - 应用补丁 - 补丁文件 ： - 选择补丁文件 - 空白符号处理 ： - 忽略空白符号 - 忽略 - 关闭所有警告 - 警告 - 应用补丁，输出关于空白符的警告 - 错误 - 输出错误，并终止应用补丁 - 更多错误 - 与【错误】级别相似，但输出内容更多 - - 存档 ... - 存档 - 指定的提交： - 存档文件路径： - 选择存档文件的存放路径 - - 逐行追溯 - - 子模块 - 添加子模块 - 拉取子孙模块 - 打开仓库 - 复制路径 - 删除子模块 - - 挑选此提交 - 挑选提交 - 提交ID ： - 提交变化 - - 克隆远程仓库 - 远程仓库 ： - 远程仓库地址 - 父级目录 ： - 选择存放本仓库的父级文件夹路径 - 本地仓库名 ： - 本地仓库目录的名字，选填 - 远程名 ： - 远程的名字，选填 - 额外参数 ： - 其他克隆参数，选填 - - 基本信息 - 修改者 - 提交者 - 提交指纹 - 父提交 - 相关引用 - 提交信息 - 变更列表 - 变更对比 - 查找文件... - 文件列表 - - 仓库配置 - 用户名 - 应用于本仓库的用户名 - 电子邮箱 - 邮箱地址 - HTTP代理 - HTTP网络代理 - - 新建分支 - 创建本地分支 - 新分支基于 ： - 新分支名 ： - 填写分支名称 - 未提交更改 ： - 贮藏并自动恢复 - 忽略 - 完成后切换到新分支 - 对于空仓库，只有提交一次有效数据，Git 才会创建第一个分支 - - 新建标签 - 标签位于 ： - 标签名 ： - 推荐格式 ：v1.0.0-alpha - 标签描述 ： - 选填 - - 在文件浏览器中打开 - 在Visual Studio Code中打开 - 在GIT终端中打开 - 重新加载 - 查找提交 - 提交统计 - 清理本仓库(GC) - 配置本仓库 - 工作区 - 本地分支 - 新建分支 - 远程列表 - 添加远程 - 标签列表 - 新建标签 - 子模块列表 - 添加子模块 - 更新子模块 - 子树列表 - 添加子树 - 解决冲突 - 下一步 - 终止冲突解决 - - GIT工作流 - 初始化GIT工作流 - 发布分支 ： - 开发分支 ： - 特性分支 ： - 版本分支 ： - 修复分支 ： - 特性分支名前缀 ： - 版本分支名前缀 ： - 修复分支名前缀 ： - 版本标签前缀 ： - 开始特性分支... - 开始版本分支... - 开始修复分支... - 开始特性分支 - 开始版本分支 - 开始修复分支 - 输入分支名 - 结束特性分支 - 结束版本分支 - 结束修复分支 - {0}分支名未填写！ - {0}分支名包含非法字符！ - {0}前缀未填写！ - {0}前缀包含非法字符！ - 开发分支与发布分支不可相同！ - 保留分支 - - 书签 - 打开 - 在浏览器中查看 - - 推送 '{0}' - 放弃所有更改 - 快进到 '{0}' - 拉回 '{0}' - 拉回 '{0}' 内容至 '{1}' - 检出 '{0}' - 合并 '{0}' 到 '{1}' - 变基 '{0}' 分支至 '{1}' - GIT工作流 - 完成 '{0}' - 重命名 '{0}' - 删除 '{0}' - 切换上游分支... - 复制分支名 - 取消追踪 - - 拉取更新 ... - 清理远程已删除分支 - 编辑 ... - 删除 ... - 复制远程地址 - - 重置 '{0}' 到此处 - 变基 '{0}' 到此处 - 挑选此提交 - 编辑提交信息 - 合并此提交到上一个提交 - 回滚此提交 - 另存为补丁 ... - 复制提交指纹 - 复制提交信息 - - 推送 '{0}' - 删除 '{0}' - 复制标签名 - - 应用 - 应用并删除 - 删除 - - 从暂存中移除 - 暂存... - 放弃更改... - 贮藏... - 从暂存中移除 {0} 个文件 - 暂存 {0} 个文件... - 放弃 {0} 个文件的更改... - 贮藏选中的 {0} 个文件... - 另存为补丁... - 不跟踪此文件的更改 - - 确定要删除此分支吗？ - 分支名 ： - - 确定要移除该远程吗？ - 远程名 ： - - 确定要移除该标签吗？ - 标签名 ： - 同时删除远程仓库中的此标签 - - 确定要移除该子模块吗？ - 子模块路径 ： - - 下一个差异 - 上一个差异 - 切换显示模式 - 使用外部合并工具查看 - 请选择需要对比的文件 - 没有变更或仅有换行符差异 - 二进制文件 - 原始大小 ： - 当前大小 ： - LFS对象变更 - 复制 - - 放弃更改确认 - 需要放弃的变更 ： - 本操作不支持回退，请确认后继续！！！ - 所有本地址未提交的修改 - 总计{0}项选中更改 - - 拉取 - 拉取远程仓库内容 - 远程仓库 ： - 拉取所有的远程仓库 - 自动清理远程已删除分支 - - 文件历史 - 使用该版本 - - 切换变更显示模式 - 网格模式 - 列表模式 - 树形模式 - - 选择目录... - 当前选择 ： - - 历史记录 - 查询提交指纹、信息、作者。回车键开始，ESC键取消 - 清空 - 切换曲线/折线显示 - 切换横向/纵向显示 - 已选中 {0} 项提交 - - 初始化新仓库 - 路径 ： - 点击【确定】将在此目录执行`git init`操作 - - Source Git - 主菜单 - 出错了 - - 新建空白页 - 新标签页 - 起始页 - 关闭标签页 - 关闭其他标签页 - 关闭右侧标签页 - 设置书签 - 复制仓库路径 - - 合并分支 - 合并分支 ： - 目标分支 ： - 合并方式 ： - - 打开本地仓库 - 打开GIT终端 - 克隆远程仓库 - 仓库列表 - 删除 - 快速查找仓库 - 排序 - 支持拖放目录添加 - 修改显示名称 - 显示名称 ： - - 拉回 - 拉回（拉取并合并） - 远程 ： - 拉取分支 ： - 本地分支 ： - 使用变基方式合并分支 - 自动贮藏并恢复本地变更 - - 推送 - 推送到远程仓库 - 本地分支 ： - 远程仓库 ： - 远程分支 ： - 同时推送标签 - 启用强制推送 - - 推送标签到远程仓库 - 标签 ： - 远程仓库 ： - - 变基操作 - 分支 ： - 目标提交 ： - 自动贮藏并恢复本地变更 - - 添加远程仓库 - 编辑远程仓库 - 远程名 ： - 唯一远程名 - 仓库地址 ： - 远程仓库的地址 - - 分支重命名 - 分支 ： - 新的名称 ： - 新的分支名不能与现有分支名相同 - - 重置当前分支到指定版本 - 当前分支 ： - 提交 ： - 重置模式 ： - - 确定要回滚吗？ - 目标提交 ： - 回滚后提交更改 - - 偏好设置 - 通用配置 - 显示语言 - 系统字体 - 文本字体 - 启用暗色主题 - 启动时恢复上次打开的仓库 - 最大历史提交数 - GIT配置 - 安装路径 - 填写git.exe所在位置 - Git 版本 - 默认克隆路径 - 默认的仓库本地存放位置 - 用户名 - 默认GIT用户名 - 邮箱 - 默认GIT用户邮箱 - 自动换行转换 - 启用定时自动拉取远程更新（重启生效） - 外部合并工具 - 工具 - 安装路径 - 填写工具可执行文件所在位置 - 选择git.exe所在位置 - 选择{0}所在位置 - - 贮藏 - 贮藏本地变更 - 信息 ： - 选填，用于命名此贮藏 - 包含未跟踪的文件 - - 贮藏列表 - 贮藏列表 - 查看变更 - - 丢弃贮藏确认 - 丢弃贮藏 ： - - 对比提交 : {0} -> {1} - - 本地更改 - 未暂存 - 查看忽略变更文件 - 暂存选中 - 暂存所有 - 已暂存 - 从暂存区移除选中 - 从暂存区移除所有 - 检测到冲突 - 使用THEIRS - 使用MINE - 打开合并工具 - 填写提交信息 - 历史提交信息 - 修补 - 提交 - CTRL + Enter - 提交并推送 - 没有提交信息记录 - 最近输入的提交信息 - 显示未跟踪文件 - - 检测到挑选提交冲突! - 检测到变基冲突！ - 检测到回滚提交冲突！ - 检测到分支合并冲突！ - - 系统提示 - 本次配置变更需要在重启后生效，是否立即重启？ - - 添加子树 - 远程地址： - 分支或提交ID： - 本地相对路径： - 合并提交为单一提交 - - 编辑子树信息 - 远程地址： - 本地相对路径： - - 删除子树 - 本地相对路径： - 本操作仅将子树信息删除，相关文件及提交不会更改 - - 拉取子树更新 - 推送子树更新到远程 - 本地相对路径： - 远程地址： - 远程分支： - 合并提交为单一提交 - - 编辑子树 ... - 删除子树 ... - 拉取子树更新 - 推送子树变更 - - 快捷键 - 快捷键 - 功能说明 - 新建标签页 - 关闭当前浏览标签页 - 切换到下一个标签页 - 切换到指定位置的标签页 - 打开/隐藏搜索框（仅在仓库页起效） - 重新加载当前仓库信息（仅在仓库页起效） - 暂存或从暂存中移除当前选中 - 关闭当前弹出面板 - - 编辑提交信息 - 提交： - 提交信息： - - 合并HEAD到上一个提交 - 当前提交 : - 合并到 : - 修改提交信息： - - 提交统计 - 本周 - 本月 - 本年 - 提交者人数：{0} - 总计提交次数：{0} - 提交者 - 提交次数 - - 不跟踪更改的文件 - 移除 - 没有不跟踪更改的文件 - - 星期日 - 星期一 - 星期二 - 星期三 - 星期四 - 星期五 - 星期六 - - 1月 - 2月 - 3月 - 4月 - 5月 - 6月 - 7月 - 8月 - 9月 - 10月 - 11月 - 12月 - - 按名称升序 - 按最近访问 - 按书签颜色 - - GPG签名 - 启用提交签名 - 可执行文件位置 - gpg.exe所在路径 - 用户签名KEY - 输入签名提交所使用的KEY - - GIT尚未配置。请打开【偏好设置】配置GIT路径。 - 路径（{0}）不存在或不可读取! - 无法找到bash.exe，请确保其在git.exe同目录中！ - 二进制文件不支持该操作!!! - 选中文件不支持该操作!!! - 获取仓库GIT_DIR失败! - 初始化GIT FLOW失败! - 不支持的GIT FLOW分支! - 目录不存在或不可写!!! - 非法的远程仓库地址! - 非法的本地仓库地址! - 远程仓库地址不可为空 - 远程仓库地址包含非法字符！仅支持字母、数字、下划线、横线或英文点号！ - 远程仓库名已存在! - 分支名不可为空 - 分支名包含非法字符！仅支持字母、数字、下划线、横线或英文点号！ - 分支名已存在! - 标签名不可为空! - 标签名包含非法字符！仅支持字母、数字、下划线、横线或英文点号！ - 标签名已存在! - 提交信息未填写! - 补丁文件不存在或不可访问！ - 非法的子路径！ - 非法的存档文件路径！ - 内容未填写！ - 正在将 '{0}' 从列表中移除，是否要继续？ - 您正在丢弃所有的贮藏，一经操作，无法回退，是否继续？ - 补丁已成功保存！ - \ No newline at end of file diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml new file mode 100644 index 00000000..75d5a5d9 --- /dev/null +++ b/src/Resources/Styles.axaml @@ -0,0 +1,897 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Resources/Styles/Button.xaml b/src/Resources/Styles/Button.xaml deleted file mode 100644 index 76aabb6e..00000000 --- a/src/Resources/Styles/Button.xaml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/ComboBox.xaml b/src/Resources/Styles/ComboBox.xaml deleted file mode 100644 index b2f36a3f..00000000 --- a/src/Resources/Styles/ComboBox.xaml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/ContextMenu.xaml b/src/Resources/Styles/ContextMenu.xaml deleted file mode 100644 index 2c5be7b9..00000000 --- a/src/Resources/Styles/ContextMenu.xaml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/DataGrid.xaml b/src/Resources/Styles/DataGrid.xaml deleted file mode 100644 index 1ca58ae3..00000000 --- a/src/Resources/Styles/DataGrid.xaml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/HyperLink.xaml b/src/Resources/Styles/HyperLink.xaml deleted file mode 100644 index fcba9d56..00000000 --- a/src/Resources/Styles/HyperLink.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/IconButton.xaml b/src/Resources/Styles/IconButton.xaml deleted file mode 100644 index f530df8f..00000000 --- a/src/Resources/Styles/IconButton.xaml +++ /dev/null @@ -1,46 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/ListBox.xaml b/src/Resources/Styles/ListBox.xaml deleted file mode 100644 index 2fda7c79..00000000 --- a/src/Resources/Styles/ListBox.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/ListView.xaml b/src/Resources/Styles/ListView.xaml deleted file mode 100644 index 3c81d5af..00000000 --- a/src/Resources/Styles/ListView.xaml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/Path.xaml b/src/Resources/Styles/Path.xaml deleted file mode 100644 index a91dee33..00000000 --- a/src/Resources/Styles/Path.xaml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/RadioButton.xaml b/src/Resources/Styles/RadioButton.xaml deleted file mode 100644 index f935b69f..00000000 --- a/src/Resources/Styles/RadioButton.xaml +++ /dev/null @@ -1,52 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/ScrollBar.xaml b/src/Resources/Styles/ScrollBar.xaml deleted file mode 100644 index 464ac563..00000000 --- a/src/Resources/Styles/ScrollBar.xaml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/ScrollViewer.xaml b/src/Resources/Styles/ScrollViewer.xaml deleted file mode 100644 index b1d1aecb..00000000 --- a/src/Resources/Styles/ScrollViewer.xaml +++ /dev/null @@ -1,52 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/Slider.xaml b/src/Resources/Styles/Slider.xaml deleted file mode 100644 index c54077e5..00000000 --- a/src/Resources/Styles/Slider.xaml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/TabControl.xaml b/src/Resources/Styles/TabControl.xaml deleted file mode 100644 index 69cc26a8..00000000 --- a/src/Resources/Styles/TabControl.xaml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/TextBlock.xaml b/src/Resources/Styles/TextBlock.xaml deleted file mode 100644 index b2540c91..00000000 --- a/src/Resources/Styles/TextBlock.xaml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/TextBox.xaml b/src/Resources/Styles/TextBox.xaml deleted file mode 100644 index 3d95136d..00000000 --- a/src/Resources/Styles/TextBox.xaml +++ /dev/null @@ -1,107 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/ToggleButton.xaml b/src/Resources/Styles/ToggleButton.xaml deleted file mode 100644 index f284536a..00000000 --- a/src/Resources/Styles/ToggleButton.xaml +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/Tooltip.xaml b/src/Resources/Styles/Tooltip.xaml deleted file mode 100644 index 4ce7cf0a..00000000 --- a/src/Resources/Styles/Tooltip.xaml +++ /dev/null @@ -1,22 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Resources/Styles/Tree.xaml b/src/Resources/Styles/Tree.xaml deleted file mode 100644 index d0980c64..00000000 --- a/src/Resources/Styles/Tree.xaml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Styles/Window.xaml b/src/Resources/Styles/Window.xaml deleted file mode 100644 index 710e1f58..00000000 --- a/src/Resources/Styles/Window.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml new file mode 100644 index 00000000..88f38d8c --- /dev/null +++ b/src/Resources/Themes.axaml @@ -0,0 +1,95 @@ + + + + #FFFF6059 + #FFFFBE2F + #FF29c941 + #FFF0F5F9 + #FFCFDEEA + #FFF0F5F9 + #FFF8F8F8 + #FFFAFAFA + #FFB0CEE8 + #FF6F6F6F + #FFF8F8F8 + #FF836C2E + #FFDFDFDF + #FFCFCFCF + #FFCFCFCF + #FF898989 + #FFCFCFCF + #FFEFEFEF + #FFF8F8F8 + White + #FF4295FF + #FF529DFB + #FF1F1F1F + #FF6F6F6F + #FFFFFFFF + #FF4295FF + #FF529DFB + #4C007ACC + + + + #FFFF5E56 + #FFFCBB2D + #FF25C53C + #FF252525 + #FF1F1F1F + #FF2C2C2C + #FF2B2B2B + #FF181818 + #FF8F8F8F + #FF505050 + #FFF8F8F8 + #FFFAFAD2 + #FF323232 + #FF3F3F3F + #FF181818 + #FF7C7C7C + #FF404040 + #FF252525 + #FF303030 + #FF333333 + #FF3A3A3A + #FF404040 + #FFF1F1F1 + #40F1F1F1 + #FF252525 + #FF007ACC + #FF006BBE + #8C007ACC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Resources/Themes/Dark.xaml b/src/Resources/Themes/Dark.xaml deleted file mode 100644 index 657a3845..00000000 --- a/src/Resources/Themes/Dark.xaml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Resources/Themes/Light.xaml b/src/Resources/Themes/Light.xaml deleted file mode 100644 index eb80a516..00000000 --- a/src/Resources/Themes/Light.xaml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj index a5e7e0bd..e32977e5 100644 --- a/src/SourceGit.csproj +++ b/src/SourceGit.csproj @@ -1,30 +1,34 @@ - - - net48 - WinExe - true - true - App.ico - sourcegit - OpenSource GIT client for Windows - Copyright © sourcegit 2023. All rights reserved. - App.manifest - 7.0 - MIT - SourceGit.App - https://github.com/sourcegit-scm/sourcegit.git - https://github.com/sourcegit-scm/sourcegit.git - Public - true - none - false - false - - - - - - - - - \ No newline at end of file + + + WinExe + net8.0 + true + App.manifest + App.ico + 8.0 + false + true + true + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SourceGit.sln b/src/SourceGit.sln new file mode 100644 index 00000000..13ea93f0 --- /dev/null +++ b/src/SourceGit.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34408.163 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGit", "SourceGit.csproj", "{89AD3F88-E72C-4399-AD61-6A87FC424E7B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89AD3F88-E72C-4399-AD61-6A87FC424E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89AD3F88-E72C-4399-AD61-6A87FC424E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89AD3F88-E72C-4399-AD61-6A87FC424E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89AD3F88-E72C-4399-AD61-6A87FC424E7B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DA70C1D9-A8D2-4C89-98F3-B263CCBC5F28} + EndGlobalSection +EndGlobal diff --git a/src/ViewModels/AddRemote.cs b/src/ViewModels/AddRemote.cs new file mode 100644 index 00000000..8bb2652a --- /dev/null +++ b/src/ViewModels/AddRemote.cs @@ -0,0 +1,82 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class AddRemote : Popup { + [Required(ErrorMessage = "Remote name is required!!!")] + [RegularExpression(@"^[\w\-\.]+$", ErrorMessage = "Bad remote name format!!!")] + [CustomValidation(typeof(AddRemote), nameof(ValidateRemoteName))] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + [Required(ErrorMessage = "Remote URL is required!!!")] + [CustomValidation(typeof(AddRemote), nameof(ValidateRemoteURL))] + public string Url { + get => _url; + set { + if (SetProperty(ref _url, value, true)) UseSSH = Models.Remote.IsSSH(value); + } + } + + public bool UseSSH { + get => _useSSH; + set => SetProperty(ref _useSSH, value); + } + + public string SSHKey { + get; + set; + } + + public AddRemote(Repository repo) { + _repo = repo; + View = new Views.AddRemote() { DataContext = this }; + } + + public static ValidationResult ValidateRemoteName(string name, ValidationContext ctx) { + if (ctx.ObjectInstance is AddRemote add) { + var exists = add._repo.Remotes.Find(x => x.Name == name); + if (exists != null) return new ValidationResult("A remote with given name already exists!!!"); + } + + return ValidationResult.Success; + } + + public static ValidationResult ValidateRemoteURL(string url, ValidationContext ctx) { + if (ctx.ObjectInstance is AddRemote add) { + if (!Models.Remote.IsValidURL(url)) return new ValidationResult("Bad remote URL format!!!"); + + var exists = add._repo.Remotes.Find(x => x.URL == url); + if (exists != null) return new ValidationResult("A remote with the same url already exists!!!"); + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription("Adding remote ..."); + var succ = new Commands.Remote(_repo.FullPath).Add(_name, _url); + if (succ) { + SetProgressDescription("Fetching from added remote ..."); + new Commands.Fetch(_repo.FullPath, _name, true, SetProgressDescription).Exec(); + + if (_useSSH) { + SetProgressDescription("Post processing ..."); + new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey); + } + } + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _name = string.Empty; + private string _url = string.Empty; + private bool _useSSH = false; + } +} diff --git a/src/ViewModels/AddSubmodule.cs b/src/ViewModels/AddSubmodule.cs new file mode 100644 index 00000000..1e2e1c02 --- /dev/null +++ b/src/ViewModels/AddSubmodule.cs @@ -0,0 +1,61 @@ +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class AddSubmodule : Popup { + [Required(ErrorMessage = "Url is required!!!")] + [CustomValidation(typeof(AddSubmodule), nameof(ValidateURL))] + public string Url { + get => _url; + set => SetProperty(ref _url, value, true); + } + + [Required(ErrorMessage = "Reletive path is required!!!")] + [CustomValidation(typeof(AddSubmodule), nameof(ValidateRelativePath))] + public string RelativePath { + get => _relativePath; + set => SetProperty(ref _relativePath, value, true); + } + + public bool Recursive { + get; + set; + } + + public AddSubmodule(Repository repo) { + _repo = repo; + View = new Views.AddSubmodule() { DataContext = this }; + } + + public static ValidationResult ValidateURL(string url, ValidationContext ctx) { + if (!Models.Remote.IsValidURL(url)) return new ValidationResult("Invalid repository URL format"); + return ValidationResult.Success; + } + + public static ValidationResult ValidateRelativePath(string path, ValidationContext ctx) { + if (Path.Exists(path)) { + return new ValidationResult("Give path is exists already!"); + } + + if (Path.IsPathRooted(path)) { + return new ValidationResult("Path must be relative to this repository!"); + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.Submodule(_repo.FullPath).Add(_url, _relativePath, Recursive, SetProgressDescription); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _url = string.Empty; + private string _relativePath = string.Empty; + } +} diff --git a/src/ViewModels/Apply.cs b/src/ViewModels/Apply.cs new file mode 100644 index 00000000..c3685426 --- /dev/null +++ b/src/ViewModels/Apply.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Apply : Popup { + [Required(ErrorMessage = "Patch file is required!!!")] + [CustomValidation(typeof(Apply), nameof(ValidatePatchFile))] + public string PatchFile { + get => _patchFile; + set => SetProperty(ref _patchFile, value, true); + } + + public bool IgnoreWhiteSpace { + get => _ignoreWhiteSpace; + set => SetProperty(ref _ignoreWhiteSpace, value); + } + + public List WhiteSpaceModes { + get; + private set; + } + + public Models.ApplyWhiteSpaceMode SelectedWhiteSpaceMode { + get; + set; + } + + public Apply(Repository repo) { + _repo = repo; + + WhiteSpaceModes = new List { + new Models.ApplyWhiteSpaceMode("Apply.NoWarn", "Apply.NoWarn.Desc", "nowarn"), + new Models.ApplyWhiteSpaceMode("Apply.Warn", "Apply.Warn.Desc", "warn"), + new Models.ApplyWhiteSpaceMode("Apply.Error", "Apply.Error.Desc", "error"), + new Models.ApplyWhiteSpaceMode("Apply.ErrorAll", "Apply.ErrorAll.Desc", "error-all") + }; + SelectedWhiteSpaceMode = WhiteSpaceModes[0]; + + View = new Views.Apply() { DataContext = this }; + } + + public static ValidationResult ValidatePatchFile(string file, ValidationContext _) { + if (File.Exists(file)) { + return ValidationResult.Success; + } + + return new ValidationResult($"File '{file}' can NOT be found!!!"); + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.Apply(_repo.FullPath, _patchFile, _ignoreWhiteSpace, SelectedWhiteSpaceMode.Arg).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _patchFile = string.Empty; + private bool _ignoreWhiteSpace = true; + } +} diff --git a/src/ViewModels/Archive.cs b/src/ViewModels/Archive.cs new file mode 100644 index 00000000..3661a978 --- /dev/null +++ b/src/ViewModels/Archive.cs @@ -0,0 +1,56 @@ +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Archive : Popup { + + [Required(ErrorMessage = "Output file name is required")] + public string SaveFile { + get => _saveFile; + set => SetProperty(ref _saveFile, value, true); + } + + public object BasedOn { + get; + private set; + } + + public Archive(Repository repo, Models.Branch branch) { + _repo = repo; + _revision = branch.Head; + _saveFile = $"archive-{Path.GetFileNameWithoutExtension(branch.Name)}.zip"; + BasedOn = branch; + View = new Views.Archive() { DataContext = this }; + } + + public Archive(Repository repo, Models.Commit commit) { + _repo = repo; + _revision = commit.SHA; + _saveFile = $"archive-{commit.SHA.Substring(0,10)}.zip"; + BasedOn = commit; + View = new Views.Archive() { DataContext = this }; + } + + public Archive(Repository repo, Models.Tag tag) { + _repo = repo; + _revision = tag.SHA; + _saveFile = $"archive-{tag.Name}.zip"; + BasedOn = tag; + View = new Views.Archive() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.Archive(_repo.FullPath, _revision, _saveFile, SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _saveFile = string.Empty; + private string _revision = string.Empty; + } +} diff --git a/src/ViewModels/AssumeUnchangedManager.cs b/src/ViewModels/AssumeUnchangedManager.cs new file mode 100644 index 00000000..f633de75 --- /dev/null +++ b/src/ViewModels/AssumeUnchangedManager.cs @@ -0,0 +1,30 @@ +using Avalonia.Collections; +using Avalonia.Threading; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class AssumeUnchangedManager { + public AvaloniaList Files { get; private set; } + + public AssumeUnchangedManager(string repo) { + _repo = repo; + Files = new AvaloniaList(); + + Task.Run(() => { + var collect = new Commands.AssumeUnchanged(_repo).View(); + Dispatcher.UIThread.Invoke(() => { + Files.AddRange(collect); + }); + }); + } + + public void Remove(object param) { + if (param is string file) { + new Commands.AssumeUnchanged(_repo).Remove(file); + Files.Remove(file); + } + } + + private string _repo; + } +} diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs new file mode 100644 index 00000000..3aa1e66e --- /dev/null +++ b/src/ViewModels/Blame.cs @@ -0,0 +1,48 @@ +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Blame : ObservableObject { + public string Title { + get; + private set; + } + + public string SelectedSHA { + get => _selectedSHA; + private set => SetProperty(ref _selectedSHA, value); + } + + public bool IsBinary { + get => _data != null && _data.IsBinary; + } + + public Models.BlameData Data { + get => _data; + private set => SetProperty(ref _data, value); + } + + public Blame(string repo, string file, string revision) { + _repo = repo; + + Title = $"{file}@{revision.Substring(0, 10)}"; + Task.Run(() => { + var result = new Commands.Blame(repo, file, revision).Result(); + Dispatcher.UIThread.Invoke(() => { + Data = result; + OnPropertyChanged(nameof(IsBinary)); + }); + }); + } + + public void NavigateToCommit(string commitSHA) { + var repo = Preference.FindRepository(_repo); + if (repo != null) repo.NavigateToCommit(commitSHA); + } + + private string _repo = string.Empty; + private string _selectedSHA = string.Empty; + private Models.BlameData _data = null; + } +} diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs new file mode 100644 index 00000000..33c70d6b --- /dev/null +++ b/src/ViewModels/Checkout.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Checkout : Popup { + public string Branch { + get; + private set; + } + + public Checkout(Repository repo, string branch) { + _repo = repo; + Branch = branch; + View = new Views.Checkout() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Checkout '{Branch}' ..."); + var succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo; + } +} diff --git a/src/ViewModels/CherryPick.cs b/src/ViewModels/CherryPick.cs new file mode 100644 index 00000000..658c1e0e --- /dev/null +++ b/src/ViewModels/CherryPick.cs @@ -0,0 +1,34 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CherryPick : Popup { + public Models.Commit Target { + get; + private set; + } + + public bool AutoCommit { + get; + set; + } + + public CherryPick(Repository repo, Models.Commit target) { + _repo = repo; + Target = target; + AutoCommit = true; + View = new Views.CherryPick() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Cherry-Pick commit '{Target.SHA}' ..."); + var succ = new Commands.CherryPick(_repo.FullPath, Target.SHA, !AutoCommit).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Cleanup.cs b/src/ViewModels/Cleanup.cs new file mode 100644 index 00000000..07561d5e --- /dev/null +++ b/src/ViewModels/Cleanup.cs @@ -0,0 +1,30 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Cleanup : Popup { + public Cleanup(Repository repo) { + _repo = repo; + View = new Views.Cleanup() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + ProgressDescription = "Cleanup (GC & prune) ..."; + return Task.Run(() => { + SetProgressDescription("Run GC ..."); + new Commands.GC(_repo.FullPath, SetProgressDescription).Exec(); + + var lfs = new Commands.LFS(_repo.FullPath); + if (lfs.IsEnabled()) { + SetProgressDescription("Run LFS prune ..."); + lfs.Prune(SetProgressDescription); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/ClearStashes.cs b/src/ViewModels/ClearStashes.cs new file mode 100644 index 00000000..ba10adbf --- /dev/null +++ b/src/ViewModels/ClearStashes.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class ClearStashes : Popup { + public ClearStashes(Repository repo) { + _repo = repo; + View = new Views.ClearStashes() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + new Commands.Stash(_repo.FullPath).Clear(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs new file mode 100644 index 00000000..3a7de344 --- /dev/null +++ b/src/ViewModels/Clone.cs @@ -0,0 +1,111 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Clone : Popup { + [Required(ErrorMessage = "Remote URL is required")] + [CustomValidation(typeof(Clone), nameof(ValidateRemote))] + public string Remote { + get => _remote; + set { + if (SetProperty(ref _remote, value, true)) UseSSH = Models.Remote.IsSSH(value); + } + } + + public bool UseSSH { + get => _useSSH; + set => SetProperty(ref _useSSH, value); + } + + public string SSHKey { + get => _sshKey; + set => SetProperty(ref _sshKey, value); + } + + [Required(ErrorMessage = "Parent folder is required")] + [CustomValidation(typeof(Clone), nameof(ValidateParentFolder))] + public string ParentFolder { + get => _parentFolder; + set => SetProperty(ref _parentFolder, value, true); + } + + public string Local { + get => _local; + set => SetProperty(ref _local, value); + } + + public string ExtraArgs { + get => _extraArgs; + set => SetProperty(ref _extraArgs, value); + } + + public Clone(LauncherPage page) { + View = new Views.Clone() { DataContext = this }; + _page = page; + } + + public static ValidationResult ValidateRemote(string remote, ValidationContext _) { + if (!Models.Remote.IsValidURL(remote)) return new ValidationResult("Invalid remote repository URL format"); + return ValidationResult.Success; + } + + public static ValidationResult ValidateParentFolder(string folder, ValidationContext _) { + if (!Directory.Exists(folder)) return new ValidationResult("Given path can NOT be found"); + return ValidationResult.Success; + } + + public override Task Sure() { + return Task.Run(() => { + var cmd = new Commands.Clone(HostPageId, _parentFolder, _remote, _local, _useSSH ? _sshKey : "", _extraArgs, SetProgressDescription); + if (!cmd.Exec()) return false; + + var path = _parentFolder; + if (!string.IsNullOrEmpty(_local)) { + path = Path.GetFullPath(Path.Combine(path, _local)); + } else { + var name = Path.GetFileName(_remote); + if (name.EndsWith(".git")) name = name.Substring(0, name.Length - 4); + path = Path.GetFullPath(Path.Combine(path, name)); + } + + if (!Directory.Exists(path)) { + CallUIThread(() => { + App.RaiseException(HostPageId, $"Folder '{path}' can NOT be found"); + }); + return false; + } + + if (_useSSH && !string.IsNullOrEmpty(_sshKey)) { + var config = new Commands.Config(path); + config.Set("remote.origin.sshkey", _sshKey); + } + + CallUIThread(() => { + var repo = Preference.AddRepository(path, Path.Combine(path, ".git")); + var node = new RepositoryNode() { + Id = path, + Name = Path.GetFileName(path), + Bookmark = 0, + IsRepository = true, + }; + Preference.AddNode(node); + + _page.View = new Views.Repository() { DataContext = repo }; + _page.Node = node; + }); + + return true; + }); + } + + private LauncherPage _page = null; + private string _remote = string.Empty; + private bool _useSSH = false; + private string _sshKey = string.Empty; + private string _parentFolder = Preference.Instance.GitDefaultCloneDir; + private string _local = string.Empty; + private string _extraArgs = string.Empty; + } +} diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs new file mode 100644 index 00000000..602f1db3 --- /dev/null +++ b/src/ViewModels/CommitDetail.cs @@ -0,0 +1,408 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Platform.Storage; +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CommitDetail : ObservableObject { + public DiffContext DiffContext { + get => _diffContext; + private set => SetProperty(ref _diffContext, value); + } + + public int ActivePageIndex { + get => _activePageIndex; + set => SetProperty(ref _activePageIndex, value); + } + + public Models.Commit Commit { + get => _commit; + set { + if (SetProperty(ref _commit, value)) Refresh(); + } + } + + public List Changes { + get => _changes; + set => SetProperty(ref _changes, value); + } + + public List VisibleChanges { + get => _visibleChanges; + set => SetProperty(ref _visibleChanges, value); + } + + public List ChangeTree { + get => _changeTree; + set => SetProperty(ref _changeTree, value); + } + + public Models.Change SelectedChange { + get => _selectedChange; + set { + if (SetProperty(ref _selectedChange, value)) { + if (value == null) { + SelectedChangeNode = null; + DiffContext = null; + } else { + SelectedChangeNode = FileTreeNode.SelectByPath(_changeTree, value.Path); + DiffContext = new DiffContext(_repo, new Models.DiffOption(_commit, value)); + } + } + } + } + + public FileTreeNode SelectedChangeNode { + get => _selectedChangeNode; + set { + if (SetProperty(ref _selectedChangeNode, value)) { + if (value == null) { + SelectedChange = null; + } else { + SelectedChange = value.Backend as Models.Change; + } + } + } + } + + public string SearchChangeFilter { + get => _searchChangeFilter; + set { + if (SetProperty(ref _searchChangeFilter, value)) { + RefreshVisibleChanges(); + } + } + } + + public List RevisionFilesTree { + get => _revisionFilesTree; + set => SetProperty(ref _revisionFilesTree, value); + } + + public FileTreeNode SelectedRevisionFileNode { + get => _selectedRevisionFileNode; + set { + if (SetProperty(ref _selectedRevisionFileNode, value) && value != null && !value.IsFolder) { + RefreshViewRevisionFile(value.Backend as Models.Object); + } else { + ViewRevisionFileContent = null; + } + } + } + + public string SearchFileFilter { + get => _searchFileFilter; + set { + if (SetProperty(ref _searchFileFilter, value)) { + RefreshVisibleFiles(); + } + } + } + + public object ViewRevisionFileContent { + get => _viewRevisionFileContent; + set => SetProperty(ref _viewRevisionFileContent, value); + } + + public CommitDetail(string repo) { + _repo = repo; + } + + public void NavigateTo(string commitSHA) { + var repo = Preference.FindRepository(_repo); + if (repo != null) repo.NavigateToCommit(commitSHA); + } + + public void ClearSearchChangeFilter() { + SearchChangeFilter = string.Empty; + } + + public void ClearSearchFileFilter() { + SearchFileFilter = string.Empty; + } + + public ContextMenu CreateChangeContextMenu(Models.Change change) { + var menu = new ContextMenu(); + + if (change.Index != Models.ChangeState.Deleted) { + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Icon = CreateMenuIcon("Icons.Histories"); + history.Click += (_, ev) => { + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo, change.Path) }; + window.Show(); + ev.Handled = true; + }; + + var blame = new MenuItem(); + blame.Header = App.Text("Blame"); + blame.Icon = CreateMenuIcon("Icons.Blame"); + blame.Click += (o, ev) => { + var window = new Views.Blame() { DataContext = new Blame(_repo, change.Path, _commit.SHA) }; + window.Show(); + ev.Handled = true; + }; + + var full = Path.GetFullPath(Path.Combine(_repo, change.Path)); + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.Icon = CreateMenuIcon("Icons.Folder.Open"); + explore.IsEnabled = File.Exists(full); + explore.Click += (_, ev) => { + Native.OS.OpenInFileManager(full, true); + ev.Handled = true; + }; + + menu.Items.Add(history); + menu.Items.Add(blame); + menu.Items.Add(explore); + } + + var copyPath = new MenuItem(); + copyPath.Header = App.Text("CopyPath"); + copyPath.Icon = CreateMenuIcon("Icons.Copy"); + copyPath.Click += (_, ev) => { + App.CopyText(change.Path); + ev.Handled = true; + }; + + menu.Items.Add(copyPath); + return menu; + } + + public ContextMenu CreateRevisionFileContextMenu(Models.Object file) { + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Icon = CreateMenuIcon("Icons.Histories"); + history.Click += (_, ev) => { + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo, file.Path) }; + window.Show(); + ev.Handled = true; + }; + + var blame = new MenuItem(); + blame.Header = App.Text("Blame"); + blame.Icon = CreateMenuIcon("Icons.Blame"); + blame.Click += (o, ev) => { + var window = new Views.Blame() { DataContext = new Blame(_repo, file.Path, _commit.SHA) }; + window.Show(); + ev.Handled = true; + }; + + var full = Path.GetFullPath(Path.Combine(_repo, file.Path)); + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.Icon = CreateMenuIcon("Icons.Folder.Open"); + explore.Click += (_, ev) => { + Native.OS.OpenInFileManager(full, file.Type == Models.ObjectType.Blob); + ev.Handled = true; + }; + + var saveAs = new MenuItem(); + saveAs.Header = App.Text("SaveAs"); + saveAs.Icon = CreateMenuIcon("Icons.Save"); + saveAs.IsEnabled = file.Type == Models.ObjectType.Blob; + saveAs.Click += async (_, ev) => { + 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) { + var saveTo = Path.Combine(selected[0].Path.LocalPath, Path.GetFileName(file.Path)); + Commands.SaveRevisionFile.Run(_repo, _commit.SHA, file.Path, saveTo); + } + + ev.Handled = true; + }; + + var copyPath = new MenuItem(); + copyPath.Header = App.Text("CopyPath"); + copyPath.Icon = CreateMenuIcon("Icons.Copy"); + copyPath.Click += (_, ev) => { + App.CopyText(file.Path); + ev.Handled = true; + }; + + var menu = new ContextMenu(); + menu.Items.Add(history); + menu.Items.Add(blame); + menu.Items.Add(explore); + menu.Items.Add(saveAs); + menu.Items.Add(copyPath); + return menu; + } + + private void Refresh() { + _changes = null; + VisibleChanges = null; + SelectedChange = null; + RevisionFilesTree = null; + SelectedRevisionFileNode = null; + if (_commit == null) return; + if (_cancelToken != null) _cancelToken.Requested = true; + + _cancelToken = new Commands.Command.CancelToken(); + var cmdChanges = new Commands.QueryCommitChanges(_repo, _commit.SHA) { Cancel = _cancelToken }; + var cmdRevisionFiles = new Commands.QueryRevisionObjects(_repo, _commit.SHA) { Cancel = _cancelToken }; + + Task.Run(() => { + var changes = cmdChanges.Result(); + if (cmdChanges.Cancel.Requested) return; + + var visible = changes; + if (!string.IsNullOrWhiteSpace(_searchChangeFilter)) { + visible = new List(); + foreach (var c in changes) { + if (c.Path.Contains(_searchChangeFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(c); + } + } + } + + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => { + Changes = changes; + VisibleChanges = visible; + ChangeTree = tree; + }); + }); + + Task.Run(() => { + var files = cmdRevisionFiles.Result(); + if (cmdRevisionFiles.Cancel.Requested) return; + + var visible = files; + if (!string.IsNullOrWhiteSpace(_searchFileFilter)) { + visible = new List(); + foreach (var f in files) { + if (f.Path.Contains(_searchFileFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(f); + } + } + } + + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => { + _revisionFiles = files; + RevisionFilesTree = tree; + }); + }); + } + + private void RefreshVisibleChanges() { + if (_changes == null) return; + + if (string.IsNullOrEmpty(_searchChangeFilter)) { + VisibleChanges = _changes; + } else { + var visible = new List(); + foreach (var c in _changes) { + if (c.Path.Contains(_searchChangeFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(c); + } + } + + VisibleChanges = visible; + } + + ChangeTree = FileTreeNode.Build(_visibleChanges); + } + + private void RefreshVisibleFiles() { + if (_revisionFiles == null) return; + + var visible = _revisionFiles; + if (!string.IsNullOrWhiteSpace(_searchFileFilter)) { + visible = new List(); + foreach (var f in _revisionFiles) { + if (f.Path.Contains(_searchFileFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(f); + } + } + } + + RevisionFilesTree = FileTreeNode.Build(visible); + } + + private void RefreshViewRevisionFile(Models.Object file) { + switch (file.Type) { + case Models.ObjectType.Blob: + Task.Run(() => { + var isBinary = new Commands.IsBinary(_repo, _commit.SHA, file.Path).Result(); + if (isBinary) { + Dispatcher.UIThread.Invoke(() => { + ViewRevisionFileContent = new Models.RevisionBinaryFile(); + }); + return; + } + + var content = new Commands.QueryFileContent(_repo, _commit.SHA, file.Path).Result(); + if (content.StartsWith("version https://git-lfs.github.com/spec/", StringComparison.OrdinalIgnoreCase)) { + var obj = new Models.RevisionLFSObject() { Object = new Models.LFSObject() }; + var lines = content.Split('\n', StringSplitOptions.RemoveEmptyEntries); + if (lines.Length == 3) { + foreach (var line in lines) { + if (line.StartsWith("oid sha256:")) { + obj.Object.Oid = line.Substring(11); + } else if (line.StartsWith("size ")) { + obj.Object.Size = long.Parse(line.Substring(5)); + } + } + Dispatcher.UIThread.Invoke(() => { + ViewRevisionFileContent = obj; + }); + return; + } + } + + Dispatcher.UIThread.Invoke(() => { + ViewRevisionFileContent = new Models.RevisionTextFile() { + FileName = file.Path, + Content = content + }; + }); + }); + break; + case Models.ObjectType.Commit: + ViewRevisionFileContent = new Models.RevisionSubmodule() { SHA = file.SHA }; + break; + default: + ViewRevisionFileContent = null; + break; + } + } + + private Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) { + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 12; + icon.Height = 12; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource(key) as StreamGeometry; + return icon; + } + + private string _repo = string.Empty; + private int _activePageIndex = 0; + private Models.Commit _commit = null; + private List _changes = null; + private List _visibleChanges = null; + private List _changeTree = null; + private Models.Change _selectedChange = null; + private FileTreeNode _selectedChangeNode = null; + private string _searchChangeFilter = string.Empty; + private DiffContext _diffContext = null; + private List _revisionFiles = null; + private List _revisionFilesTree = null; + private FileTreeNode _selectedRevisionFileNode = null; + private string _searchFileFilter = string.Empty; + private object _viewRevisionFileContent = null; + private Commands.Command.CancelToken _cancelToken = null; + } +} diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs new file mode 100644 index 00000000..73d19ca4 --- /dev/null +++ b/src/ViewModels/CreateBranch.cs @@ -0,0 +1,111 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CreateBranch : Popup { + [Required(ErrorMessage = "Branch name is required!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] + [CustomValidation(typeof(CreateBranch), nameof(ValidateBranchName))] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + public object BasedOn { + get; + private set; + } + + public bool CheckoutAfterCreated { + get; + set; + } = true; + + public bool AutoStash { + get; + set; + } = true; + + public CreateBranch(Repository repo, Models.Branch branch) { + _repo = repo; + _baseOnRevision = branch.Head; + + BasedOn = branch; + View = new Views.CreateBranch() { DataContext = this }; + } + + public CreateBranch(Repository repo, Models.Commit commit) { + _repo = repo; + _baseOnRevision = commit.SHA; + + BasedOn = commit; + View = new Views.CreateBranch() { DataContext = this }; + } + + public CreateBranch(Repository repo, Models.Tag tag) { + _repo = repo; + _baseOnRevision = tag.SHA; + + BasedOn = tag; + View = new Views.CreateBranch() { DataContext = this }; + } + + public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { + var creator = ctx.ObjectInstance as CreateBranch; + if (creator == null) return new ValidationResult("Missing runtime context to create branch!"); + + foreach (var b in creator._repo.Branches) { + var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}"; + if (test == name) return new ValidationResult("A branch with same name already exists!"); + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + if (CheckoutAfterCreated) { + bool needPopStash = false; + if (_repo.WorkingCopyChangesCount > 0) { + if (AutoStash) { + SetProgressDescription("Adding untracked changes..."); + var succ = new Commands.Add(_repo.FullPath).Exec(); + if (succ) { + SetProgressDescription("Stash local changes"); + succ = new Commands.Stash(_repo.FullPath).Push("CREATE_BRANCH_AUTO_STASH"); + } + + if (!succ) { + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return false; + } + + needPopStash = true; + } else { + SetProgressDescription("Discard local changes..."); + Commands.Discard.All(_repo.FullPath); + } + } + + SetProgressDescription($"Create new branch '{_name}'"); + new Commands.Checkout(_repo.FullPath).Branch(_name, _baseOnRevision, SetProgressDescription); + + if (needPopStash) { + SetProgressDescription("Re-apply local changes..."); + new Commands.Stash(_repo.FullPath).Pop("stash@{0}"); + } + } else { + Commands.Branch.Create(_repo.FullPath, _name, _baseOnRevision); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private string _name = null; + private string _baseOnRevision = null; + } +} diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs new file mode 100644 index 00000000..a398f610 --- /dev/null +++ b/src/ViewModels/CreateGroup.cs @@ -0,0 +1,32 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CreateGroup : Popup { + [Required(ErrorMessage = "Group name is required!")] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + public CreateGroup(RepositoryNode parent) { + _parent = parent; + View = new Views.CreateGroup() { DataContext = this }; + } + + public override Task Sure() { + Preference.AddNode(new RepositoryNode() { + Id = Guid.NewGuid().ToString(), + Name = _name, + IsRepository = false, + IsExpanded = false, + }, _parent); + + return null; + } + + private RepositoryNode _parent = null; + private string _name = string.Empty; + } +} diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs new file mode 100644 index 00000000..ef33d0b3 --- /dev/null +++ b/src/ViewModels/CreateTag.cs @@ -0,0 +1,64 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CreateTag : Popup { + [Required(ErrorMessage = "Tag name is required!")] + [RegularExpression(@"^[\w\-\.]+$", ErrorMessage = "Bad tag name format!")] + [CustomValidation(typeof(CreateTag), nameof(ValidateTagName))] + public string TagName { + get => _tagName; + set => SetProperty(ref _tagName, value, true); + } + + public string Message { + get; + set; + } + + public object BasedOn { + get; + private set; + } + + public CreateTag(Repository repo, Models.Branch branch) { + _repo = repo; + _basedOn = branch.Head; + + BasedOn = branch; + View = new Views.CreateTag() { DataContext = this }; + } + + public CreateTag(Repository repo, Models.Commit commit) { + _repo = repo; + _basedOn = commit.SHA; + + BasedOn = commit; + View = new Views.CreateTag() { DataContext = this }; + } + + public static ValidationResult ValidateTagName(string name, ValidationContext ctx) { + var creator = ctx.ObjectInstance as CreateTag; + if (creator != null) { + var found = creator._repo.Tags.Find(x => x.Name == name); + if (found != null) return new ValidationResult("A tag with same name already exists!"); + } + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + Commands.Tag.Add(_repo.FullPath, TagName, _basedOn, Message); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private string _tagName = string.Empty; + private string _basedOn = string.Empty; + } +} diff --git a/src/ViewModels/DeleteBranch.cs b/src/ViewModels/DeleteBranch.cs new file mode 100644 index 00000000..0421cf04 --- /dev/null +++ b/src/ViewModels/DeleteBranch.cs @@ -0,0 +1,32 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DeleteBranch : Popup { + public Models.Branch Target { + get; + private set; + } + + public DeleteBranch(Repository repo, Models.Branch branch) { + _repo = repo; + Target = branch; + View = new Views.DeleteBranch() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + if (Target.IsLocal) { + Commands.Branch.Delete(_repo.FullPath, Target.Name); + } else { + new Commands.Push(_repo.FullPath, Target.Remote, Target.Name).Exec(); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/DeleteRemote.cs b/src/ViewModels/DeleteRemote.cs new file mode 100644 index 00000000..2ede9853 --- /dev/null +++ b/src/ViewModels/DeleteRemote.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DeleteRemote : Popup { + public Models.Remote Remote { + get; + private set; + } + + public DeleteRemote(Repository repo, Models.Remote remote) { + _repo = repo; + Remote = remote; + View = new Views.DeleteRemote() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription("Deleting remote ..."); + var succ = new Commands.Remote(_repo.FullPath).Delete(Remote.Name); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs new file mode 100644 index 00000000..03e4e9ef --- /dev/null +++ b/src/ViewModels/DeleteRepositoryNode.cs @@ -0,0 +1,22 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DeleteRepositoryNode : Popup { + public RepositoryNode Node { + get => _node; + set => SetProperty(ref _node, value); + } + + public DeleteRepositoryNode(RepositoryNode node) { + _node = node; + View = new Views.DeleteRepositoryNode() { DataContext = this }; + } + + public override Task Sure() { + Preference.RemoveNode(_node); + return null; + } + + private RepositoryNode _node = null; + } +} diff --git a/src/ViewModels/DeleteSubmodule.cs b/src/ViewModels/DeleteSubmodule.cs new file mode 100644 index 00000000..2d7f1d5c --- /dev/null +++ b/src/ViewModels/DeleteSubmodule.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DeleteSubmodule : Popup { + + public string Submodule { + get; + private set; + } + + public DeleteSubmodule(Repository repo, string submodule) { + _repo = repo; + Submodule = submodule; + View = new Views.DeleteSubmodule() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.Submodule(_repo.FullPath).Delete(Submodule); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/DeleteTag.cs b/src/ViewModels/DeleteTag.cs new file mode 100644 index 00000000..3b33e000 --- /dev/null +++ b/src/ViewModels/DeleteTag.cs @@ -0,0 +1,35 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DeleteTag : Popup { + public Models.Tag Target { + get; + private set; + } + + public bool ShouldPushToRemote { + get; + set; + } + + public DeleteTag(Repository repo, Models.Tag tag) { + _repo = repo; + Target = tag; + ShouldPushToRemote = true; + View = new Views.DeleteTag() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Deleting tag '{Target.Name}' ..."); + var remotes = ShouldPushToRemote ? _repo.Remotes : null; + var succ = Commands.Tag.Delete(_repo.FullPath, Target.Name, remotes); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs new file mode 100644 index 00000000..da8fa957 --- /dev/null +++ b/src/ViewModels/DiffContext.cs @@ -0,0 +1,105 @@ +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DiffContext : ObservableObject { + public string FilePath { + get => _option.Path; + } + + public bool IsOrgFilePathVisible { + get => !string.IsNullOrWhiteSpace(_option.OrgPath) && _option.OrgPath != "/dev/null"; + } + + public string OrgFilePath { + get => _option.OrgPath; + } + + public bool IsLoading { + get => _isLoading; + private set => SetProperty(ref _isLoading, value); + } + + public bool IsNoChange { + get => _isNoChange; + private set => SetProperty(ref _isNoChange, value); + } + + public bool IsTextDiff { + get => _isTextDiff; + private set => SetProperty(ref _isTextDiff, value); + } + + public object Content { + get => _content; + private set => SetProperty(ref _content, value); + } + + public DiffContext(string repo, Models.DiffOption option) { + _repo = repo; + _option = option; + + OnPropertyChanged(nameof(FilePath)); + OnPropertyChanged(nameof(IsOrgFilePathVisible)); + OnPropertyChanged(nameof(OrgFilePath)); + + Task.Run(() => { + var latest = new Commands.Diff(repo, option).Result(); + var binaryDiff = null as Models.BinaryDiff; + + if (latest.IsBinary) { + binaryDiff = new Models.BinaryDiff(); + + var oldPath = string.IsNullOrEmpty(_option.OrgPath) ? _option.Path : _option.OrgPath; + if (option.Revisions.Count == 2) { + binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, option.Revisions[0]).Result(); + binaryDiff.NewSize = new Commands.QueryFileSize(repo, _option.Path, option.Revisions[1]).Result(); + } else { + binaryDiff.OldSize = new Commands.QueryFileSize(repo, oldPath, "HEAD").Result(); + binaryDiff.NewSize = new FileInfo(Path.Combine(repo, _option.Path)).Length; + } + } + + Dispatcher.UIThread.InvokeAsync(() => { + if (latest.IsBinary) { + Content = binaryDiff; + } else if (latest.IsLFS) { + Content = latest.LFSDiff; + } else if (latest.TextDiff != null) { + latest.TextDiff.File = _option.Path; + Content = latest.TextDiff; + IsTextDiff = true; + } else { + IsTextDiff = false; + IsNoChange = true; + } + + IsLoading = false; + }); + }); + } + + public async void OpenExternalMergeTool() { + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; + + var tool = Models.ExternalMergeTools.Supported.Find(x => x.Type == type); + if (tool == null || !File.Exists(exec)) { + App.RaiseException(_repo, "Invalid merge tool in preference setting!"); + return; + } + + var args = tool.Type != 0 ? tool.DiffCmd : Preference.Instance.ExternalMergeToolDiffCmd; + await Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, exec, args, _option)); + } + + private string _repo = string.Empty; + private Models.DiffOption _option = null; + private bool _isLoading = true; + private bool _isNoChange = false; + private bool _isTextDiff = false; + private object _content = null; + } +} diff --git a/src/ViewModels/Discard.cs b/src/ViewModels/Discard.cs new file mode 100644 index 00000000..4f091448 --- /dev/null +++ b/src/ViewModels/Discard.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DiscardModeAll { } + public class DiscardModeSingle { public string File { get; set; } } + public class DiscardModeMulti { public int Count { get; set; } } + + public class Discard : Popup { + + public object Mode { + get; + private set; + } + + public Discard(Repository repo, List changes = null) { + _repo = repo; + _changes = changes; + + if (_changes == null) { + Mode = new DiscardModeAll(); + } else if (_changes.Count == 1) { + Mode = new DiscardModeSingle() { File = _changes[0].Path }; + } else { + Mode = new DiscardModeMulti() { Count = _changes.Count }; + } + + View = new Views.Discard() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + if (_changes == null) { + SetProgressDescription("Discard all local changes ..."); + Commands.Discard.All(_repo.FullPath); + } else { + SetProgressDescription($"Discard total {_changes.Count} changes ..."); + Commands.Discard.Changes(_repo.FullPath, _changes); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private List _changes = null; + } +} diff --git a/src/ViewModels/DropStash.cs b/src/ViewModels/DropStash.cs new file mode 100644 index 00000000..767bdd9f --- /dev/null +++ b/src/ViewModels/DropStash.cs @@ -0,0 +1,22 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class DropStash : Popup { + public Models.Stash Stash { get; private set; } + + public DropStash(string repo, Models.Stash stash) { + _repo = repo; + Stash = stash; + View = new Views.DropStash() { DataContext = this }; + } + + public override Task Sure() { + return Task.Run(() => { + new Commands.Stash(_repo).Drop(Stash.Name); + return true; + }); + } + + private string _repo; + } +} diff --git a/src/ViewModels/EditRemote.cs b/src/ViewModels/EditRemote.cs new file mode 100644 index 00000000..48082cc2 --- /dev/null +++ b/src/ViewModels/EditRemote.cs @@ -0,0 +1,100 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class EditRemote : Popup { + [Required(ErrorMessage = "Remote name is required!!!")] + [RegularExpression(@"^[\w\-\.]+$", ErrorMessage = "Bad remote name format!!!")] + [CustomValidation(typeof(EditRemote), nameof(ValidateRemoteName))] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + [Required(ErrorMessage = "Remote URL is required!!!")] + [CustomValidation(typeof(EditRemote), nameof(ValidateRemoteURL))] + public string Url { + get => _url; + set { + if (SetProperty(ref _url, value, true)) UseSSH = Models.Remote.IsSSH(value); + } + } + + public bool UseSSH { + get => _useSSH; + set => SetProperty(ref _useSSH, value); + } + + public string SSHKey { + get; + set; + } + + public EditRemote(Repository repo, Models.Remote remote) { + _repo = repo; + _remote = remote; + _name = remote.Name; + _url = remote.URL; + _useSSH = Models.Remote.IsSSH(remote.URL); + + if (_useSSH) { + SSHKey = new Commands.Config(repo.FullPath).Get($"remote.{remote.Name}.sshkey"); + } + + View = new Views.EditRemote() { DataContext = this }; + } + + public static ValidationResult ValidateRemoteName(string name, ValidationContext ctx) { + if (ctx.ObjectInstance is EditRemote edit) { + foreach (var remote in edit._repo.Remotes) { + if (remote != edit._remote && name == remote.Name) new ValidationResult("A remote with given name already exists!!!"); + } + } + + return ValidationResult.Success; + } + + public static ValidationResult ValidateRemoteURL(string url, ValidationContext ctx) { + if (ctx.ObjectInstance is EditRemote edit) { + if (!Models.Remote.IsValidURL(url)) return new ValidationResult("Bad remote URL format!!!"); + + foreach (var remote in edit._repo.Remotes) { + if (remote != edit._remote && url == remote.URL) new ValidationResult("A remote with the same url already exists!!!"); + } + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Editing remote '{_remote.Name}' ..."); + + if (_remote.Name != _name) { + var succ = new Commands.Remote(_repo.FullPath).Rename(_remote.Name, _name); + if (succ) _remote.Name = _name; + } + + if (_remote.URL != _url) { + var succ = new Commands.Remote(_repo.FullPath).SetURL(_name, _url); + if (succ) _remote.URL = _url; + } + + if (_useSSH) { + SetProgressDescription("Post processing ..."); + new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private Models.Remote _remote = null; + private string _name = string.Empty; + private string _url = string.Empty; + private bool _useSSH = false; + } +} diff --git a/src/ViewModels/EditRepositoryNode.cs b/src/ViewModels/EditRepositoryNode.cs new file mode 100644 index 00000000..6111b72e --- /dev/null +++ b/src/ViewModels/EditRepositoryNode.cs @@ -0,0 +1,55 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class EditRepositoryNode : Popup { + public RepositoryNode Node { + get => _node; + set => SetProperty(ref _node, value); + } + + public string Id { + get => _id; + set => SetProperty(ref _id, value); + } + + [Required(ErrorMessage = "Name is required!")] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + public int Bookmark { + get => _bookmark; + set => SetProperty(ref _bookmark, value); + } + + public bool IsRepository { + get => _isRepository; + set => SetProperty(ref _isRepository, value); + } + + public EditRepositoryNode(RepositoryNode node) { + _node = node; + _id = node.Id; + _name = node.Name; + _isRepository = node.IsRepository; + _bookmark = node.Bookmark; + + View = new Views.EditRepositoryNode() { DataContext = this }; + } + + public override Task Sure() { + _node.Name = _name; + _node.Bookmark = _bookmark; + return null; + } + + private RepositoryNode _node = null; + private string _id = string.Empty; + private string _name = string.Empty; + private bool _isRepository = false; + private int _bookmark = 0; + } +} diff --git a/src/ViewModels/FastForwardWithoutCheckout.cs b/src/ViewModels/FastForwardWithoutCheckout.cs new file mode 100644 index 00000000..d9eb5462 --- /dev/null +++ b/src/ViewModels/FastForwardWithoutCheckout.cs @@ -0,0 +1,34 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class FastForwardWithoutCheckout : Popup { + public Models.Branch Local { + get; + private set; + } + + public Models.Branch To { + get; + private set; + } + + public FastForwardWithoutCheckout(Repository repo, Models.Branch local, Models.Branch upstream) { + _repo = repo; + Local = local; + To = upstream; + View = new Views.FastForwardWithoutCheckout() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription("Fast-Forward ..."); + new Commands.Fetch(_repo.FullPath, To.Remote, Local.Name, To.Name, SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs new file mode 100644 index 00000000..e5d94c77 --- /dev/null +++ b/src/ViewModels/Fetch.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Fetch : Popup { + public List Remotes { + get => _repo.Remotes; + } + + public bool FetchAllRemotes { + get => _fetchAllRemotes; + set => SetProperty(ref _fetchAllRemotes, value); + } + + public Models.Remote SelectedRemote { + get; + set; + } + + public bool Prune { + get; + set; + } + + public Fetch(Repository repo, Models.Remote preferedRemote = null) { + _repo = repo; + _fetchAllRemotes = true; + SelectedRemote = preferedRemote != null ? preferedRemote : _repo.Remotes[0]; + Prune = true; + View = new Views.Fetch() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + if (FetchAllRemotes) { + foreach (var remote in _repo.Remotes) { + SetProgressDescription($"Fetching remote: {remote.Name}"); + new Commands.Fetch(_repo.FullPath, remote.Name, Prune, SetProgressDescription).Exec(); + } + } else { + SetProgressDescription($"Fetching remote: {SelectedRemote.Name}"); + new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, Prune, SetProgressDescription).Exec(); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private bool _fetchAllRemotes = true; + } +} diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs new file mode 100644 index 00000000..90356484 --- /dev/null +++ b/src/ViewModels/FileHistories.cs @@ -0,0 +1,66 @@ +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class FileHistories : ObservableObject { + public string File { + get => _file; + } + + public bool IsLoading { + get => _isLoading; + private set => SetProperty(ref _isLoading, value); + } + + public List Commits { + get => _commits; + set => SetProperty(ref _commits, value); + } + + public Models.Commit SelectedCommit { + get => _selectedCommit; + set { + if (SetProperty(ref _selectedCommit, value)) { + if (value == null) { + DiffContext = null; + } else { + DiffContext = new DiffContext(_repo, new Models.DiffOption(value, _file)); + } + } + } + } + + public DiffContext DiffContext { + get => _diffContext; + set => SetProperty(ref _diffContext, value); + } + + public FileHistories(string repo, string file) { + _repo = repo; + _file = file; + + Task.Run(() => { + var commits = new Commands.QueryCommits(_repo, $"-n 10000 -- \"{file}\"").Result(); + Dispatcher.UIThread.Invoke(() => { + IsLoading = false; + Commits = commits; + if (commits.Count > 0) SelectedCommit = commits[0]; + }); + }); + } + + public void NavigateToCommit(string commitSHA) { + var repo = Preference.FindRepository(_repo); + if (repo != null) repo.NavigateToCommit(commitSHA); + } + + private string _repo = string.Empty; + private string _file = string.Empty; + private bool _isLoading = true; + private List _commits = null; + private Models.Commit _selectedCommit = null; + private DiffContext _diffContext = null; + } +} diff --git a/src/ViewModels/FileTreeNode.cs b/src/ViewModels/FileTreeNode.cs new file mode 100644 index 00000000..94f30561 --- /dev/null +++ b/src/ViewModels/FileTreeNode.cs @@ -0,0 +1,170 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections.Generic; + +namespace SourceGit.ViewModels { + public class FileTreeNode : ObservableObject { + public string FullPath { get; set; } = string.Empty; + public bool IsFolder { get; set; } = false; + public object Backend { get; set; } = null; + public List Children { get; set; } = new List(); + + public bool IsExpanded { + get => _isExpanded; + set => SetProperty(ref _isExpanded, value); + } + + public static List Build(List changes) { + var nodes = new List(); + var folders = new Dictionary(); + var expanded = changes.Count <= 50; + + foreach (var c in changes) { + var sepIdx = c.Path.IndexOf('/'); + if (sepIdx == -1) { + nodes.Add(new FileTreeNode() { + FullPath = c.Path, + Backend = c, + IsFolder = false, + IsExpanded = false + }); + } else { + FileTreeNode lastFolder = null; + var start = 0; + + while (sepIdx != -1) { + var folder = c.Path.Substring(0, sepIdx); + if (folders.ContainsKey(folder)) { + lastFolder = folders[folder]; + } else if (lastFolder == null) { + lastFolder = new FileTreeNode() { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + nodes.Add(lastFolder); + folders.Add(folder, lastFolder); + } else { + var cur = new FileTreeNode() { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + folders.Add(folder, cur); + lastFolder.Children.Add(cur); + lastFolder = cur; + } + + start = sepIdx + 1; + sepIdx = c.Path.IndexOf('/', start); + } + + lastFolder.Children.Add(new FileTreeNode() { + FullPath = c.Path, + Backend = c, + IsFolder = false, + IsExpanded = false + }); + } + } + + folders.Clear(); + Sort(nodes); + return nodes; + } + + public static List Build(List files) { + var nodes = new List(); + var folders = new Dictionary(); + var expanded = files.Count <= 50; + + foreach (var f in files) { + var sepIdx = f.Path.IndexOf('/'); + if (sepIdx == -1) { + nodes.Add(new FileTreeNode() { + FullPath = f.Path, + Backend = f, + IsFolder = false, + IsExpanded = false + }); + } else { + FileTreeNode lastFolder = null; + var start = 0; + + while (sepIdx != -1) { + var folder = f.Path.Substring(0, sepIdx); + if (folders.ContainsKey(folder)) { + lastFolder = folders[folder]; + } else if (lastFolder == null) { + lastFolder = new FileTreeNode() { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + nodes.Add(lastFolder); + folders.Add(folder, lastFolder); + } else { + var cur = new FileTreeNode() { + FullPath = folder, + Backend = null, + IsFolder = true, + IsExpanded = expanded + }; + folders.Add(folder, cur); + lastFolder.Children.Add(cur); + lastFolder = cur; + } + + start = sepIdx + 1; + sepIdx = f.Path.IndexOf('/', start); + } + + lastFolder.Children.Add(new FileTreeNode() { + FullPath = f.Path, + Backend = f, + IsFolder = false, + IsExpanded = false + }); + } + } + + folders.Clear(); + Sort(nodes); + return nodes; + } + + public static FileTreeNode SelectByPath(List nodes, string path) { + foreach (var node in nodes) { + if (node.FullPath == path) return node; + + if (node.IsFolder && path.StartsWith(node.FullPath + "/")) { + var foundInChildren = SelectByPath(node.Children, path); + if (foundInChildren != null) { + node.IsExpanded = true; + } + return foundInChildren; + } + } + + return null; + } + + private static void Sort(List nodes) { + nodes.Sort((l, r) => { + if (l.IsFolder == r.IsFolder) { + return l.FullPath.CompareTo(r.FullPath); + } else { + return l.IsFolder ? -1 : 1; + } + }); + + foreach (var node in nodes) { + if (node.Children.Count > 1) Sort(node.Children); + } + } + + private bool _isExpanded = true; + } +} diff --git a/src/ViewModels/GitFlowFinish.cs b/src/ViewModels/GitFlowFinish.cs new file mode 100644 index 00000000..a50251ce --- /dev/null +++ b/src/ViewModels/GitFlowFinish.cs @@ -0,0 +1,48 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class GitFlowFinish : Popup { + public Models.Branch Branch => _branch; + public bool IsFeature => _type == Models.GitFlowBranchType.Feature; + public bool IsRelease => _type == Models.GitFlowBranchType.Release; + public bool IsHotfix => _type == Models.GitFlowBranchType.Hotfix; + + public bool KeepBranch { + get; + set; + } = false; + + public GitFlowFinish(Repository repo, Models.Branch branch, Models.GitFlowBranchType type) { + _repo = repo; + _branch = branch; + _type = type; + View = new Views.GitFlowFinish() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var branch = _branch.Name; + switch (_type) { + case Models.GitFlowBranchType.Feature: + branch = branch.Substring(_repo.GitFlow.Feature.Length); + break; + case Models.GitFlowBranchType.Release: + branch = branch.Substring(_repo.GitFlow.Release.Length); + break; + default: + branch = branch.Substring(_repo.GitFlow.Hotfix.Length); + break; + } + + var succ = new Commands.GitFlow(_repo.FullPath).Finish(_type, branch, KeepBranch); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private Models.Branch _branch = null; + private Models.GitFlowBranchType _type = Models.GitFlowBranchType.None; + } +} diff --git a/src/ViewModels/GitFlowStart.cs b/src/ViewModels/GitFlowStart.cs new file mode 100644 index 00000000..d1e4cf5c --- /dev/null +++ b/src/ViewModels/GitFlowStart.cs @@ -0,0 +1,67 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class GitFlowStart : Popup { + [Required(ErrorMessage = "Name is required!!!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] + [CustomValidation(typeof(GitFlowStart), nameof(ValidateBranchName))] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + public string Prefix { + get => _prefix; + } + + public bool IsFeature => _type == Models.GitFlowBranchType.Feature; + public bool IsRelease => _type == Models.GitFlowBranchType.Release; + public bool IsHotfix => _type == Models.GitFlowBranchType.Hotfix; + + public GitFlowStart(Repository repo, Models.GitFlowBranchType type) { + _repo = repo; + _type = type; + + switch (type) { + case Models.GitFlowBranchType.Feature: + _prefix = repo.GitFlow.Feature; + break; + case Models.GitFlowBranchType.Release: + _prefix = repo.GitFlow.Release; + break; + default: + _prefix = repo.GitFlow.Hotfix; + break; + } + + View = new Views.GitFlowStart() { DataContext = this }; + } + + public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { + if (ctx.ObjectInstance is GitFlowStart starter) { + var check = $"{starter._prefix}{name}"; + foreach (var b in starter._repo.Branches) { + var test = b.IsLocal ? b.Name : $"{b.Remote}/{b.Name}"; + if (test == check) return new ValidationResult("A branch with same name already exists!"); + } + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.GitFlow(_repo.FullPath).Start(_type, _name); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private Models.GitFlowBranchType _type = Models.GitFlowBranchType.Feature; + private string _prefix = string.Empty; + private string _name = null; + } +} diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs new file mode 100644 index 00000000..3a9222e9 --- /dev/null +++ b/src/ViewModels/Histories.cs @@ -0,0 +1,473 @@ +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Platform.Storage; +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class CountSelectedCommits { + public int Count { get; set; } + } + + public class Histories : ObservableObject { + public bool IsLoading { + get => _isLoading; + set => SetProperty(ref _isLoading, value); + } + + public double DataGridRowHeight { + get => _dataGridRowHeight; + } + + public List Commits { + get => _commits; + set { + if (SetProperty(ref _commits, value)) { + Graph = null; + Task.Run(() => { + var graph = Models.CommitGraph.Parse(value, DataGridRowHeight, 8); + Dispatcher.UIThread.Invoke(() => { + Graph = graph; + }); + }); + } + } + } + + public Models.CommitGraph Graph { + get => _graph; + set => SetProperty(ref _graph, value); + } + + public Models.Commit AutoSelectedCommit { + get => _autoSelectedCommit; + private set => SetProperty(ref _autoSelectedCommit, value); + } + + public object DetailContext { + get => _detailContext; + private set => SetProperty(ref _detailContext, value); + } + + public Histories(Repository repo) { + _repo = repo; + } + + public void NavigateTo(string commitSHA) { + var commit = _commits.Find(x => x.SHA.StartsWith(commitSHA)); + if (commit != null) { + AutoSelectedCommit = commit; + + if (_detailContext is CommitDetail detail) { + detail.Commit = commit; + } else { + var commitDetail = new CommitDetail(_repo.FullPath); + commitDetail.Commit = commit; + DetailContext = commitDetail; + } + } + } + + public void Select(IList commits) { + if (commits.Count == 0) { + DetailContext = null; + } else if (commits.Count == 1) { + var commit = commits[0] as Models.Commit; + AutoSelectedCommit = commit; + + if (_detailContext is CommitDetail detail) { + detail.Commit = commit; + } else { + var commitDetail = new CommitDetail(_repo.FullPath); + commitDetail.Commit = commit; + DetailContext = commitDetail; + } + } 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 { + DetailContext = new CountSelectedCommits() { Count = commits.Count }; + } + } + + public ContextMenu MakeContextMenu() { + var detail = _detailContext as CommitDetail; + if (detail == null) return null; + + var current = _repo.Branches.Find(x => x.IsCurrent); + if (current == null) return null; + + var commit = detail.Commit; + var menu = new ContextMenu(); + var tags = new List(); + + 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) { + 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) { + 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) { + var t = _repo.Tags.Find(x => x.Name == d.Name); + if (t != null) tags.Add(t); + } + } + + if (menu.Items.Count > 0) menu.Items.Add(new MenuItem() { Header = "-" }); + } + + if (tags.Count > 0) { + foreach (var tag in tags) FillTagMenu(menu, tag); + menu.Items.Add(new MenuItem() { Header = "-" }); + } + + if (current.Head != commit.SHA) { + var reset = new MenuItem(); + reset.Header = App.Text("CommitCM.Reset", current.Name); + reset.Icon = CreateMenuIcon("Icons.Reset"); + reset.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Reset(_repo, current, commit)); + e.Handled = true; + }; + menu.Items.Add(reset); + } else { + var reword = new MenuItem(); + reword.Header = App.Text("CommitCM.Reword"); + reword.Icon = CreateMenuIcon("Icons.Edit"); + reword.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Reword(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(reword); + + var squash = new MenuItem(); + squash.Header = App.Text("CommitCM.Squash"); + squash.Icon = CreateMenuIcon("Icons.SquashIntoParent"); + squash.IsEnabled = 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) { + var rebase = new MenuItem(); + rebase.Header = App.Text("CommitCM.Rebase", current.Name); + rebase.Icon = CreateMenuIcon("Icons.Rebase"); + rebase.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Rebase(_repo, current, commit)); + e.Handled = true; + }; + menu.Items.Add(rebase); + + var cherryPick = new MenuItem(); + cherryPick.Header = App.Text("CommitCM.CherryPick"); + cherryPick.Icon = CreateMenuIcon("Icons.CherryPick"); + cherryPick.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CherryPick(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(cherryPick); + } else { + var revert = new MenuItem(); + revert.Header = App.Text("CommitCM.Revert"); + revert.Icon = CreateMenuIcon("Icons.Undo"); + revert.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Revert(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(revert); + } + + menu.Items.Add(new MenuItem() { Header = "-" }); + + var createBranch = new MenuItem(); + createBranch.Icon = CreateMenuIcon("Icons.Branch.Add"); + createBranch.Header = App.Text("CreateBranch"); + createBranch.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(createBranch); + + var createTag = new MenuItem(); + createTag.Icon = CreateMenuIcon("Icons.Tag.Add"); + createTag.Header = App.Text("CreateTag"); + createTag.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateTag(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(createTag); + menu.Items.Add(new MenuItem() { Header = "-" }); + + var saveToPatch = new MenuItem(); + saveToPatch.Icon = CreateMenuIcon("Icons.Diff"); + saveToPatch.Header = App.Text("CommitCM.SaveAsPatch"); + 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) { + var succ = new Commands.FormatPatch(_repo.FullPath, commit.SHA, selected[0].Path.LocalPath).Exec(); + if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + } + + e.Handled = true; + }; + menu.Items.Add(saveToPatch); + + var archive = new MenuItem(); + archive.Icon = CreateMenuIcon("Icons.Archive"); + archive.Header = App.Text("Archive"); + archive.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Archive(_repo, commit)); + e.Handled = true; + }; + menu.Items.Add(archive); + menu.Items.Add(new MenuItem() { Header = "-" }); + + var copySHA = new MenuItem(); + copySHA.Header = App.Text("CommitCM.CopySHA"); + copySHA.Icon = CreateMenuIcon("Icons.Copy"); + copySHA.Click += (o, e) => { + App.CopyText(commit.SHA); + e.Handled = true; + }; + menu.Items.Add(copySHA); + return menu; + } + + private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current) { + var submenu = new MenuItem(); + submenu.Icon = CreateMenuIcon("Icons.Branch"); + submenu.Header = current.Name; + + var dirty = !string.IsNullOrEmpty(current.UpstreamTrackStatus); + if (!string.IsNullOrEmpty(current.Upstream)) { + var upstream = current.Upstream.Substring(13); + + var fastForward = new MenuItem(); + fastForward.Header = App.Text("BranchCM.FastForward", upstream); + fastForward.Icon = CreateMenuIcon("Icons.FastForward"); + fastForward.IsEnabled = dirty; + fastForward.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Merge(_repo, upstream, current.Name)); + e.Handled = true; + }; + submenu.Items.Add(fastForward); + + var pull = new MenuItem(); + pull.Header = App.Text("BranchCM.Pull", upstream); + pull.Icon = CreateMenuIcon("Icons.Pull"); + pull.IsEnabled = dirty; + pull.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Pull(_repo, null)); + e.Handled = true; + }; + submenu.Items.Add(pull); + } + + var push = new MenuItem(); + push.Header = App.Text("BranchCM.Push", current.Name); + push.Icon = CreateMenuIcon("Icons.Push"); + push.IsEnabled = _repo.Remotes.Count > 0 && dirty; + push.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Push(_repo, current)); + e.Handled = true; + }; + submenu.Items.Add(push); + submenu.Items.Add(new MenuItem() { Header = "-" }); + + var type = _repo.GitFlow.GetBranchType(current.Name); + if (type != Models.GitFlowBranchType.None) { + var finish = new MenuItem(); + finish.Header = App.Text("BranchCM.Finish", current.Name); + finish.Icon = CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowFinish(_repo, current, type)); + e.Handled = true; + }; + submenu.Items.Add(finish); + submenu.Items.Add(new MenuItem() { Header = "-" }); + } + + var rename = new MenuItem(); + rename.Header = App.Text("BranchCM.Rename", current.Name); + rename.Icon = CreateMenuIcon("Icons.Rename"); + rename.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new RenameBranch(_repo, current)); + e.Handled = true; + }; + submenu.Items.Add(rename); + + menu.Items.Add(submenu); + } + + private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged) { + var submenu = new MenuItem(); + submenu.Icon = CreateMenuIcon("Icons.Branch"); + submenu.Header = branch.Name; + + var checkout = new MenuItem(); + checkout.Header = App.Text("BranchCM.Checkout", branch.Name); + checkout.Icon = CreateMenuIcon("Icons.Check"); + checkout.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Checkout(_repo, branch.Name)); + e.Handled = true; + }; + submenu.Items.Add(checkout); + + var merge = new MenuItem(); + merge.Header = App.Text("BranchCM.Merge", branch.Name, current.Name); + merge.Icon = CreateMenuIcon("Icons.Merge"); + merge.IsEnabled = !merged; + merge.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(_repo, branch.Name, current.Name)); + e.Handled = true; + }; + submenu.Items.Add(merge); + submenu.Items.Add(new MenuItem() { Header = "-" }); + + var type = _repo.GitFlow.GetBranchType(branch.Name); + if (type != Models.GitFlowBranchType.None) { + var finish = new MenuItem(); + finish.Header = App.Text("BranchCM.Finish", branch.Name); + finish.Icon = CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowFinish(_repo, branch, type)); + e.Handled = true; + }; + submenu.Items.Add(finish); + submenu.Items.Add(new MenuItem() { Header = "-" }); + } + + var rename = new MenuItem(); + rename.Header = App.Text("BranchCM.Rename", branch.Name); + rename.Icon = CreateMenuIcon("Icons.Rename"); + rename.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new RenameBranch(_repo, branch)); + e.Handled = true; + }; + submenu.Items.Add(rename); + + var delete = new MenuItem(); + delete.Header = App.Text("BranchCM.Delete", branch.Name); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(_repo, branch)); + e.Handled = true; + }; + submenu.Items.Add(delete); + + menu.Items.Add(submenu); + } + + private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models.Branch current, bool merged) { + var name = $"{branch.Remote}/{branch.Name}"; + + var submenu = new MenuItem(); + submenu.Icon = CreateMenuIcon("Icons.Branch"); + submenu.Header = name; + + var checkout = new MenuItem(); + checkout.Header = App.Text("BranchCM.Checkout", name); + checkout.Icon = CreateMenuIcon("Icons.Check"); + 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; + } + } + + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(_repo, branch)); + e.Handled = true; + }; + submenu.Items.Add(checkout); + + var merge = new MenuItem(); + merge.Header = App.Text("BranchCM.Merge", name, current.Name); + merge.Icon = CreateMenuIcon("Icons.Merge"); + merge.IsEnabled = !merged; + merge.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(_repo, name, current.Name)); + e.Handled = true; + }; + + submenu.Items.Add(merge); + submenu.Items.Add(new MenuItem() { Header = "-" }); + + var delete = new MenuItem(); + delete.Header = App.Text("BranchCM.Delete", name); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(_repo, branch)); + e.Handled = true; + }; + submenu.Items.Add(delete); + + menu.Items.Add(submenu); + } + + private void FillTagMenu(ContextMenu menu, Models.Tag tag) { + var submenu = new MenuItem(); + submenu.Header = tag.Name; + submenu.Icon = CreateMenuIcon("Icons.Tag"); + submenu.MinWidth = 200; + + var push = new MenuItem(); + push.Header = App.Text("TagCM.Push", tag.Name); + push.Icon = CreateMenuIcon("Icons.Push"); + push.IsEnabled = _repo.Remotes.Count > 0; + push.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new PushTag(_repo, tag)); + e.Handled = true; + }; + submenu.Items.Add(push); + + var delete = new MenuItem(); + delete.Header = App.Text("TagCM.Delete", tag.Name); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteTag(_repo, tag)); + e.Handled = true; + }; + submenu.Items.Add(delete); + + menu.Items.Add(submenu); + } + + private Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) { + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 12; + icon.Height = 12; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource(key) as StreamGeometry; + return icon; + } + + private Repository _repo = null; + private double _dataGridRowHeight = 28; + private bool _isLoading = true; + private List _commits = new List(); + private Models.CommitGraph _graph = null; + private Models.Commit _autoSelectedCommit = null; + private object _detailContext = null; + } +} diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs new file mode 100644 index 00000000..f95ed80d --- /dev/null +++ b/src/ViewModels/Init.cs @@ -0,0 +1,41 @@ +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Init : Popup { + public string TargetPath { + get => _targetPath; + set => SetProperty(ref _targetPath, value); + } + + public Init(string path) { + TargetPath = path; + View = new Views.Init() { DataContext = this }; + } + + public override Task Sure() { + return Task.Run(() => { + SetProgressDescription($"Initialize git repository at: '{_targetPath}'"); + var succ = new Commands.Init(HostPageId, _targetPath).Exec(); + if (!succ) return false; + + var gitDir = Path.GetFullPath(Path.Combine(_targetPath, ".git")); + + CallUIThread(() => { + var repo = Preference.AddRepository(_targetPath, gitDir); + var node = new RepositoryNode() { + Id = _targetPath, + Name = Path.GetFileName(_targetPath), + Bookmark = 0, + IsRepository = true, + }; + Preference.AddNode(node); + }); + + return true; + }); + } + + private string _targetPath; + } +} diff --git a/src/ViewModels/InitGitFlow.cs b/src/ViewModels/InitGitFlow.cs new file mode 100644 index 00000000..724310ee --- /dev/null +++ b/src/ViewModels/InitGitFlow.cs @@ -0,0 +1,96 @@ +using System.ComponentModel.DataAnnotations; +using System.Text.RegularExpressions; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class InitGitFlow : Popup { + private static readonly Regex TAG_PREFIX = new Regex(@"^[\w\-/\.]+$"); + + [Required(ErrorMessage = "Master branch name is required!!!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] + [CustomValidation(typeof(InitGitFlow), nameof(ValidateBaseBranch))] + public string Master { + get => _master; + set => SetProperty(ref _master, value, true); + } + + [Required(ErrorMessage = "Develop branch name is required!!!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] + [CustomValidation(typeof(InitGitFlow), nameof(ValidateBaseBranch))] + public string Develop { + get => _develop; + set => SetProperty(ref _develop, value, true); + } + + [Required(ErrorMessage = "Feature prefix is required!!!")] + [RegularExpression(@"^[\w\-\.]+/$", ErrorMessage = "Bad feature prefix format!")] + public string FeturePrefix { + get => _featurePrefix; + set => SetProperty(ref _featurePrefix, value, true); + } + + [Required(ErrorMessage = "Release prefix is required!!!")] + [RegularExpression(@"^[\w\-\.]+/$", ErrorMessage = "Bad release prefix format!")] + public string ReleasePrefix { + get => _releasePrefix; + set => SetProperty(ref _releasePrefix, value, true); + } + + [Required(ErrorMessage = "Hotfix prefix is required!!!")] + [RegularExpression(@"^[\w\-\.]+/$", ErrorMessage = "Bad hotfix prefix format!")] + public string HotfixPrefix { + get => _hotfixPrefix; + set => SetProperty(ref _hotfixPrefix, value, true); + } + + [CustomValidation(typeof(InitGitFlow), nameof(ValidateTagPrefix))] + public string TagPrefix { + get => _tagPrefix; + set => SetProperty(ref _tagPrefix, value, true); + } + + public InitGitFlow(Repository repo) { + _repo = repo; + View = new Views.InitGitFlow() { DataContext = this }; + } + + public static ValidationResult ValidateBaseBranch(string _, ValidationContext ctx) { + if (ctx.ObjectInstance is InitGitFlow initializer) { + if (initializer._master == initializer._develop) return new ValidationResult("Develop branch has the same name with master branch!"); + } + + return ValidationResult.Success; + } + + public static ValidationResult ValidateTagPrefix(string tagPrefix, ValidationContext ctx) { + if (!string.IsNullOrWhiteSpace(tagPrefix) && !TAG_PREFIX.IsMatch(tagPrefix)) { + return new ValidationResult("Bad tag prefix format!"); + } + + return ValidationResult.Success; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.GitFlow(_repo.FullPath).Init(_repo.Branches, _master, _develop, _featurePrefix, _releasePrefix, _hotfixPrefix, _tagPrefix); + if (succ) { + _repo.GitFlow.Feature = _featurePrefix; + _repo.GitFlow.Release = _releasePrefix; + _repo.GitFlow.Hotfix = _hotfixPrefix; + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _master = "master"; + private string _develop = "develop"; + private string _featurePrefix = "feature/"; + private string _releasePrefix = "release/"; + private string _hotfixPrefix = "hotfix/"; + private string _tagPrefix = string.Empty; + } +} diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs new file mode 100644 index 00000000..d8754f73 --- /dev/null +++ b/src/ViewModels/Launcher.cs @@ -0,0 +1,154 @@ +using Avalonia.Collections; +using CommunityToolkit.Mvvm.ComponentModel; +using System.IO; + +namespace SourceGit.ViewModels { + public class Launcher : ObservableObject { + public AvaloniaList Pages { + get; + private set; + } + + public LauncherPage ActivePage { + get => _activePage; + set { + if (SetProperty(ref _activePage, value)) { + PopupHost.Active = value; + } + } + } + + public Launcher() { + Pages = new AvaloniaList(); + AddNewTab(); + } + + public void AddNewTab() { + var page = new LauncherPage(); + Pages.Add(page); + ActivePage = page; + } + + public void MoveTab(LauncherPage from, LauncherPage to) { + var fromIdx = Pages.IndexOf(from); + var toIdx = Pages.IndexOf(to); + Pages.Move(fromIdx, toIdx); + ActivePage = from; + } + + public void GotoNextTab() { + if (Pages.Count == 1) return; + + var activeIdx = Pages.IndexOf(_activePage); + var nextIdx = (activeIdx + 1) % Pages.Count; + ActivePage = Pages[nextIdx]; + } + + public void CloseTab(object param) { + if (Pages.Count == 1) { + App.Quit(); + return; + } + + LauncherPage page = param as LauncherPage; + if (page == null) page = _activePage; + + CloseRepositoryInTab(page); + + var removeIdx = Pages.IndexOf(page); + var activeIdx = Pages.IndexOf(_activePage); + if (removeIdx == activeIdx) { + if (removeIdx == Pages.Count - 1) { + ActivePage = Pages[removeIdx - 1]; + } else { + ActivePage = Pages[removeIdx + 1]; + } + + Pages.RemoveAt(removeIdx); + OnPropertyChanged(nameof(Pages)); + } else if (removeIdx + 1 == activeIdx) { + Pages.RemoveAt(removeIdx); + OnPropertyChanged(nameof(Pages)); + } else { + Pages.RemoveAt(removeIdx); + } + } + + public void CloseOtherTabs(object param) { + if (Pages.Count == 1) return; + + LauncherPage page = param as LauncherPage; + if (page == null) page = _activePage; + + foreach (var one in Pages) { + if (one.Node.Id != page.Node.Id) { + CloseRepositoryInTab(one); + } + } + + ActivePage = page; + Pages = new AvaloniaList { page }; + OnPropertyChanged(nameof(Pages)); + } + + public void CloseRightTabs(object param) { + LauncherPage page = param as LauncherPage; + if (page == null) page = _activePage; + + var endIdx = Pages.IndexOf(page); + var activeIdx = Pages.IndexOf(_activePage); + if (endIdx < activeIdx) { + ActivePage = page; + } + + for (var i = Pages.Count - 1; i > endIdx; i--) { + CloseRepositoryInTab(Pages[i]); + Pages.Remove(Pages[i]); + } + } + + public void OpenRepositoryInTab(RepositoryNode node, LauncherPage page) { + foreach (var one in Pages) { + if (one.Node.Id == node.Id) { + ActivePage = one; + return; + } + } + + var repo = Preference.FindRepository(node.Id); + if (repo == null || !Path.Exists(repo.FullPath)) { + var ctx = page == null ? ActivePage.Node.Id : page.Node.Id; + App.RaiseException(ctx, "Repository does NOT exists any more. Please remove it."); + return; + } + + repo.Open(); + + if (page == null) { + if (ActivePage == null || ActivePage.Node.IsRepository) { + page = new LauncherPage(node, repo); + Pages.Add(page); + } else { + page.Node = node; + page.View = new Views.Repository() { DataContext = repo }; + } + } else { + page.Node = node; + page.View = new Views.Repository() { DataContext = repo }; + } + + ActivePage = page; + } + + private void CloseRepositoryInTab(LauncherPage page) { + if (!page.Node.IsRepository) return; + + var repo = Preference.FindRepository(page.Node.Id); + if (repo == null) return; + + repo.Close(); + } + + private LauncherPage _activePage = null; + } +} diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs new file mode 100644 index 00000000..c147c270 --- /dev/null +++ b/src/ViewModels/LauncherPage.cs @@ -0,0 +1,53 @@ +using Avalonia.Collections; +using System; + +namespace SourceGit.ViewModels { + public class LauncherPage : PopupHost { + public RepositoryNode Node { + get => _node; + set => SetProperty(ref _node, value); + } + + public object View { + get => _view; + set => SetProperty(ref _view, value); + } + + public AvaloniaList Notifications { + get; + set; + } = new AvaloniaList(); + + public LauncherPage() { + _node = new RepositoryNode() { + Id = Guid.NewGuid().ToString(), + Name = "WelcomePage", + Bookmark = 0, + IsRepository = false, + }; + _view = new Views.Welcome() { DataContext = new Welcome() }; + } + + public LauncherPage(RepositoryNode node, Repository repo) { + _node = node; + _view = new Views.Repository() { DataContext = repo }; + } + + public override string GetId() { + return _node.Id; + } + + public void CopyPath() { + if (_node.IsRepository) App.CopyText(_node.Id); + } + + public void DismissNotification(object param) { + if (param is Models.Notification notice) { + Notifications.Remove(notice); + } + } + + private RepositoryNode _node = null; + private object _view = null; + } +} diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs new file mode 100644 index 00000000..b7628739 --- /dev/null +++ b/src/ViewModels/Merge.cs @@ -0,0 +1,64 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class MergeMode { + public string Name { get; set; } + public string Desc { get; set; } + public string Arg { get; set; } + + public MergeMode(string n, string d, string a) { + Name = n; + Desc = d; + Arg = a; + } + } + + public class Merge : Popup { + public string Source { + get; + private set; + } + + public string Into { + get; + private set; + } + + public List Modes { + get; + private set; + } + + public MergeMode SelectedMode { + get; + set; + } + + public Merge(Repository repo, string source, string into) { + _repo = repo; + Source = source; + Into = into; + Modes = new List() { + new MergeMode("Default", "Fast-forward if possible", ""), + new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"), + new MergeMode("Squash", "Use '--squash'", "--squash"), + new MergeMode("Don't commit", "Merge without commit", "--no-commit"), + }; + SelectedMode = Modes[0]; + View = new Views.Merge() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Merging '{Source}' into '{Into}' ..."); + var succ = new Commands.Merge(_repo.FullPath, Source, SelectedMode.Arg, SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Popup.cs b/src/ViewModels/Popup.cs new file mode 100644 index 00000000..52e99c84 --- /dev/null +++ b/src/ViewModels/Popup.cs @@ -0,0 +1,51 @@ +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Diagnostics.CodeAnalysis; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Popup : ObservableValidator { + public string HostPageId { + get; + set; + } + + public object View { + get; + set; + } + + public bool InProgress { + get => _inProgress; + set => SetProperty(ref _inProgress, value); + } + + public string ProgressDescription { + get => _progressDescription; + set => SetProperty(ref _progressDescription, value); + } + + [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode")] + public bool Check() { + if (HasErrors) return false; + ValidateAllProperties(); + return !HasErrors; + } + + public virtual Task Sure() { + return null; + } + + protected void CallUIThread(Action action) { + Dispatcher.UIThread.Invoke(action); + } + + protected void SetProgressDescription(string description) { + CallUIThread(() => ProgressDescription = description); + } + + private bool _inProgress = false; + private string _progressDescription = string.Empty; + } +} diff --git a/src/ViewModels/PopupHost.cs b/src/ViewModels/PopupHost.cs new file mode 100644 index 00000000..1d1cec02 --- /dev/null +++ b/src/ViewModels/PopupHost.cs @@ -0,0 +1,75 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace SourceGit.ViewModels { + public class PopupHost : ObservableObject { + public static PopupHost Active { + get; + set; + } = null; + + public Popup Popup { + get => _popup; + set => SetProperty(ref _popup, value); + } + + public static bool CanCreatePopup() { + return Active != null && (Active._popup == null || !Active._popup.InProgress); + } + + public static void ShowPopup(Popup popup) { + popup.HostPageId = Active.GetId(); + Active.Popup = popup; + } + + public static async void ShowAndStartPopup(Popup popup) { + popup.HostPageId = Active.GetId(); + Active.Popup = popup; + + if (!popup.Check()) return; + + popup.InProgress = true; + var task = popup.Sure(); + if (task != null) { + var finished = await task; + if (finished) { + Active.Popup = null; + } else { + popup.InProgress = false; + } + } else { + Active.Popup = null; + } + } + + public virtual string GetId() { + return string.Empty; + } + + public async void ProcessPopup() { + if (_popup != null) { + if (!_popup.Check()) return; + + _popup.InProgress = true; + var task = _popup.Sure(); + if (task != null) { + var finished = await task; + if (finished) { + Popup = null; + } else { + _popup.InProgress = false; + } + } else { + Popup = null; + } + } + } + + public void CancelPopup() { + if (_popup == null) return; + if (_popup.InProgress) return; + Popup = null; + } + + private Popup _popup = null; + } +} diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs new file mode 100644 index 00000000..03951664 --- /dev/null +++ b/src/ViewModels/Preference.cs @@ -0,0 +1,258 @@ +using Avalonia.Collections; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace SourceGit.ViewModels { + public class Preference : ObservableObject { + [JsonIgnore] + public static Preference Instance { + get { + if (_instance == null) { + if (!File.Exists(_savePath)) { + _instance = new Preference(); + } else { + try { + _instance = JsonSerializer.Deserialize(File.ReadAllText(_savePath), JsonSerializationCodeGen.Default.Preference); + } catch { + _instance = new Preference(); + } + } + } + + _instance.Repositories.RemoveAll(x => !Directory.Exists(x.FullPath)); + + if (!_instance.IsGitConfigured) { + _instance.GitInstallDir = Native.OS.FindGitInstallDir(); + } + + return _instance; + } + } + + public string Locale { + get => _locale; + set { + if (SetProperty(ref _locale, value)) { + App.SetLocale(value); + } + } + } + + public string Theme { + get => _theme; + set { + if (SetProperty(ref _theme, value)) { + App.SetTheme(value); + } + } + } + + public int MaxHistoryCommits { + get => _maxHistoryCommits; + set => SetProperty(ref _maxHistoryCommits, value); + } + + public bool RestoreTabs { + get => _restoreTabs; + set => SetProperty(ref _restoreTabs, value); + } + + public bool UseMacOSStyle { + get => _useMacOSStyle; + set => SetProperty(ref _useMacOSStyle, value); + } + + public bool UseTwoColumnsLayoutInHistories { + get => _useTwoColumnsLayoutInHistories; + set => SetProperty(ref _useTwoColumnsLayoutInHistories, value); + } + + public bool UseCombinedTextDiff { + get => _useCombinedTextDiff; + set => SetProperty(ref _useCombinedTextDiff, value); + } + + public Models.ChangeViewMode UnstagedChangeViewMode { + get => _unstagedChangeViewMode; + set => SetProperty(ref _unstagedChangeViewMode, value); + } + + public Models.ChangeViewMode StagedChangeViewMode { + get => _stagedChangeViewMode; + set => SetProperty(ref _stagedChangeViewMode, value); + } + + public Models.ChangeViewMode CommitChangeViewMode { + get => _commitChangeViewMode; + set => SetProperty(ref _commitChangeViewMode, value); + } + + [JsonIgnore] + public bool IsGitConfigured { + get => !string.IsNullOrEmpty(GitInstallDir) && Directory.Exists(GitInstallDir); + } + + public string GitInstallDir { + get => Native.OS.GitInstallDir; + set { + if (Native.OS.GitInstallDir != value) { + Native.OS.GitInstallDir = value; + OnPropertyChanged(nameof(GitInstallDir)); + } + } + } + + public string GitDefaultCloneDir { + get => _gitDefaultCloneDir; + set => SetProperty(ref _gitDefaultCloneDir, value); + } + + public bool GitAutoFetch { + get => _gitAutoFetch; + set => SetProperty(ref _gitAutoFetch, value); + } + + public int ExternalMergeToolType { + get => _externalMergeToolType; + set => SetProperty(ref _externalMergeToolType, value); + } + + public string ExternalMergeToolPath { + get => _externalMergeToolPath; + set => SetProperty(ref _externalMergeToolPath, value); + } + + public string ExternalMergeToolCmd { + get => _externalMergeToolCmd; + set => SetProperty(ref _externalMergeToolCmd, value); + } + + public string ExternalMergeToolDiffCmd { + get => _externalMergeToolDiffCmd; + set => SetProperty(ref _externalMergeToolDiffCmd, value); + } + + public List Repositories { + get; + set; + } = new List(); + + public AvaloniaList RepositoryNodes { + get => _repositoryNodes; + set => SetProperty(ref _repositoryNodes, value); + } + + public static void AddNode(RepositoryNode node, RepositoryNode to = null) { + var collection = to == null ? _instance._repositoryNodes : to.SubNodes; + var list = new List(); + list.AddRange(collection); + list.Add(node); + list.Sort((l, r) => { + if (l.IsRepository != r.IsRepository) { + return l.IsRepository ? 1 : -1; + } else { + return l.Name.CompareTo(r.Name); + } + }); + + collection.Clear(); + foreach (var one in list) { + collection.Add(one); + } + } + + public static void MoveNode(RepositoryNode node, RepositoryNode to = null) { + if (to == null && _instance._repositoryNodes.Contains(node)) return; + if (to != null && to.SubNodes.Contains(node)) return; + + RemoveNode(node); + AddNode(node, to); + } + + public static void RemoveNode(RepositoryNode node) { + RemoveNodeRecursive(node, _instance._repositoryNodes); + } + + public static Repository FindRepository(string path) { + var dir = new DirectoryInfo(path); + foreach (var repo in _instance.Repositories) { + if (repo.FullPath == dir.FullName) return repo; + } + return null; + } + + public static Repository AddRepository(string rootDir, string gitDir) { + var repo = FindRepository(rootDir); + if (repo != null) { + repo.GitDir = gitDir; + return repo; + } + + var dir = new DirectoryInfo(rootDir); + repo = new Repository() { + FullPath = dir.FullName, + GitDir = gitDir + }; + + _instance.Repositories.Add(repo); + return repo; + } + + public static void Save() { + var dir = Path.GetDirectoryName(_savePath); + if (!Directory.Exists(dir)) Directory.CreateDirectory(dir); + + var data = JsonSerializer.Serialize(_instance, JsonSerializationCodeGen.Default.Preference); + File.WriteAllText(_savePath, data); + } + + private static bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList collection) { + if (collection.Contains(node)) { + collection.Remove(node); + return true; + } + + foreach (RepositoryNode one in collection) { + if (RemoveNodeRecursive(node, one.SubNodes)) return true; + } + + return false; + } + + private static Preference _instance = null; + private static readonly string _savePath = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), + "SourceGit", + "preference.json"); + + private string _locale = "en_US"; + private string _theme = "Default"; + private int _maxHistoryCommits = 20000; + private bool _restoreTabs = false; + private bool _useMacOSStyle = OperatingSystem.IsMacOS(); + private bool _useTwoColumnsLayoutInHistories = false; + private bool _useCombinedTextDiff = true; + + private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List; + private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List; + private Models.ChangeViewMode _commitChangeViewMode = Models.ChangeViewMode.List; + + private string _gitDefaultCloneDir = string.Empty; + private bool _gitAutoFetch = false; + + private int _externalMergeToolType = 0; + private string _externalMergeToolPath = string.Empty; + private string _externalMergeToolCmd = string.Empty; + private string _externalMergeToolDiffCmd = string.Empty; + + private AvaloniaList _repositoryNodes = new AvaloniaList(); + } + + [JsonSourceGenerationOptions(WriteIndented = true, IgnoreReadOnlyFields = true, IgnoreReadOnlyProperties = true)] + [JsonSerializable(typeof(Preference))] + internal partial class JsonSerializationCodeGen : JsonSerializerContext { } +} \ No newline at end of file diff --git a/src/ViewModels/PruneRemote.cs b/src/ViewModels/PruneRemote.cs new file mode 100644 index 00000000..9d93fd18 --- /dev/null +++ b/src/ViewModels/PruneRemote.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class PruneRemote : Popup { + public Models.Remote Remote { + get; + private set; + } + + public PruneRemote(Repository repo, Models.Remote remote) { + _repo = repo; + Remote = remote; + View = new Views.PruneRemote() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription("Run `prune` on remote ..."); + var succ = new Commands.Remote(_repo.FullPath).Prune(Remote.Name); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs new file mode 100644 index 00000000..fab1afb3 --- /dev/null +++ b/src/ViewModels/Pull.cs @@ -0,0 +1,129 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Pull : Popup { + public List Remotes => _repo.Remotes; + public Models.Branch Current => _current; + + public bool HasSpecifiedRemoteBranch { + get; + private set; + } + + public Models.Remote SelectedRemote { + get => _selectedRemote; + set { + if (SetProperty(ref _selectedRemote, value)) { + var branches = new List(); + foreach (var branch in _repo.Branches) { + if (branch.Remote == value.Name) branches.Add(branch); + } + RemoteBranches = branches; + SelectedBranch = branches.Count > 0 ? branches[0] : null; + } + } + } + + public List RemoteBranches { + get => _remoteBranches; + private set => SetProperty(ref _remoteBranches, value); + } + + [Required(ErrorMessage = "Remote branch to pull is required!!!")] + public Models.Branch SelectedBranch { + get => _selectedBranch; + set => SetProperty(ref _selectedBranch, value); + } + + public bool UseRebase { + get; + set; + } + + public bool AutoStash { + get; + set; + } + + public Pull(Repository repo, Models.Branch specifiedRemoteBranch) { + _repo = repo; + _current = repo.Branches.Find(x => x.IsCurrent); + + if (specifiedRemoteBranch != null) { + _selectedRemote = repo.Remotes.Find(x => x.Name == specifiedRemoteBranch.Remote); + _selectedBranch = specifiedRemoteBranch; + HasSpecifiedRemoteBranch = true; + } else { + if (!string.IsNullOrEmpty(_current.Upstream)) { + foreach (var branch in repo.Branches) { + if (!branch.IsLocal && _current.Upstream == branch.FullName) { + _selectedRemote = repo.Remotes.Find(x => x.Name == branch.Remote); + _selectedBranch = branch; + break; + } + } + } + + HasSpecifiedRemoteBranch = false; + } + + // Make sure remote is exists. + if (_selectedRemote == null) { + _selectedRemote = repo.Remotes[0]; + _selectedBranch = null; + HasSpecifiedRemoteBranch = false; + } + + _remoteBranches = new List(); + foreach (var branch in _repo.Branches) { + if (branch.Remote == _selectedRemote.Name) _remoteBranches.Add(branch); + } + + if (_selectedBranch == null && _remoteBranches.Count > 0) { + _selectedBranch = _remoteBranches[0]; + } + + View = new Views.Pull() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var needPopStash = false; + if (AutoStash && _repo.WorkingCopyChangesCount > 0) { + SetProgressDescription("Adding untracked changes..."); + var succ = new Commands.Add(_repo.FullPath).Exec(); + if (succ) { + SetProgressDescription("Stash local changes..."); + succ = new Commands.Stash(_repo.FullPath).Push("PULL_AUTO_STASH"); + } + + if (!succ) { + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return false; + } + + needPopStash = true; + } + + SetProgressDescription($"Pull {_selectedRemote.Name}/{_selectedBranch.Name}..."); + var rs = new Commands.Pull(_repo.FullPath, _selectedRemote.Name, _selectedBranch.Name, UseRebase, SetProgressDescription).Exec(); + if (rs && needPopStash) { + SetProgressDescription("Re-apply local changes..."); + rs = new Commands.Stash(_repo.FullPath).Pop("stash@{0}"); + } + + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return rs; + }); + } + + private Repository _repo = null; + private Models.Branch _current = null; + private Models.Remote _selectedRemote = null; + private List _remoteBranches = null; + private Models.Branch _selectedBranch = null; + } +} diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs new file mode 100644 index 00000000..1a71ccc8 --- /dev/null +++ b/src/ViewModels/Push.cs @@ -0,0 +1,174 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Push : Popup { + public bool HasSpecifiedLocalBranch { + get; + private set; + } + + [Required(ErrorMessage = "Local branch is required!!!")] + public Models.Branch SelectedLocalBranch { + get => _selectedLocalBranch; + set { + if (SetProperty(ref _selectedLocalBranch, value)) { + // If selected local branch has upstream branch. Try to find it's remote. + if (!string.IsNullOrEmpty(value.Upstream)) { + var branch = _repo.Branches.Find(x => x.FullName == value.Upstream); + if (branch != null) { + var remote = _repo.Remotes.Find(x => x.Name == branch.Remote); + if (remote != null && remote != _selectedRemote) { + SelectedRemote = remote; + return; + } + } + } + + // Re-generate remote branches and auto-select remote branches. + AutoSelectBranchByRemote(); + } + } + } + + public List LocalBranches { + get; + private set; + } + + public List Remotes { + get => _repo.Remotes; + } + + [Required(ErrorMessage = "Remote is required!!!")] + public Models.Remote SelectedRemote { + get => _selectedRemote; + set { + if (SetProperty(ref _selectedRemote, value)) AutoSelectBranchByRemote(); + } + } + + public List RemoteBranches { + get => _remoteBranches; + private set => SetProperty(ref _remoteBranches, value); + } + + [Required(ErrorMessage = "Remote branch is required!!!")] + public Models.Branch SelectedRemoteBranch { + get => _selectedRemoteBranch; + set => SetProperty(ref _selectedRemoteBranch, value); + } + + public bool PushAllTags { + get; + set; + } + + public bool ForcePush { + get; + set; + } + + public Push(Repository repo, Models.Branch localBranch) { + _repo = repo; + + // Gather all local branches and find current branch. + LocalBranches = new List(); + var current = null as Models.Branch; + foreach (var branch in _repo.Branches) { + if (branch.IsLocal) LocalBranches.Add(branch); + if (branch.IsCurrent) current = branch; + } + + // Set default selected local branch. + if (localBranch != null) { + _selectedLocalBranch = localBranch; + HasSpecifiedLocalBranch = true; + } else { + _selectedLocalBranch = current; + HasSpecifiedLocalBranch = false; + } + + // Find preferred remote if selected local branch has upstream. + if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream)) { + foreach (var branch in repo.Branches) { + if (!branch.IsLocal && _selectedLocalBranch.Upstream == branch.FullName) { + _selectedRemote = repo.Remotes.Find(x => x.Name == branch.Remote); + break; + } + } + } + + // Set default remote to the first if haven't been set. + if (_selectedRemote == null) _selectedRemote = repo.Remotes[0]; + + // Auto select preferred remote branch. + AutoSelectBranchByRemote(); + + View = new Views.Push() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var remoteBranchName = _selectedRemoteBranch.Name.Replace(" (new)", ""); + SetProgressDescription($"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ..."); + var succ = new Commands.Push( + _repo.FullPath, + _selectedLocalBranch.Name, + _selectedRemote.Name, + remoteBranchName, + PushAllTags, + ForcePush, + string.IsNullOrEmpty(_selectedLocalBranch.Upstream), + SetProgressDescription).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private void AutoSelectBranchByRemote() { + // Gather branches. + var branches = new List(); + foreach (var branch in _repo.Branches) { + if (branch.Remote == _selectedRemote.Name) branches.Add(branch); + } + + // If selected local branch has upstream branch. Try to find it in current remote branches. + if (!string.IsNullOrEmpty(_selectedLocalBranch.Upstream)) { + foreach (var branch in branches) { + if (_selectedLocalBranch.Upstream == branch.FullName) { + RemoteBranches = branches; + SelectedRemoteBranch = branch; + return; + } + } + } + + // Find best remote branch by name. + foreach (var branch in branches) { + if (_selectedLocalBranch.Name == branch.Name) { + RemoteBranches = branches; + SelectedRemoteBranch = branch; + return; + } + } + + // Add a fake new branch. + var fake = new Models.Branch() { + Name = $"{_selectedLocalBranch.Name} (new)", + Remote = _selectedRemote.Name, + }; + branches.Add(fake); + RemoteBranches = branches; + SelectedRemoteBranch = fake; + } + + private Repository _repo = null; + private Models.Branch _selectedLocalBranch = null; + private Models.Remote _selectedRemote = null; + private List _remoteBranches = new List(); + private Models.Branch _selectedRemoteBranch = null; + } +} diff --git a/src/ViewModels/PushTag.cs b/src/ViewModels/PushTag.cs new file mode 100644 index 00000000..77b70998 --- /dev/null +++ b/src/ViewModels/PushTag.cs @@ -0,0 +1,39 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class PushTag : Popup { + public Models.Tag Target { + get; + private set; + } + + public List Remotes { + get => _repo.Remotes; + } + + public Models.Remote SelectedRemote { + get; + set; + } + + public PushTag(Repository repo, Models.Tag target) { + _repo = repo; + Target = target; + SelectedRemote = _repo.Remotes[0]; + View = new Views.PushTag() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Pushing tag '{Target.Name}' to remote '{SelectedRemote.Name}' ..."); + var succ = new Commands.Push(_repo.FullPath, SelectedRemote.Name, Target.Name, false).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Rebase.cs b/src/ViewModels/Rebase.cs new file mode 100644 index 00000000..6789c9cc --- /dev/null +++ b/src/ViewModels/Rebase.cs @@ -0,0 +1,50 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Rebase : Popup { + public Models.Branch Current { + get; + private set; + } + + public object On { + get; + private set; + } + + public bool AutoStash { + get; + set; + } + + public Rebase(Repository repo, Models.Branch current, Models.Branch on) { + _repo = repo; + _revision = on.Head; + Current = current; + On = on; + AutoStash = true; + View = new Views.Rebase() { DataContext = this }; + } + + public Rebase(Repository repo, Models.Branch current, Models.Commit on) { + _repo = repo; + _revision = on.SHA; + Current = current; + On = on; + AutoStash = true; + View = new Views.Rebase() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + var succ = new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _revision = string.Empty; + } +} diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs new file mode 100644 index 00000000..0db0b2e9 --- /dev/null +++ b/src/ViewModels/RenameBranch.cs @@ -0,0 +1,53 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class RenameBranch : Popup { + public Models.Branch Target { + get; + private set; + } + + [Required(ErrorMessage = "Branch name is required!!!")] + [RegularExpression(@"^[\w\-/\.]+$", ErrorMessage = "Bad branch name format!")] + [CustomValidation(typeof(RenameBranch), nameof(ValidateBranchName))] + public string Name { + get => _name; + set => SetProperty(ref _name, value, true); + } + + public RenameBranch(Repository repo, Models.Branch target) { + _repo = repo; + _name = target.Name; + Target = target; + View = new Views.RenameBranch() { DataContext = this }; + } + + public static ValidationResult ValidateBranchName(string name, ValidationContext ctx) { + if (ctx.ObjectInstance is RenameBranch rename) { + foreach (var b in rename._repo.Branches) { + if (b != rename.Target && b.Name == name) { + return new ValidationResult("A branch with same name already exists!!!"); + } + } + } + + return ValidationResult.Success; + } + + public override Task Sure() { + if (_name == Target.Name) return null; + + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Rename '{Target.Name}'"); + var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _name = string.Empty; + } +} diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs new file mode 100644 index 00000000..5cc94874 --- /dev/null +++ b/src/ViewModels/Repository.cs @@ -0,0 +1,1082 @@ +using Avalonia.Collections; +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json.Serialization; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Repository : ObservableObject, Models.IRepository { + public string FullPath { + get => _fullpath; + set => SetProperty(ref _fullpath, value); + } + + public string GitDir { + get => _gitDir; + set => SetProperty(ref _gitDir, value); + } + + public AvaloniaList Filters { + get; + private set; + } = new AvaloniaList(); + + public AvaloniaList CommitMessages { + get; + private set; + } = new AvaloniaList(); + + [JsonIgnore] + public bool IsVSCodeFound { + get => !string.IsNullOrEmpty(Native.OS.VSCodeExecutableFile); + } + + [JsonIgnore] + public Models.GitFlow GitFlow { + get => _gitflow; + set => SetProperty(ref _gitflow, value); + } + + [JsonIgnore] + public int SelectedViewIndex { + get => _selectedViewIndex; + set { + if (SetProperty(ref _selectedViewIndex, value)) { + switch (value) { + case 1: + SelectedView = _workingCopy; + break; + case 2: + SelectedView = _stashesPage; + break; + default: + SelectedView = _histories; + break; + } + } + } + } + + [JsonIgnore] + public object SelectedView { + get => _selectedView; + set => SetProperty(ref _selectedView, value); + } + + [JsonIgnore] + public List Remotes { + get => _remotes; + private set => SetProperty(ref _remotes, value); + } + + [JsonIgnore] + public List Branches { + get => _branches; + private set => SetProperty(ref _branches, value); + } + + [JsonIgnore] + public List LocalBranchTrees { + get => _localBranchTrees; + private set => SetProperty(ref _localBranchTrees, value); + } + + [JsonIgnore] + public List RemoteBranchTrees { + get => _remoteBranchTrees; + private set => SetProperty(ref _remoteBranchTrees, value); + } + + [JsonIgnore] + public List Tags { + get => _tags; + private set => SetProperty(ref _tags, value); + } + + [JsonIgnore] + public List Submodules { + get => _submodules; + private set => SetProperty(ref _submodules, value); + } + + [JsonIgnore] + public int WorkingCopyChangesCount { + get => _workingCopy.Count; + } + + [JsonIgnore] + public int StashesCount { + get => _stashesPage.Count; + } + + [JsonIgnore] + public bool IsConflictBarVisible { + get => _isConflictBarVisible; + private set => SetProperty(ref _isConflictBarVisible, value); + } + + [JsonIgnore] + public bool HasUnsolvedConflict { + get => _hasUnsolvedConflict; + private set => SetProperty(ref _hasUnsolvedConflict, value); + } + + [JsonIgnore] + public bool CanCommitWithPush { + get => _canCommitWithPush; + private set => SetProperty(ref _canCommitWithPush, value); + } + + [JsonIgnore] + public bool IncludeUntracked { + get => _includeUntracked; + set { + if (SetProperty(ref _includeUntracked, value)) { + Task.Run(RefreshWorkingCopyChanges); + } + } + } + + [JsonIgnore] + public bool IsSearching { + get => _isSearching; + set { + if (SetProperty(ref _isSearching, value)) { + SearchedCommits = new List(); + SearchCommitFilter = string.Empty; + if (value) SelectedViewIndex = 0; + } + } + } + + [JsonIgnore] + public string SearchCommitFilter { + get => _searchCommitFilter; + set => SetProperty(ref _searchCommitFilter, value); + } + + [JsonIgnore] + public List SearchedCommits { + get => _searchedCommits; + set => SetProperty(ref _searchedCommits, value); + } + + public void Open() { + _watcher = new Models.Watcher(this); + _histories = new Histories(this); + _workingCopy = new WorkingCopy(this); + _stashesPage = new StashesPage(this); + _selectedView = _histories; + _selectedViewIndex = 0; + _isConflictBarVisible = false; + _hasUnsolvedConflict = false; + + Task.Run(() => { + RefreshBranches(); + RefreshTags(); + RefreshCommits(); + }); + + Task.Run(RefreshSubmodules); + Task.Run(RefreshWorkingCopyChanges); + Task.Run(RefreshStashes); + Task.Run(RefreshGitFlow); + } + + public void Close() { + _watcher.Dispose(); + _watcher = null; + _histories = null; + _workingCopy = null; + _stashesPage = null; + _selectedView = null; + _isSearching = false; + _searchCommitFilter = string.Empty; + + _remotes.Clear(); + _branches.Clear(); + _localBranchTrees.Clear(); + _remoteBranchTrees.Clear(); + _tags.Clear(); + _submodules.Clear(); + _searchedCommits.Clear(); + + GC.Collect(); + } + + public void OpenInFileManager() { + Native.OS.OpenInFileManager(_fullpath); + } + + public void OpenInVSCode() { + Native.OS.OpenInVSCode(_fullpath); + } + + public void OpenInTerminal() { + Native.OS.OpenTerminal(_fullpath); + } + + public void Fetch() { + if (!PopupHost.CanCreatePopup()) return; + + if (Remotes.Count == 0) { + App.RaiseException(_fullpath, "No remotes added to this repository!!!"); + return; + } + + PopupHost.ShowPopup(new Fetch(this)); + } + + public void Pull() { + if (!PopupHost.CanCreatePopup()) return; + + if (Remotes.Count == 0) { + App.RaiseException(_fullpath, "No remotes added to this repository!!!"); + return; + } + + PopupHost.ShowPopup(new Pull(this, null)); + } + + public void Push() { + if (!PopupHost.CanCreatePopup()) return; + + if (Remotes.Count == 0) { + App.RaiseException(_fullpath, "No remotes added to this repository!!!"); + return; + } + + if (Branches.Find(x => x.IsCurrent) == null) App.RaiseException(_fullpath, "Can NOT found current branch!!!"); + PopupHost.ShowPopup(new Push(this, null)); + } + + public void ApplyPatch() { + if (!PopupHost.CanCreatePopup()) return; + PopupHost.ShowPopup(new Apply(this)); + } + + public void Cleanup() { + if (!PopupHost.CanCreatePopup()) return; + PopupHost.ShowAndStartPopup(new Cleanup(this)); + } + + public void OpenConfigure() { + if (!PopupHost.CanCreatePopup()) return; + PopupHost.ShowPopup(new RepositoryConfigure(this)); + } + + public void ClearSearchCommitFilter() { + SearchCommitFilter = string.Empty; + } + + public void StartSearchCommits() { + if (_histories == null) return; + + var visible = new List(); + foreach (var c in _histories.Commits) { + if (c.SHA.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Subject.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Message.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Author.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase) + || c.Committer.Name.Contains(_searchCommitFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(c); + } + } + + SearchedCommits = visible; + } + + public void ExitSearchMode() { + IsSearching = false; + } + + public void SetWatcherEnabled(bool enabled) { + if (_watcher != null) _watcher.SetEnabled(enabled); + } + + public void NavigateToCommit(string sha) { + if (_histories != null) { + SelectedViewIndex = 0; + _histories.NavigateTo(sha); + } + } + + public void UpdateFilter(string filter, bool toggle) { + var changed = false; + if (toggle) { + if (!Filters.Contains(filter)) { + Filters.Add(filter); + changed = true; + } + } else { + changed = Filters.Remove(filter); + } + + if (changed) Task.Run(RefreshCommits); + } + + public void StashAll() { + if (PopupHost.CanCreatePopup()) { + var changes = new List(); + changes.AddRange(_workingCopy.Unstaged); + changes.AddRange(_workingCopy.Staged); + PopupHost.ShowPopup(new StashChanges(this, changes, true)); + } + } + + public void GotoResolve() { + if (_workingCopy != null) SelectedViewIndex = 1; + } + + public async void ContinueMerge() { + var cherryPickMerge = Path.Combine(_gitDir, "CHERRY_PICK_HEAD"); + var rebaseMerge = Path.Combine(_gitDir, "REBASE_HEAD"); + var rebaseMergeFolder = Path.Combine(_gitDir, "rebase-merge"); + var revertMerge = Path.Combine(_gitDir, "REVERT_HEAD"); + var otherMerge = Path.Combine(_gitDir, "MERGE_HEAD"); + + var mode = ""; + if (File.Exists(cherryPickMerge)) { + mode = "cherry-pick"; + } else if (File.Exists(rebaseMerge) && Directory.Exists(rebaseMergeFolder)) { + mode = "rebase"; + } else if (File.Exists(revertMerge)) { + mode = "revert"; + } else if (File.Exists(otherMerge)) { + mode = "merge"; + } else { + await Task.Run(RefreshWorkingCopyChanges); + return; + } + + var cmd = new Commands.Command(); + cmd.WorkingDirectory = _fullpath; + cmd.Context = _fullpath; + cmd.Args = $"-c core.editor=true {mode} --continue"; + + SetWatcherEnabled(false); + var succ = await Task.Run(cmd.Exec); + SetWatcherEnabled(true); + + if (succ) { + if (_workingCopy != null) _workingCopy.CommitMessage = string.Empty; + + if (mode == "rebase") { + if (File.Exists(rebaseMerge)) File.Delete(rebaseMerge); + if (Directory.Exists(rebaseMergeFolder)) Directory.Delete(rebaseMergeFolder); + } + } + } + + public async void AbortMerge() { + var cmd = new Commands.Command(); + cmd.WorkingDirectory = _fullpath; + cmd.Context = _fullpath; + + if (File.Exists(Path.Combine(_gitDir, "CHERRY_PICK_HEAD"))) { + cmd.Args = "cherry-pick --abort"; + } else if (File.Exists(Path.Combine(_gitDir, "REBASE_HEAD"))) { + cmd.Args = "rebase --abort"; + } else if (File.Exists(Path.Combine(_gitDir, "REVERT_HEAD"))) { + cmd.Args = "revert --abort"; + } else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD"))) { + cmd.Args = "merge --abort"; + } else { + await Task.Run(RefreshWorkingCopyChanges); + return; + } + + SetWatcherEnabled(false); + await Task.Run(cmd.Exec); + SetWatcherEnabled(true); + } + + public void RefreshBranches() { + var branches = new Commands.QueryBranches(FullPath).Result(); + var remotes = new Commands.QueryRemotes(FullPath).Result(); + + var builder = new Models.BranchTreeNode.Builder(); + builder.CollectExpandedNodes(_localBranchTrees, true); + builder.CollectExpandedNodes(_remoteBranchTrees, false); + builder.Run(branches, remotes); + + Dispatcher.UIThread.Invoke(() => { + Remotes = remotes; + Branches = branches; + LocalBranchTrees = builder.Locals; + RemoteBranchTrees = builder.Remotes; + + var cur = Branches.Find(x => x.IsCurrent); + CanCommitWithPush = cur != null && !string.IsNullOrEmpty(cur.Upstream); + }); + } + + public void RefreshTags() { + var tags = new Commands.QueryTags(FullPath).Result(); + Dispatcher.UIThread.Invoke(() => { + Tags = tags; + }); + } + + public void RefreshCommits() { + Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true); + + var limits = $"-{Preference.Instance.MaxHistoryCommits} "; + var validFilters = new List(); + foreach (var filter in Filters) { + if (filter.StartsWith("refs/")) { + if (_branches.FindIndex(x => x.FullName == filter) >= 0) validFilters.Add(filter); + } else { + if (_tags.FindIndex(t => t.Name == filter) >= 0) validFilters.Add(filter); + } + } + if (validFilters.Count > 0) { + limits += string.Join(" ", validFilters); + } else { + limits += "--branches --remotes --tags"; + } + + var commits = new Commands.QueryCommits(FullPath, limits).Result(); + Dispatcher.UIThread.Invoke(() => { + _histories.IsLoading = false; + _histories.Commits = commits; + }); + } + + public void RefreshSubmodules() { + var submodules = new Commands.QuerySubmodules(FullPath).Result(); + Dispatcher.UIThread.Invoke(() => { + Submodules = submodules; + }); + } + + public void RefreshWorkingCopyChanges() { + _watcher.MarkWorkingCopyRefreshed(); + + var changes = new Commands.QueryLocalChanges(FullPath, _includeUntracked).Result(); + var hasUnsolvedConflict = _workingCopy.SetData(changes); + + var cherryPickMerge = Path.Combine(_gitDir, "CHERRY_PICK_HEAD"); + var rebaseMerge = Path.Combine(_gitDir, "REBASE_HEAD"); + var rebaseMergeFolder = Path.Combine(_gitDir, "rebase-merge"); + var revertMerge = Path.Combine(_gitDir, "REVERT_HEAD"); + var otherMerge = Path.Combine(_gitDir, "MERGE_HEAD"); + var runningMerge = (File.Exists(cherryPickMerge) || + (File.Exists(rebaseMerge) && Directory.Exists(rebaseMergeFolder)) || + File.Exists(revertMerge) || + File.Exists(otherMerge)); + + if (!runningMerge) { + if (Directory.Exists(rebaseMergeFolder)) Directory.Delete(rebaseMergeFolder, true); + var applyFolder = Path.Combine(_gitDir, "rebase-apply"); + if (Directory.Exists(applyFolder)) Directory.Delete(applyFolder, true); + } + + Dispatcher.UIThread.Invoke(() => { + IsConflictBarVisible = runningMerge; + HasUnsolvedConflict = hasUnsolvedConflict; + OnPropertyChanged(nameof(WorkingCopyChangesCount)); + }); + } + + public void RefreshStashes() { + var stashes = new Commands.QueryStashes(FullPath).Result(); + Dispatcher.UIThread.Invoke(() => { + _stashesPage.Stashes = stashes; + OnPropertyChanged(nameof(StashesCount)); + }); + } + + public void RefreshGitFlow() { + var config = new Commands.Config(_fullpath).ListAll(); + var gitFlow = new Models.GitFlow(); + if (config.ContainsKey("gitflow.prefix.feature")) gitFlow.Feature = config["gitflow.prefix.feature"]; + if (config.ContainsKey("gitflow.prefix.release")) gitFlow.Release = config["gitflow.prefix.release"]; + if (config.ContainsKey("gitflow.prefix.hotfix")) gitFlow.Hotfix = config["gitflow.prefix.hotfix"]; + Dispatcher.UIThread.Invoke(() => { + GitFlow = gitFlow; + }); + } + + public void CreateNewBranch() { + var current = Branches.Find(x => x.IsCurrent); + if (current == null) { + App.RaiseException(_fullpath, "Git do not hold any branch until you do first commit."); + return; + } + + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(this, current)); + } + + public void CreateNewTag() { + var current = Branches.Find(x => x.IsCurrent); + if (current == null) { + App.RaiseException(_fullpath, "Git do not hold any branch until you do first commit."); + return; + } + + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateTag(this, current)); + } + + public void AddRemote() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new AddRemote(this)); + } + + public void AddSubmodule() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new AddSubmodule(this)); + } + + public ContextMenu CreateContextMenuForGitFlow() { + var menu = new ContextMenu(); + menu.Placement = PlacementMode.BottomEdgeAlignedLeft; + + if (GitFlow.IsEnabled) { + var startFeature = new MenuItem(); + startFeature.Header = App.Text("GitFlow.StartFeature"); + startFeature.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Feature)); + e.Handled = true; + }; + + var startRelease = new MenuItem(); + startRelease.Header = App.Text("GitFlow.StartRelease"); + startRelease.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Release)); + e.Handled = true; + }; + + var startHotfix = new MenuItem(); + startHotfix.Header = App.Text("GitFlow.StartHotfix"); + startHotfix.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowStart(this, Models.GitFlowBranchType.Hotfix)); + e.Handled = true; + }; + + menu.Items.Add(startFeature); + menu.Items.Add(startRelease); + menu.Items.Add(startHotfix); + } else { + var init = new MenuItem(); + init.Header = App.Text("GitFlow.Init"); + init.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new InitGitFlow(this)); + e.Handled = true; + }; + menu.Items.Add(init); + } + return menu; + } + + public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch) { + var menu = new ContextMenu(); + + var push = new MenuItem(); + push.Header = App.Text("BranchCM.Push", branch.Name); + push.Icon = CreateMenuIcon("Icons.Push"); + push.IsEnabled = Remotes.Count > 0; + push.Click += (_, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Push(this, branch)); + e.Handled = true; + }; + + if (branch.IsCurrent) { + var discard = new MenuItem(); + discard.Header = App.Text("BranchCM.DiscardAll"); + discard.Icon = CreateMenuIcon("Icons.Undo"); + discard.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Discard(this)); + e.Handled = true; + }; + + menu.Items.Add(discard); + menu.Items.Add(new MenuItem() { Header = "-" }); + + if (!string.IsNullOrEmpty(branch.Upstream)) { + var upstream = branch.Upstream.Substring(13); + var fastForward = new MenuItem(); + fastForward.Header = App.Text("BranchCM.FastForward", upstream); + fastForward.Icon = CreateMenuIcon("Icons.FastForward"); + fastForward.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus) && branch.UpstreamTrackStatus.IndexOf('↑') < 0; + fastForward.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Merge(this, upstream, branch.Name)); + e.Handled = true; + }; + + var pull = new MenuItem(); + pull.Header = App.Text("BranchCM.Pull", upstream); + pull.Icon = CreateMenuIcon("Icons.Pull"); + pull.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus); + pull.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Pull(this, null)); + e.Handled = true; + }; + + menu.Items.Add(fastForward); + menu.Items.Add(pull); + } + + menu.Items.Add(push); + } else { + var current = Branches.Find(x => x.IsCurrent); + + var checkout = new MenuItem(); + checkout.Header = App.Text("BranchCM.Checkout", branch.Name); + checkout.Icon = CreateMenuIcon("Icons.Check"); + checkout.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Checkout(this, branch.Name)); + e.Handled = true; + }; + menu.Items.Add(checkout); + + var upstream = Branches.Find(x => x.FullName == branch.Upstream); + if (upstream != null) { + var fastForward = new MenuItem(); + fastForward.Header = App.Text("BranchCM.FastForward", $"{upstream.Remote}/{upstream.Name}"); + fastForward.Icon = CreateMenuIcon("Icons.FastForward"); + fastForward.IsEnabled = !string.IsNullOrEmpty(branch.UpstreamTrackStatus) && branch.UpstreamTrackStatus.IndexOf('↑') < 0; + fastForward.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new FastForwardWithoutCheckout(this, branch, upstream)); + e.Handled = true; + }; + + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(fastForward); + } + + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(push); + + var merge = new MenuItem(); + merge.Header = App.Text("BranchCM.Merge", branch.Name, current.Name); + merge.Icon = CreateMenuIcon("Icons.Merge"); + merge.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(this, branch.Name, current.Name)); + e.Handled = true; + }; + + var rebase = new MenuItem(); + rebase.Header = App.Text("BranchCM.Rebase", current.Name, branch.Name); + rebase.Icon = CreateMenuIcon("Icons.Rebase"); + rebase.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Rebase(this, current, branch)); + e.Handled = true; + }; + + menu.Items.Add(merge); + menu.Items.Add(rebase); + } + + var type = GitFlow.GetBranchType(branch.Name); + if (type != Models.GitFlowBranchType.None) { + var finish = new MenuItem(); + finish.Header = App.Text("BranchCM.Finish", branch.Name); + finish.Icon = CreateMenuIcon("Icons.Flow"); + finish.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new GitFlowFinish(this, branch, type)); + e.Handled = true; + }; + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(finish); + } + + var rename = new MenuItem(); + rename.Header = App.Text("BranchCM.Rename", branch.Name); + rename.Icon = CreateMenuIcon("Icons.Rename"); + rename.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new RenameBranch(this, branch)); + e.Handled = true; + }; + + var delete = new MenuItem(); + delete.Header = App.Text("BranchCM.Delete", branch.Name); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.IsEnabled = !branch.IsCurrent; + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(this, branch)); + e.Handled = true; + }; + + var createBranch = new MenuItem(); + createBranch.Icon = CreateMenuIcon("Icons.Branch.Add"); + createBranch.Header = App.Text("CreateBranch"); + createBranch.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(this, branch)); + e.Handled = true; + }; + + var createTag = new MenuItem(); + createTag.Icon = CreateMenuIcon("Icons.Tag.Add"); + createTag.Header = App.Text("CreateTag"); + createTag.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateTag(this, branch)); + e.Handled = true; + }; + + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(rename); + menu.Items.Add(delete); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(createBranch); + menu.Items.Add(createTag); + menu.Items.Add(new MenuItem() { Header = "-" }); + + var remoteBranches = new List(); + foreach (var b in Branches) { + if (!b.IsLocal) remoteBranches.Add(b); + } + + if (remoteBranches.Count > 0) { + var tracking = new MenuItem(); + tracking.Header = App.Text("BranchCM.Tracking"); + tracking.Icon = CreateMenuIcon("Icons.Branch"); + + foreach (var b in remoteBranches) { + var upstream = b.FullName.Replace("refs/remotes/", ""); + var target = new MenuItem(); + target.Header = upstream; + if (branch.Upstream == b.FullName) target.Icon = CreateMenuIcon("Icons.Check"); + + target.Click += (o, e) => { + if (Commands.Branch.SetUpstream(_fullpath, branch.Name, upstream)) { + Task.Run(RefreshBranches); + } + e.Handled = true; + }; + + tracking.Items.Add(target); + } + + var unsetUpstream = new MenuItem(); + unsetUpstream.Header = App.Text("BranchCM.UnsetUpstream"); + unsetUpstream.Click += (_, e) => { + if (Commands.Branch.SetUpstream(_fullpath, branch.Name, string.Empty)) { + Task.Run(RefreshBranches); + } + e.Handled = true; + }; + tracking.Items.Add(new MenuItem() { Header = "-" }); + tracking.Items.Add(unsetUpstream); + + menu.Items.Add(tracking); + } + + var archive = new MenuItem(); + archive.Icon = CreateMenuIcon("Icons.Archive"); + archive.Header = App.Text("Archive"); + archive.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Archive(this, branch)); + e.Handled = true; + }; + menu.Items.Add(archive); + menu.Items.Add(new MenuItem() { Header = "-" }); + + var copy = new MenuItem(); + copy.Header = App.Text("BranchCM.CopyName"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (o, e) => { + App.CopyText(branch.Name); + e.Handled = true; + }; + menu.Items.Add(copy); + + return menu; + } + + public ContextMenu CreateContextMenuForRemote(Models.Remote remote) { + var menu = new ContextMenu(); + + var fetch = new MenuItem(); + fetch.Header = App.Text("RemoteCM.Fetch"); + fetch.Icon = CreateMenuIcon("Icons.Fetch"); + fetch.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Fetch(this, remote)); + e.Handled = true; + }; + + var prune = new MenuItem(); + prune.Header = App.Text("RemoteCM.Prune"); + prune.Icon = CreateMenuIcon("Icons.Clear2"); + prune.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new PruneRemote(this, remote)); + e.Handled = true; + }; + + var edit = new MenuItem(); + edit.Header = App.Text("RemoteCM.Edit"); + edit.Icon = CreateMenuIcon("Icons.Edit"); + edit.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new EditRemote(this, remote)); + e.Handled = true; + }; + + var delete = new MenuItem(); + delete.Header = App.Text("RemoteCM.Delete"); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteRemote(this, remote)); + e.Handled = true; + }; + + var copy = new MenuItem(); + copy.Header = App.Text("RemoteCM.CopyURL"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (o, e) => { + App.CopyText(remote.URL); + e.Handled = true; + }; + + menu.Items.Add(fetch); + menu.Items.Add(prune); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(edit); + menu.Items.Add(delete); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(copy); + return menu; + } + + public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch) { + var menu = new ContextMenu(); + var current = Branches.Find(x => x.IsCurrent); + + var checkout = new MenuItem(); + checkout.Header = App.Text("BranchCM.Checkout", $"{branch.Remote}/{branch.Name}"); + checkout.Icon = CreateMenuIcon("Icons.Check"); + checkout.Click += (o, e) => { + foreach (var b in Branches) { + if (b.IsLocal && b.Upstream == branch.FullName) { + if (b.IsCurrent) return; + if (PopupHost.CanCreatePopup()) PopupHost.ShowAndStartPopup(new Checkout(this, b.Name)); + return; + } + } + + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(this, branch)); + e.Handled = true; + }; + menu.Items.Add(checkout); + menu.Items.Add(new MenuItem() { Header = "-" }); + + if (current != null) { + var pull = new MenuItem(); + pull.Header = App.Text("BranchCM.PullInto", $"{branch.Remote}/{branch.Name}", current.Name); + pull.Icon = CreateMenuIcon("Icons.Pull"); + pull.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Pull(this, branch)); + e.Handled = true; + }; + + var merge = new MenuItem(); + merge.Header = App.Text("BranchCM.Merge", $"{branch.Remote}/{branch.Name}", current.Name); + merge.Icon = CreateMenuIcon("Icons.Merge"); + merge.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Merge(this, $"{branch.Remote}/{branch.Name}", current.Name)); + e.Handled = true; + }; + + var rebase = new MenuItem(); + rebase.Header = App.Text("BranchCM.Rebase", current.Name, $"{branch.Remote}/{branch.Name}"); + rebase.Icon = CreateMenuIcon("Icons.Rebase"); + rebase.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Rebase(this, current, branch)); + e.Handled = true; + }; + + menu.Items.Add(pull); + menu.Items.Add(merge); + menu.Items.Add(rebase); + menu.Items.Add(new MenuItem() { Header = "-" }); + } + + var delete = new MenuItem(); + delete.Header = App.Text("BranchCM.Delete", $"{branch.Remote}/{branch.Name}"); + delete.Icon = CreateMenuIcon("Icons.Clear"); + delete.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteBranch(this, branch)); + e.Handled = true; + }; + + var createBranch = new MenuItem(); + createBranch.Icon = CreateMenuIcon("Icons.Branch.Add"); + createBranch.Header = App.Text("CreateBranch"); + createBranch.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(this, branch)); + e.Handled = true; + }; + + var createTag = new MenuItem(); + createTag.Icon = CreateMenuIcon("Icons.Tag.Add"); + createTag.Header = App.Text("CreateTag"); + createTag.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateTag(this, branch)); + e.Handled = true; + }; + + var archive = new MenuItem(); + archive.Icon = CreateMenuIcon("Icons.Archive"); + archive.Header = App.Text("Archive"); + archive.Click += (o, e) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Archive(this, branch)); + e.Handled = true; + }; + + var copy = new MenuItem(); + copy.Header = App.Text("BranchCM.CopyName"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (o, e) => { + App.CopyText(branch.Remote + "/" + branch.Name); + e.Handled = true; + }; + + menu.Items.Add(delete); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(createBranch); + menu.Items.Add(createTag); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(archive); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(copy); + return menu; + } + + public ContextMenu CreateContextMenuForTag(Models.Tag tag) { + var createBranch = new MenuItem(); + createBranch.Icon = CreateMenuIcon("Icons.Branch.Add"); + createBranch.Header = App.Text("CreateBranch"); + createBranch.Click += (o, ev) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateBranch(this, tag)); + ev.Handled = true; + }; + + var pushTag = new MenuItem(); + pushTag.Header = App.Text("TagCM.Push", tag.Name); + pushTag.Icon = CreateMenuIcon("Icons.Push"); + pushTag.IsEnabled = Remotes.Count > 0; + pushTag.Click += (o, ev) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new PushTag(this, tag)); + ev.Handled = true; + }; + + var deleteTag = new MenuItem(); + deleteTag.Header = App.Text("TagCM.Delete", tag.Name); + deleteTag.Icon = CreateMenuIcon("Icons.Clear"); + deleteTag.Click += (o, ev) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteTag(this, tag)); + ev.Handled = true; + }; + + var archive = new MenuItem(); + archive.Icon = CreateMenuIcon("Icons.Archive"); + archive.Header = App.Text("Archive"); + archive.Click += (o, ev) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new Archive(this, tag)); + ev.Handled = true; + }; + + var copy = new MenuItem(); + copy.Header = App.Text("TagCM.Copy"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (o, ev) => { + App.CopyText(tag.Name); + ev.Handled = true; + }; + + var menu = new ContextMenu(); + menu.Items.Add(createBranch); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(pushTag); + menu.Items.Add(deleteTag); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(archive); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(copy); + return menu; + } + + public ContextMenu CreateContextMenuForSubmodule(string submodule) { + var open = new MenuItem(); + open.Header = App.Text("Submodule.Open"); + open.Icon = CreateMenuIcon("Icons.Folder.Open"); + open.Click += (o, ev) => { + var root = Path.GetFullPath(Path.Combine(_fullpath, submodule)); + var gitDir = new Commands.QueryGitDir(root).Result(); + var repo = Preference.AddRepository(root, gitDir); + var node = new RepositoryNode() { + Id = root, + Name = Path.GetFileName(root), + Bookmark = 0, + IsRepository = true, + }; + + var launcher = App.GetTopLevel().DataContext as Launcher; + if (launcher != null) { + launcher.OpenRepositoryInTab(node, null); + } + + ev.Handled = true; + }; + + var copy = new MenuItem(); + copy.Header = App.Text("Submodule.CopyPath"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (o, ev) => { + App.CopyText(submodule); + ev.Handled = true; + }; + + var rm = new MenuItem(); + rm.Header = App.Text("Submodule.Remove"); + rm.Icon = CreateMenuIcon("Icons.Clear"); + rm.Click += (o, ev) => { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteSubmodule(this, submodule)); + ev.Handled = true; + }; + + var menu = new ContextMenu(); + menu.Items.Add(open); + menu.Items.Add(copy); + menu.Items.Add(rm); + return menu; + } + + private Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) { + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 12; + icon.Height = 12; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource(key) as StreamGeometry; + return icon; + } + + private string _fullpath = string.Empty; + private string _gitDir = string.Empty; + private Models.GitFlow _gitflow = new Models.GitFlow(); + + private Models.Watcher _watcher = null; + private Histories _histories = null; + private WorkingCopy _workingCopy = null; + private StashesPage _stashesPage = null; + private int _selectedViewIndex = 0; + private object _selectedView = null; + + private bool _isSearching = false; + private string _searchCommitFilter = string.Empty; + private List _searchedCommits = new List(); + + private List _remotes = new List(); + private List _branches = new List(); + private List _localBranchTrees = new List(); + private List _remoteBranchTrees = new List(); + private List _tags = new List(); + private List _submodules = new List(); + private bool _isConflictBarVisible = false; + private bool _hasUnsolvedConflict = false; + private bool _canCommitWithPush = false; + private bool _includeUntracked = true; + } +} diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs new file mode 100644 index 00000000..928d58fd --- /dev/null +++ b/src/ViewModels/RepositoryConfigure.cs @@ -0,0 +1,69 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class RepositoryConfigure : Popup { + public string UserName { + get; + set; + } + + public string UserEmail { + get; + set; + } + + public bool GPGSigningEnabled { + get; + set; + } + + public string GPGUserSigningKey { + get; + set; + } + + public string HttpProxy { + get; + set; + } + + public RepositoryConfigure(Repository repo) { + _repo = repo; + + _cached = new Commands.Config(repo.FullPath).ListAll(); + if (_cached.ContainsKey("user.name")) UserName = _cached["user.name"]; + if (_cached.ContainsKey("user.email")) UserEmail = _cached["user.email"]; + if (_cached.ContainsKey("commit.gpgsign")) GPGSigningEnabled = _cached["commit.gpgsign"] == "true"; + if (_cached.ContainsKey("user.signingkey")) GPGUserSigningKey = _cached["user.signingkey"]; + if (_cached.ContainsKey("http.proxy")) HttpProxy = _cached["user.signingkey"]; + + View = new Views.RepositoryConfigure() { DataContext = this }; + } + + public override Task Sure() { + SetIfChanged("user.name", UserName); + SetIfChanged("user.email", UserEmail); + SetIfChanged("commit.gpgsign", GPGSigningEnabled ? "true" : "false"); + SetIfChanged("user.signingkey", GPGUserSigningKey); + SetIfChanged("http.proxy", HttpProxy); + return null; + } + + private void SetIfChanged(string key, string value) { + bool changed = false; + if (_cached.ContainsKey(key)) { + changed = value != _cached[key]; + } else if (!string.IsNullOrEmpty(value)) { + changed = true; + } + + if (changed) { + new Commands.Config(_repo.FullPath).Set(key, value); + } + } + + private Repository _repo = null; + private Dictionary _cached = null; + } +} diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs new file mode 100644 index 00000000..6d3979ae --- /dev/null +++ b/src/ViewModels/RepositoryNode.cs @@ -0,0 +1,73 @@ +using Avalonia.Collections; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Text.Json.Serialization; + +namespace SourceGit.ViewModels { + public class RepositoryNode : ObservableObject { + public string Id { + get => _id; + set => SetProperty(ref _id, value); + } + + public string Name { + get => _name; + set => SetProperty(ref _name, value); + } + + public int Bookmark { + get => _bookmark; + set => SetProperty(ref _bookmark, value); + } + + public bool IsRepository { + get => _isRepository; + set => SetProperty(ref _isRepository, value); + } + + public bool IsExpanded { + get => _isExpanded; + set => SetProperty(ref _isExpanded, value); + } + + [JsonIgnore] + public bool IsVisible { + get => _isVisible; + set => SetProperty(ref _isVisible, value); + } + + public AvaloniaList SubNodes { + get => _subNodes; + set => SetProperty(ref _subNodes, value); + } + + public void Edit() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new EditRepositoryNode(this)); + } + + public void AddSubFolder() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateGroup(this)); + } + + public void OpenInFileManager() { + if (!IsRepository) return; + Native.OS.OpenInFileManager(_id); + } + + public void OpenTerminal() { + if (!IsRepository) return; + Native.OS.OpenTerminal(_id); + } + + public void Delete() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new DeleteRepositoryNode(this)); + } + + private string _id = string.Empty; + private string _name = string.Empty; + private bool _isRepository = false; + private int _bookmark = 0; + private bool _isExpanded = false; + private bool _isVisible = true; + private AvaloniaList _subNodes = new AvaloniaList(); + } +} diff --git a/src/ViewModels/Reset.cs b/src/ViewModels/Reset.cs new file mode 100644 index 00000000..c415e08a --- /dev/null +++ b/src/ViewModels/Reset.cs @@ -0,0 +1,66 @@ +using Avalonia.Media; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class ResetMode { + public string Name { get; set; } + public string Desc { get; set; } + public string Arg { get; set; } + public IBrush Color { get; set; } + + public ResetMode(string n, string d, string a, IBrush b) { + Name = n; + Desc = d; + Arg = a; + Color = b; + } + } + + public class Reset : Popup { + public Models.Branch Current { + get; + private set; + } + + public Models.Commit To { + get; + private set; + } + + public List Modes { + get; + private set; + } + + public ResetMode SelectedMode { + get; + set; + } + + public Reset(Repository repo, Models.Branch current, Models.Commit to) { + _repo = repo; + Current = current; + To = to; + Modes = new List() { + new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green), + new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange), + new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red), + }; + SelectedMode = Modes[0]; + View = new Views.Reset() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Reset current branch to {To.SHA} ..."); + var succ = new Commands.Reset(_repo.FullPath, To.SHA, SelectedMode.Arg).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/Revert.cs b/src/ViewModels/Revert.cs new file mode 100644 index 00000000..49a379ab --- /dev/null +++ b/src/ViewModels/Revert.cs @@ -0,0 +1,34 @@ +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Revert : Popup { + public Models.Commit Target { + get; + private set; + } + + public bool AutoCommit { + get; + set; + } + + public Revert(Repository repo, Models.Commit target) { + _repo = repo; + Target = target; + AutoCommit = true; + View = new Views.Revert() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Revert commit '{Target.SHA}' ..."); + var succ = new Commands.Revert(_repo.FullPath, Target.SHA, AutoCommit).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + } +} diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs new file mode 100644 index 00000000..c5534931 --- /dev/null +++ b/src/ViewModels/RevisionCompare.cs @@ -0,0 +1,172 @@ +using Avalonia.Controls; +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class RevisionCompare : ObservableObject { + public Models.Commit StartPoint { + get; + private set; + } + + public Models.Commit EndPoint { + get; + private set; + } + + public List VisibleChanges { + get => _visibleChanges; + private set => SetProperty(ref _visibleChanges, value); + } + + public List ChangeTree { + get => _changeTree; + private set => SetProperty(ref _changeTree, value); + } + + public Models.Change SelectedChange { + get => _selectedChange; + set { + if (SetProperty(ref _selectedChange, value)) { + if (value == null) { + SelectedNode = null; + DiffContext = null; + } else { + SelectedNode = FileTreeNode.SelectByPath(_changeTree, value.Path); + DiffContext = new DiffContext(_repo, new Models.DiffOption(StartPoint.SHA, EndPoint.SHA, value)); + } + } + } + } + + public FileTreeNode SelectedNode { + get => _selectedNode; + set { + if (SetProperty(ref _selectedNode, value)) { + if (value == null) { + SelectedChange = null; + } else { + SelectedChange = value.Backend as Models.Change; + } + } + } + } + + public string SearchFilter { + get => _searchFilter; + set { + if (SetProperty(ref _searchFilter, value)) { + RefreshVisible(); + } + } + } + + public DiffContext DiffContext { + get => _diffContext; + private set => SetProperty(ref _diffContext, value); + } + + public RevisionCompare(string repo, Models.Commit startPoint, Models.Commit endPoint) { + _repo = repo; + StartPoint = startPoint; + EndPoint = endPoint; + + Task.Run(() => { + _changes = new Commands.CompareRevisions(_repo, startPoint.SHA, endPoint.SHA).Result(); + + var visible = _changes; + if (!string.IsNullOrWhiteSpace(_searchFilter)) { + visible = new List(); + foreach (var c in _changes) { + if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(c); + } + } + } + + var tree = FileTreeNode.Build(visible); + Dispatcher.UIThread.Invoke(() => { + VisibleChanges = visible; + ChangeTree = tree; + }); + }); + } + + public void NavigateTo(string commitSHA) { + var repo = Preference.FindRepository(_repo); + if (repo != null) repo.NavigateToCommit(commitSHA); + } + + public void ClearSearchFilter() { + SearchFilter = string.Empty; + } + + public ContextMenu CreateChangeContextMenu(Models.Change change) { + var menu = new ContextMenu(); + + if (change.Index != Models.ChangeState.Deleted) { + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Click += (_, ev) => { + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo, change.Path) }; + window.Show(); + ev.Handled = true; + }; + + var full = Path.GetFullPath(Path.Combine(_repo, change.Path)); + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.IsEnabled = File.Exists(full); + explore.Click += (_, ev) => { + Native.OS.OpenInFileManager(full, true); + ev.Handled = true; + }; + + menu.Items.Add(history); + menu.Items.Add(explore); + } + + var copyPath = new MenuItem(); + copyPath.Header = App.Text("CopyPath"); + copyPath.Click += (_, ev) => { + App.CopyText(change.Path); + ev.Handled = true; + }; + + menu.Items.Add(copyPath); + return menu; + } + + private void RefreshVisible() { + if (_changes == null) return; + + if (string.IsNullOrEmpty(_searchFilter)) { + VisibleChanges = _changes; + } else { + var visible = new List(); + foreach (var c in _changes) { + if (c.Path.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) { + visible.Add(c); + } + } + + VisibleChanges = visible; + } + + ChangeTree = FileTreeNode.Build(_visibleChanges); + } + + private string _repo = string.Empty; + private List _changes = null; + private List _visibleChanges = null; + private List _changeTree = null; + private Models.Change _selectedChange = null; + private FileTreeNode _selectedNode = null; + private string _searchFilter = string.Empty; + private DiffContext _diffContext = null; + } +} diff --git a/src/ViewModels/Reword.cs b/src/ViewModels/Reword.cs new file mode 100644 index 00000000..f864fa6d --- /dev/null +++ b/src/ViewModels/Reword.cs @@ -0,0 +1,39 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Reword : Popup { + public Models.Commit Head { + get; + private set; + } + + [Required(ErrorMessage = "Commit message is required!!!")] + public string Message { + get => _message; + set => SetProperty(ref _message, value, true); + } + + public Reword(Repository repo, Models.Commit head) { + _repo = repo; + Head = head; + Message = head.FullMessage; + View = new Views.Reword() { DataContext = this }; + } + + public override Task Sure() { + if (_message == Head.FullMessage) return null; + + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + SetProgressDescription($"Editing head commit message ..."); + var succ = new Commands.Commit(_repo.FullPath, _message, true, true).Exec(); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return succ; + }); + } + + private Repository _repo = null; + private string _message = string.Empty; + } +} diff --git a/src/ViewModels/Squash.cs b/src/ViewModels/Squash.cs new file mode 100644 index 00000000..5964b51b --- /dev/null +++ b/src/ViewModels/Squash.cs @@ -0,0 +1,43 @@ +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class Squash : Popup { + public Models.Commit Head { + get; + private set; + } + + public Models.Commit Parent { + get; + private set; + } + + [Required(ErrorMessage = "Commit message is required!!!")] + public string Message { + get => _message; + set => SetProperty(ref _message, value, true); + } + + public Squash(Repository repo, Models.Commit head, Models.Commit parent) { + _repo = repo; + _message = parent.FullMessage; + Head = head; + Parent = parent; + View = new Views.Squash() { DataContext = this }; + } + + public override Task Sure() { + _repo.SetWatcherEnabled(false); + 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)); + return succ; + }); + } + + private Repository _repo = null; + private string _message = string.Empty; + } +} diff --git a/src/ViewModels/StashChanges.cs b/src/ViewModels/StashChanges.cs new file mode 100644 index 00000000..7bdecd7c --- /dev/null +++ b/src/ViewModels/StashChanges.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class StashChanges : Popup { + + public string Message { + get; + set; + } + + public bool CanIgnoreUntracked { + get; + private set; + } + + public bool IncludeUntracked { + get; + set; + } + + public StashChanges(Repository repo, List changes, bool canIgnoreUntracked) { + _repo = repo; + _changes = changes; + + CanIgnoreUntracked = canIgnoreUntracked; + IncludeUntracked = true; + View = new Views.StashChanges() { DataContext = this }; + } + + public override Task Sure() { + var jobs = _changes; + if (CanIgnoreUntracked && !IncludeUntracked) { + jobs = new List(); + foreach (var job in _changes) { + if (job.WorkTree != Models.ChangeState.Untracked && job.WorkTree != Models.ChangeState.Added) { + jobs.Add(job); + } + } + } + + if (jobs.Count == 0) return null; + + _repo.SetWatcherEnabled(false); + return Task.Run(() => { + new Commands.Stash(_repo.FullPath).Push(jobs, Message); + CallUIThread(() => _repo.SetWatcherEnabled(true)); + return true; + }); + } + + private Repository _repo = null; + private List _changes = null; + } +} diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs new file mode 100644 index 00000000..12f8383b --- /dev/null +++ b/src/ViewModels/StashesPage.cs @@ -0,0 +1,105 @@ +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class StashesPage : ObservableObject { + public int Count { + get => _stashes == null ? 0 : _stashes.Count; + } + + public List Stashes { + get => _stashes; + set { + if (SetProperty(ref _stashes, value)) { + SelectedStash = null; + } + } + } + + public Models.Stash SelectedStash { + get => _selectedStash; + set { + if (SetProperty(ref _selectedStash, value)) { + if (value == null) { + Changes = null; + } else { + Task.Run(() => { + var changes = new Commands.QueryStashChanges(_repo.FullPath, value.SHA).Result(); + Dispatcher.UIThread.Invoke(() => { + Changes = changes; + }); + }); + } + } + } + } + + public List Changes { + get => _changes; + private set { + if (SetProperty(ref _changes, value)) { + SelectedChange = null; + } + } + } + + public Models.Change SelectedChange { + get => _selectedChange; + set { + if (SetProperty(ref _selectedChange, value)) { + if (value == null) { + DiffContext = null; + } else { + DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, value)); + } + } + } + } + + public DiffContext DiffContext { + get => _diffContext; + private set => SetProperty(ref _diffContext, value); + } + + public StashesPage(Repository repo) { + _repo = repo; + } + + public void Apply(object param) { + if (param is Models.Stash stash) { + Task.Run(() => { + new Commands.Stash(_repo.FullPath).Apply(stash.Name); + }); + } + } + + public void Pop(object param) { + if (param is Models.Stash stash) { + Task.Run(() => { + new Commands.Stash(_repo.FullPath).Pop(stash.Name); + }); + } + } + + public void Drop(object param) { + if (param is Models.Stash stash && PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new DropStash(_repo.FullPath, stash)); + } + } + + public void Clear() { + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new ClearStashes(_repo)); + } + } + + private Repository _repo = null; + private List _stashes = null; + private Models.Stash _selectedStash = null; + private List _changes = null; + private Models.Change _selectedChange = null; + private DiffContext _diffContext = null; + } +} diff --git a/src/ViewModels/TwoSideTextDiff.cs b/src/ViewModels/TwoSideTextDiff.cs new file mode 100644 index 00000000..07f4cf95 --- /dev/null +++ b/src/ViewModels/TwoSideTextDiff.cs @@ -0,0 +1,52 @@ +using Avalonia; +using CommunityToolkit.Mvvm.ComponentModel; +using System.Collections.Generic; + +namespace SourceGit.ViewModels { + public class TwoSideTextDiff : ObservableObject { + public Vector SyncScrollOffset { + get => _syncScrollOffset; + set => SetProperty(ref _syncScrollOffset, value); + } + + public string File { get; set; } = string.Empty; + public List Old { get; set; } = new List(); + public List New { get; set; } = new List(); + public int MaxLineNumber = 0; + + public TwoSideTextDiff(Models.TextDiff diff) { + File = diff.File; + MaxLineNumber = diff.MaxLineNumber; + + foreach (var line in diff.Lines) { + switch (line.Type) { + case Models.TextDiffLineType.Added: + New.Add(line); + break; + case Models.TextDiffLineType.Deleted: + Old.Add(line); + break; + default: + FillEmptyLines(); + Old.Add(line); + New.Add(line); + break; + } + } + + FillEmptyLines(); + } + + private void FillEmptyLines() { + if (Old.Count < New.Count) { + int diff = New.Count - Old.Count; + for (int i = 0; i < diff; i++) Old.Add(new Models.TextDiffLine()); + } else if (Old.Count > New.Count) { + int diff = Old.Count - New.Count; + for (int i = 0; i < diff; i++) New.Add(new Models.TextDiffLine()); + } + } + + private Vector _syncScrollOffset; + } +} diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs new file mode 100644 index 00000000..b75ed664 --- /dev/null +++ b/src/ViewModels/Welcome.cs @@ -0,0 +1,102 @@ +using Avalonia.Collections; +using CommunityToolkit.Mvvm.ComponentModel; +using System; + +namespace SourceGit.ViewModels { + public class Welcome : ObservableObject { + public bool IsClearSearchVisible { + get => !string.IsNullOrEmpty(_searchFilter); + } + + public AvaloniaList RepositoryNodes { + get => Preference.Instance.RepositoryNodes; + } + + public string SearchFilter { + get => _searchFilter; + set { + if (SetProperty(ref _searchFilter, value)) { + Referesh(); + OnPropertyChanged(nameof(IsClearSearchVisible)); + } + } + } + + public void InitRepository(string path) { + if (!Preference.Instance.IsGitConfigured) { + App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured")); + return; + } + + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new Init(path)); + } + } + + public void Clone(object param) { + var page = param as LauncherPage; + + if (!Preference.Instance.IsGitConfigured) { + App.RaiseException(page.GetId(), App.Text("NotConfigured")); + return; + } + + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new Clone(page)); + } + } + + public void OpenTerminal() { + if (!Preference.Instance.IsGitConfigured) { + App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured")); + } else { + Native.OS.OpenTerminal(null); + } + } + + public void ClearSearchFilter() { + SearchFilter = string.Empty; + } + + public void AddFolder() { + if (PopupHost.CanCreatePopup()) PopupHost.ShowPopup(new CreateGroup(null)); + } + + public void MoveNode(RepositoryNode from, RepositoryNode to) { + Preference.MoveNode(from, to); + } + + private void Referesh() { + if (string.IsNullOrWhiteSpace(_searchFilter)) { + foreach (var node in RepositoryNodes) ResetVisibility(node); + } else { + foreach (var node in RepositoryNodes) SetVisibilityBySearch(node); + } + } + + private void ResetVisibility(RepositoryNode node) { + node.IsVisible = true; + foreach (var subNode in node.SubNodes) ResetVisibility(subNode); + } + + private void SetVisibilityBySearch(RepositoryNode node) { + if (!node.IsRepository) { + if (node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)) { + node.IsVisible = true; + foreach (var subNode in node.SubNodes) ResetVisibility(subNode); + } else { + bool hasVisibleSubNode = false; + foreach (var subNode in node.SubNodes) { + SetVisibilityBySearch(subNode); + hasVisibleSubNode |= subNode.IsVisible; + } + node.IsVisible = hasVisibleSubNode; + } + } else { + node.IsVisible = node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase); + } + } + + private string _searchFilter = string.Empty; + } +} diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs new file mode 100644 index 00000000..a6ef0bb4 --- /dev/null +++ b/src/ViewModels/WorkingCopy.cs @@ -0,0 +1,600 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Platform.Storage; +using Avalonia.Threading; +using CommunityToolkit.Mvvm.ComponentModel; +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; + +namespace SourceGit.ViewModels { + public class ConflictContext { + public Models.Change Change { get; set; } + } + + public class ViewChangeDetailContext { + public string FilePath { get; set; } = string.Empty; + public bool IsUnstaged { get; set; } = false; + } + + public class WorkingCopy : ObservableObject { + public bool IsStaging { + get => _isStaging; + private set => SetProperty(ref _isStaging, value); + } + + public bool IsUnstaging { + get => _isUnstaging; + private set => SetProperty(ref _isUnstaging, value); + } + + public bool IsCommitting { + get => _isCommitting; + private set => SetProperty(ref _isCommitting, value); + } + + public bool UseAmend { + get => _useAmend; + set => SetProperty(ref _useAmend, value); + } + + public List Unstaged { + get => _unstaged; + private set => SetProperty(ref _unstaged, value); + } + + public List Staged { + get => _staged; + private set => SetProperty(ref _staged, value); + } + + public int Count { + get => _count; + } + + public List UnstagedTree { + get => _unstagedTree; + private set => SetProperty(ref _unstagedTree, value); + } + + public List StagedTree { + get => _stagedTree; + private set => SetProperty(ref _stagedTree, value); + } + + public object DetailContext { + get => _detailContext; + private set => SetProperty(ref _detailContext, value); + } + + public string CommitMessage { + get => _commitMessage; + set => SetProperty(ref _commitMessage, value); + } + + public WorkingCopy(Repository repo) { + _repo = repo; + } + + public bool SetData(List changes) { + var unstaged = new List(); + var staged = new List(); + + var viewFile = _lastViewChange == null ? string.Empty : _lastViewChange.FilePath; + var viewChange = null as Models.Change; + var hasConflict = false; + foreach (var c in changes) { + if (c.Path == viewFile) { + viewChange = c; + } + + if (c.Index == Models.ChangeState.Modified + || c.Index == Models.ChangeState.Added + || c.Index == Models.ChangeState.Deleted + || c.Index == Models.ChangeState.Renamed) { + staged.Add(c); + } + + if (c.WorkTree != Models.ChangeState.None) { + unstaged.Add(c); + hasConflict |= c.IsConflit; + } + } + + _count = changes.Count; + + var unstagedTree = FileTreeNode.Build(unstaged); + var stagedTree = FileTreeNode.Build(staged); + Dispatcher.UIThread.Invoke(() => { + _isLoadingData = true; + Unstaged = unstaged; + Staged = staged; + UnstagedTree = unstagedTree; + StagedTree = stagedTree; + _isLoadingData = false; + SetDetail(viewChange, _lastViewChange == null || _lastViewChange.IsUnstaged); + }); + + return hasConflict; + } + + public void SetDetail(Models.Change change, bool isUnstaged) { + if (_isLoadingData) return; + + if (change == null) { + _lastViewChange = null; + DetailContext = null; + } else if (change.IsConflit) { + _lastViewChange = new ViewChangeDetailContext() { FilePath = change.Path, IsUnstaged = isUnstaged }; + DetailContext = new ConflictContext() { Change = change }; + } else { + _lastViewChange = new ViewChangeDetailContext() { FilePath = change.Path, IsUnstaged = isUnstaged }; + DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged)); + } + } + + public async void StageChanges(List changes) { + if (_unstaged.Count == 0 || changes.Count == 0) return; + + IsStaging = true; + _repo.SetWatcherEnabled(false); + if (changes.Count == _unstaged.Count) { + await Task.Run(() => new Commands.Add(_repo.FullPath).Exec()); + } else { + for (int i = 0; i < changes.Count; i += 10) { + var count = Math.Min(10, changes.Count - i); + var step = changes.GetRange(i, count); + await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec()); + } + } + _repo.RefreshWorkingCopyChanges(); + _repo.SetWatcherEnabled(true); + IsStaging = false; + } + + public async void UnstageChanges(List changes) { + if (_staged.Count == 0 || changes.Count == 0) return; + + IsUnstaging = true; + _repo.SetWatcherEnabled(false); + if (changes.Count == _staged.Count) { + await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec()); + } else { + for (int i = 0; i < changes.Count; i += 10) { + var count = Math.Min(10, changes.Count - i); + var step = changes.GetRange(i, count); + await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec()); + } + } + _repo.RefreshWorkingCopyChanges(); + _repo.SetWatcherEnabled(true); + IsUnstaging = false; + } + + public void Discard(List changes) { + if (PopupHost.CanCreatePopup()) { + if (changes.Count == _count) { + PopupHost.ShowPopup(new Discard(_repo)); + } else { + PopupHost.ShowPopup(new Discard(_repo, changes)); + } + } + } + + public async void UseTheirs() { + if (_detailContext is ConflictContext ctx) { + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).File(ctx.Change.Path, true)); + if (succ) { + await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec()); + } + _repo.RefreshWorkingCopyChanges(); + _repo.SetWatcherEnabled(true); + } + } + + public async void UseMine() { + if (_detailContext is ConflictContext ctx) { + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).File(ctx.Change.Path, false)); + if (succ) { + await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec()); + } + _repo.RefreshWorkingCopyChanges(); + _repo.SetWatcherEnabled(true); + } + } + + public async void UseExternalMergeTool() { + if (_detailContext is ConflictContext ctx) { + var type = Preference.Instance.ExternalMergeToolType; + var exec = Preference.Instance.ExternalMergeToolPath; + + var tool = Models.ExternalMergeTools.Supported.Find(x => x.Type == type); + if (tool == null) { + App.RaiseException(_repo.FullPath, "Invalid merge tool in preference setting!"); + return; + } + + var args = tool.Type != 0 ? tool.Cmd : Preference.Instance.ExternalMergeToolCmd; + + _repo.SetWatcherEnabled(false); + await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, exec, args, ctx.Change.Path)); + _repo.SetWatcherEnabled(true); + } + } + + public async void DoCommit(bool autoPush) { + if (!PopupHost.CanCreatePopup()) { + App.RaiseException(_repo.FullPath, "Repository has unfinished job! Please wait!"); + return; + } + + if (_staged.Count == 0) { + App.RaiseException(_repo.FullPath, "No files added to commit!"); + return; + } + + if (string.IsNullOrWhiteSpace(_commitMessage)) { + App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!"); + return; + } + + PushCommitMessage(); + + IsCommitting = true; + _repo.SetWatcherEnabled(false); + var succ = await Task.Run(() => new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend).Exec()); + if (succ) { + CommitMessage = string.Empty; + UseAmend = false; + + if (autoPush) { + PopupHost.ShowAndStartPopup(new Push(_repo, null)); + } + } + _repo.RefreshWorkingCopyChanges(); + _repo.SetWatcherEnabled(true); + IsCommitting = false; + } + + public ContextMenu CreateContextMenuForUnstagedChanges(List changes) { + if (changes.Count == 0) return null; + + var menu = new ContextMenu(); + if (changes.Count == 1) { + var change = changes[0]; + var path = Path.GetFullPath(Path.Combine(_repo.FullPath, change.Path)); + + var explore = new MenuItem(); + explore.Header = App.Text("RevealFile"); + explore.Icon = CreateMenuIcon("Icons.Folder.Open"); + explore.IsEnabled = File.Exists(path) || Directory.Exists(path); + explore.Click += (_, e) => { + Native.OS.OpenInFileManager(path, true); + e.Handled = true; + }; + + var openWith = new MenuItem(); + openWith.Header = App.Text("OpenWith"); + openWith.Icon = CreateMenuIcon("Icons.OpenWith"); + openWith.IsEnabled = File.Exists(path); + openWith.Click += (_, e) => { + Native.OS.OpenWithDefaultEditor(path); + e.Handled = true; + }; + + var stage = new MenuItem(); + stage.Header = App.Text("FileCM.Stage"); + stage.Icon = CreateMenuIcon("Icons.File.Add"); + stage.Click += (_, e) => { + StageChanges(changes); + e.Handled = true; + }; + + var discard = new MenuItem(); + discard.Header = App.Text("FileCM.Discard"); + discard.Icon = CreateMenuIcon("Icons.Undo"); + discard.Click += (_, e) => { + Discard(changes); + e.Handled = true; + }; + + var stash = new MenuItem(); + stash.Header = App.Text("FileCM.Stash"); + stash.Icon = CreateMenuIcon("Icons.Stashes"); + stash.Click += (_, e) => { + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } + e.Handled = true; + }; + + var patch = new MenuItem(); + patch.Header = App.Text("FileCM.SaveAsPatch"); + patch.Icon = CreateMenuIcon("Icons.Diff"); + patch.Click += async (_, e) => { + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; + + var options = new FilePickerSaveOptions(); + options.Title = App.Text("FileCM.SaveAsPatch"); + options.DefaultExtension = ".patch"; + options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; + + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); + if (storageFile != null) { + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath)); + if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + } + + e.Handled = true; + }; + + var history = new MenuItem(); + history.Header = App.Text("FileHistory"); + history.Icon = CreateMenuIcon("Icons.Histories"); + history.Click += (_, e) => { + var window = new Views.FileHistories() { DataContext = new FileHistories(_repo.FullPath, change.Path) }; + window.Show(); + e.Handled = true; + }; + + var assumeUnchanged = new MenuItem(); + assumeUnchanged.Header = App.Text("FileCM.AssumeUnchanged"); + assumeUnchanged.Icon = CreateMenuIcon("Icons.File.Ignore"); + assumeUnchanged.IsEnabled = change.WorkTree != Models.ChangeState.Untracked; + assumeUnchanged.Click += (_, e) => { + new Commands.AssumeUnchanged(_repo.FullPath).Add(change.Path); + e.Handled = true; + }; + + var copy = new MenuItem(); + copy.Header = App.Text("CopyPath"); + copy.Icon = CreateMenuIcon("Icons.Copy"); + copy.Click += (_, e) => { + App.CopyText(change.Path); + e.Handled = true; + }; + + menu.Items.Add(explore); + menu.Items.Add(openWith); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(stage); + menu.Items.Add(discard); + menu.Items.Add(stash); + menu.Items.Add(patch); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(history); + menu.Items.Add(assumeUnchanged); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(copy); + } else { + var stage = new MenuItem(); + stage.Header = App.Text("FileCM.StageMulti", changes.Count); + stage.Icon = CreateMenuIcon("Icons.File.Add"); + stage.Click += (_, e) => { + StageChanges(changes); + e.Handled = true; + }; + + var discard = new MenuItem(); + discard.Header = App.Text("FileCM.DiscardMulti", changes.Count); + discard.Icon = CreateMenuIcon("Icons.Undo"); + discard.Click += (_, e) => { + Discard(changes); + e.Handled = true; + }; + + var stash = new MenuItem(); + stash.Header = App.Text("FileCM.StashMulti", changes.Count); + stash.Icon = CreateMenuIcon("Icons.Stashes"); + stash.Click += (_, e) => { + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } + e.Handled = true; + }; + + var patch = new MenuItem(); + patch.Header = App.Text("FileCM.SaveAsPatch"); + patch.Icon = CreateMenuIcon("Icons.Diff"); + patch.Click += async (o, e) => { + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; + + var options = new FilePickerSaveOptions(); + options.Title = App.Text("FileCM.SaveAsPatch"); + options.DefaultExtension = ".patch"; + options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; + + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); + if (storageFile != null) { + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath)); + if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + } + + e.Handled = true; + }; + + menu.Items.Add(stage); + menu.Items.Add(discard); + menu.Items.Add(stash); + menu.Items.Add(patch); + } + + return menu; + } + + public ContextMenu CreateContextMenuForStagedChanges(List changes) { + if (changes.Count == 0) return null; + + var menu = new ContextMenu(); + if (changes.Count == 1) { + var change = changes[0]; + var path = Path.GetFullPath(Path.Combine(_repo.FullPath, change.Path)); + + var explore = new MenuItem(); + explore.IsEnabled = File.Exists(path) || Directory.Exists(path); + explore.Header = App.Text("RevealFile"); + explore.Icon = CreateMenuIcon("Icons.Folder.Open"); + explore.Click += (o, e) => { + Native.OS.OpenInFileManager(path, true); + e.Handled = true; + }; + + var openWith = new MenuItem(); + openWith.Header = App.Text("OpenWith"); + openWith.Icon = CreateMenuIcon("Icons.OpenWith"); + openWith.IsEnabled = File.Exists(path); + openWith.Click += (_, e) => { + Native.OS.OpenWithDefaultEditor(path); + e.Handled = true; + }; + + var unstage = new MenuItem(); + unstage.Header = App.Text("FileCM.Unstage"); + unstage.Icon = CreateMenuIcon("Icons.File.Remove"); + unstage.Click += (o, e) => { + UnstageChanges(changes); + e.Handled = true; + }; + + var stash = new MenuItem(); + stash.Header = App.Text("FileCM.Stash"); + stash.Icon = CreateMenuIcon("Icons.Stashes"); + stash.Click += (_, e) => { + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } + e.Handled = true; + }; + + var patch = new MenuItem(); + patch.Header = App.Text("FileCM.SaveAsPatch"); + patch.Icon = CreateMenuIcon("Icons.Diff"); + patch.Click += async (o, e) => { + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; + + var options = new FilePickerSaveOptions(); + options.Title = App.Text("FileCM.SaveAsPatch"); + options.DefaultExtension = ".patch"; + options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; + + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); + if (storageFile != null) { + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath)); + if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + } + + e.Handled = true; + }; + + var copyPath = new MenuItem(); + copyPath.Header = App.Text("CopyPath"); + copyPath.Icon = CreateMenuIcon("Icons.Copy"); + copyPath.Click += (o, e) => { + App.CopyText(change.Path); + e.Handled = true; + }; + + menu.Items.Add(explore); + menu.Items.Add(openWith); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(unstage); + menu.Items.Add(stash); + menu.Items.Add(patch); + menu.Items.Add(new MenuItem() { Header = "-" }); + menu.Items.Add(copyPath); + } else { + var unstage = new MenuItem(); + unstage.Header = App.Text("FileCM.UnstageMulti", changes.Count); + unstage.Icon = CreateMenuIcon("Icons.File.Remove"); + unstage.Click += (o, e) => { + UnstageChanges(changes); + e.Handled = true; + }; + + var stash = new MenuItem(); + stash.Header = App.Text("FileCM.StashMulti", changes.Count); + stash.Icon = CreateMenuIcon("Icons.Stashes"); + stash.Click += (_, e) => { + if (PopupHost.CanCreatePopup()) { + PopupHost.ShowPopup(new StashChanges(_repo, changes, false)); + } + e.Handled = true; + }; + + var patch = new MenuItem(); + patch.Header = App.Text("FileCM.SaveAsPatch"); + patch.Icon = CreateMenuIcon("Icons.Diff"); + patch.Click += async (_, e) => { + var topLevel = App.GetTopLevel(); + if (topLevel == null) return; + + var options = new FilePickerSaveOptions(); + options.Title = App.Text("FileCM.SaveAsPatch"); + options.DefaultExtension = ".patch"; + options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]; + + var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options); + if (storageFile != null) { + var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath)); + if (succ) App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess")); + } + + e.Handled = true; + }; + + menu.Items.Add(unstage); + menu.Items.Add(stash); + menu.Items.Add(patch); + } + + return menu; + } + + private Avalonia.Controls.Shapes.Path CreateMenuIcon(string key) { + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 12; + icon.Height = 12; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource(key) as StreamGeometry; + return icon; + } + + private void PushCommitMessage() { + var existIdx = _repo.CommitMessages.IndexOf(CommitMessage); + if (existIdx == 0) { + return; + } else if (existIdx > 0) { + _repo.CommitMessages.Move(existIdx, 0); + return; + } + + if (_repo.CommitMessages.Count > 9) { + _repo.CommitMessages.RemoveRange(9, _repo.CommitMessages.Count - 9); + } + + _repo.CommitMessages.Insert(0, CommitMessage); + } + + private Repository _repo = null; + private bool _isLoadingData = false; + private bool _isStaging = false; + private bool _isUnstaging = false; + private bool _isCommitting = false; + private bool _useAmend = false; + private List _unstaged = null; + private List _staged = null; + private int _count = 0; + private List _unstagedTree = null; + private List _stagedTree = null; + private ViewChangeDetailContext _lastViewChange = null; + private object _detailContext = null; + private string _commitMessage = string.Empty; + } +} diff --git a/src/Views/About.axaml b/src/Views/About.axaml new file mode 100644 index 00000000..9c9f0a9f --- /dev/null +++ b/src/Views/About.axaml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs new file mode 100644 index 00000000..90d047ef --- /dev/null +++ b/src/Views/About.axaml.cs @@ -0,0 +1,39 @@ +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using System.Reflection; + +namespace SourceGit.Views { + public partial class About : Window { + public string Version { + get; + private set; + } + + public About() { + var ver = Assembly.GetExecutingAssembly().GetName().Version; + Version = $"{ver.Major}.{ver.Minor}"; + DataContext = this; + InitializeComponent(); + } + + private void CloseWindow(object sender, RoutedEventArgs e) { + Close(); + } + + private void OnVisitAvaloniaUI(object sender, PointerPressedEventArgs e) { + Native.OS.OpenBrowser("https://www.avaloniaui.net/"); + e.Handled = true; + } + + private void OnVisitAvaloniaEdit(object sender, PointerPressedEventArgs e) { + Native.OS.OpenBrowser("https://www.nuget.org/packages/OneWare.AvaloniaEdit"); + e.Handled = true; + } + + private void OnVisitJetBrainsMonoFont(object sender, PointerPressedEventArgs e) { + Native.OS.OpenBrowser("https://www.jetbrains.com/lp/mono/"); + e.Handled = true; + } + } +} diff --git a/src/Views/About.xaml b/src/Views/About.xaml deleted file mode 100644 index 1b754a30..00000000 --- a/src/Views/About.xaml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/About.xaml.cs b/src/Views/About.xaml.cs deleted file mode 100644 index cce5e618..00000000 --- a/src/Views/About.xaml.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Reflection; -using System.Windows; - -namespace SourceGit.Views { - - /// - /// 关于对话框 - /// - public partial class About : Controls.Window { - - public class Keymap { - public string Key { get; set; } - public string Desc { get; set; } - public Keymap(string k, string d) { Key = k; Desc = App.Text($"Hotkeys.{d}"); } - } - - public About() { - InitializeComponent(); - - var asm = Assembly.GetExecutingAssembly().GetName(); - version.Text = $"VERSION : v{asm.Version.Major}.{asm.Version.Minor}"; - - hotkeys.ItemsSource = new List() { - new Keymap("CTRL + T", "NewTab"), - new Keymap("CTRL + W", "CloseTab"), - new Keymap("CTRL + TAB", "NextTab"), - new Keymap("CTRL + [1-9]", "SwitchTo"), - new Keymap("CTRL + F", "Search"), - new Keymap("F5", "Refresh"), - new Keymap("SPACE", "ToggleStage"), - new Keymap("ESC", "CancelPopup"), - }; - } - - private void OnRequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e) { - var info = new ProcessStartInfo("cmd", $"/c start {e.Uri.AbsoluteUri}"); - info.CreateNoWindow = true; - Process.Start(info); - } - - private void Quit(object sender, RoutedEventArgs e) { - Close(); - } - } -} diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml new file mode 100644 index 00000000..4b460d79 --- /dev/null +++ b/src/Views/AddRemote.axaml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/AddRemote.axaml.cs b/src/Views/AddRemote.axaml.cs new file mode 100644 index 00000000..f3640e30 --- /dev/null +++ b/src/Views/AddRemote.axaml.cs @@ -0,0 +1,22 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Platform.Storage; + +namespace SourceGit.Views { + public partial class AddRemote : UserControl { + public AddRemote() { + InitializeComponent(); + } + + private async void SelectSSHKey(object sender, RoutedEventArgs e) { + var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] }; + var toplevel = TopLevel.GetTopLevel(this); + var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options); + if (selected.Count == 1) { + txtSSHKey.Text = selected[0].Path.LocalPath; + } + + e.Handled = true; + } + } +} diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml new file mode 100644 index 00000000..f7c70bfd --- /dev/null +++ b/src/Views/AddSubmodule.axaml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + diff --git a/src/Views/AddSubmodule.axaml.cs b/src/Views/AddSubmodule.axaml.cs new file mode 100644 index 00000000..358faaa7 --- /dev/null +++ b/src/Views/AddSubmodule.axaml.cs @@ -0,0 +1,9 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class AddSubmodule : UserControl { + public AddSubmodule() { + InitializeComponent(); + } + } +} diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml new file mode 100644 index 00000000..979741c8 --- /dev/null +++ b/src/Views/Apply.axaml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/Apply.axaml.cs b/src/Views/Apply.axaml.cs new file mode 100644 index 00000000..3f61a4dd --- /dev/null +++ b/src/Views/Apply.axaml.cs @@ -0,0 +1,24 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Platform.Storage; + +namespace SourceGit.Views { + public partial class Apply : UserControl { + public Apply() { + InitializeComponent(); + } + + private async void SelectPatchFile(object sender, RoutedEventArgs e) { + var topLevel = TopLevel.GetTopLevel(this); + if (topLevel == null) return; + + var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [ new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }] }; + var selected = await topLevel.StorageProvider.OpenFilePickerAsync(options); + if (selected.Count == 1) { + txtPatchFile.Text = selected[0].Path.LocalPath; + } + + e.Handled = true; + } + } +} diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml new file mode 100644 index 00000000..be2d0ddc --- /dev/null +++ b/src/Views/Archive.axaml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/Archive.axaml.cs b/src/Views/Archive.axaml.cs new file mode 100644 index 00000000..63e73448 --- /dev/null +++ b/src/Views/Archive.axaml.cs @@ -0,0 +1,22 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Platform.Storage; + +namespace SourceGit.Views { + public partial class Archive : UserControl { + public Archive() { + InitializeComponent(); + } + + private async void SelectOutputFile(object sender, RoutedEventArgs e) { + var options = new FilePickerSaveOptions() { DefaultExtension = ".zip", FileTypeChoices = [ new FilePickerFileType("ZIP") { Patterns = [ "*.zip" ]}] }; + var toplevel = TopLevel.GetTopLevel(this); + var selected = await toplevel.StorageProvider.SaveFilePickerAsync(options); + if (selected != null) { + txtSaveFile.Text = selected.Path.LocalPath; + } + + e.Handled = true; + } + } +} diff --git a/src/Views/AssumeUnchanged.xaml b/src/Views/AssumeUnchanged.xaml deleted file mode 100644 index 01d5413f..00000000 --- a/src/Views/AssumeUnchanged.xaml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/AssumeUnchanged.xaml.cs b/src/Views/AssumeUnchanged.xaml.cs deleted file mode 100644 index 1336f0bb..00000000 --- a/src/Views/AssumeUnchanged.xaml.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Collections.ObjectModel; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; - -namespace SourceGit.Views { - /// - /// 管理不跟踪变更的文件 - /// - public partial class AssumeUnchanged : Controls.Window { - private string repo = null; - - public ObservableCollection Files { get; set; } - - public AssumeUnchanged(string repo) { - this.repo = repo; - this.Files = new ObservableCollection(); - - InitializeComponent(); - - Task.Run(() => { - var unchanged = new Commands.AssumeUnchanged(repo).View(); - Dispatcher.Invoke(() => { - if (unchanged.Count > 0) { - foreach (var file in unchanged) Files.Add(file); - - mask.Visibility = Visibility.Collapsed; - list.Visibility = Visibility.Visible; - list.ItemsSource = Files; - } else { - list.Visibility = Visibility.Collapsed; - mask.Visibility = Visibility.Visible; - } - }); - }); - } - - private void OnQuit(object sender, RoutedEventArgs e) { - Close(); - } - - private void OnRequestBringIntoView(object sender, RequestBringIntoViewEventArgs e) { - e.Handled = true; - } - - private void Remove(object sender, RoutedEventArgs e) { - var btn = sender as Button; - if (btn == null) return; - - var file = btn.DataContext as string; - if (file == null) return; - - new Commands.AssumeUnchanged(repo).Remove(file); - Files.Remove(file); - - if (Files.Count == 0) { - list.Visibility = Visibility.Collapsed; - mask.Visibility = Visibility.Visible; - } - - e.Handled = true; - } - } -} diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml new file mode 100644 index 00000000..b7c59691 --- /dev/null +++ b/src/Views/AssumeUnchangedManager.axaml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/AssumeUnchangedManager.axaml.cs b/src/Views/AssumeUnchangedManager.axaml.cs new file mode 100644 index 00000000..616db87d --- /dev/null +++ b/src/Views/AssumeUnchangedManager.axaml.cs @@ -0,0 +1,14 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; + +namespace SourceGit.Views { + public partial class AssumeUnchangedManager : Window { + public AssumeUnchangedManager() { + InitializeComponent(); + } + + private void CloseWindow(object sender, RoutedEventArgs e) { + Close(); + } + } +} diff --git a/src/Views/Avatar.cs b/src/Views/Avatar.cs new file mode 100644 index 00000000..3feb04bb --- /dev/null +++ b/src/Views/Avatar.cs @@ -0,0 +1,122 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Media.Imaging; +using System; +using System.Globalization; +using System.Security.Cryptography; +using System.Text; + +namespace SourceGit.Views { + public class Avatar : Control, Models.IAvatarHost { + private static readonly GradientStops[] FALLBACK_GRADIENTS = [ + new GradientStops() { new GradientStop(Colors.Orange, 0), new GradientStop(Color.FromRgb(255, 213, 134), 1) }, + new GradientStops() { new GradientStop(Colors.DodgerBlue, 0), new GradientStop(Colors.LightSkyBlue, 1) }, + new GradientStops() { new GradientStop(Colors.LimeGreen, 0), new GradientStop(Color.FromRgb(124, 241, 124), 1) }, + new GradientStops() { new GradientStop(Colors.Orchid, 0), new GradientStop(Color.FromRgb(248, 161, 245), 1) }, + new GradientStops() { new GradientStop(Colors.Tomato, 0), new GradientStop(Color.FromRgb(252, 165, 150), 1) }, + ]; + + public static readonly StyledProperty FallbackFontFamilyProperty = + AvaloniaProperty.Register(nameof(FallbackFontFamily)); + + public FontFamily FallbackFontFamily { + get => GetValue(FallbackFontFamilyProperty); + set => SetValue(FallbackFontFamilyProperty, value); + } + + public static readonly StyledProperty UserProperty = + AvaloniaProperty.Register(nameof(User)); + + public Models.User User { + get => GetValue(UserProperty); + set => SetValue(UserProperty, value); + } + + static Avatar() { + AffectsRender(FallbackFontFamilyProperty); + UserProperty.Changed.AddClassHandler(OnUserPropertyChanged); + } + + public Avatar() { + var refetch = new MenuItem() { Header = App.Text("RefetchAvatar") }; + refetch.Click += (o, e) => { + if (User != null) { + _image = Models.AvatarManager.Request(_emailMD5, true); + InvalidateVisual(); + } + }; + + ContextMenu = new ContextMenu(); + ContextMenu.Items.Add(refetch); + + Models.AvatarManager.Subscribe(this); + } + + public override void Render(DrawingContext context) { + if (User == null) return; + + float corner = (float)Math.Max(2, Bounds.Width / 16); + if (_image != null) { + var rect = new Rect(0, 0, Bounds.Width, Bounds.Height); + context.PushClip(new RoundedRect(rect, corner)); + context.DrawImage(_image, rect); + } else { + Point textOrigin = new Point((Bounds.Width - _fallbackLabel.Width) * 0.5, (Bounds.Height - _fallbackLabel.Height) * 0.5); + context.DrawRectangle(_fallbackBrush, null, new Rect(0, 0, Bounds.Width, Bounds.Height), corner, corner); + context.DrawText(_fallbackLabel, textOrigin); + } + } + + public void OnAvatarResourceReady(string md5, Bitmap bitmap) { + if (_emailMD5 == md5) { + _image = bitmap; + InvalidateVisual(); + } + } + + private static void OnUserPropertyChanged(Avatar avatar, AvaloniaPropertyChangedEventArgs e) { + if (avatar.User == null) { + avatar._emailMD5 = null; + return; + } + + var placeholder = string.IsNullOrWhiteSpace(avatar.User.Name) ? "?" : avatar.User.Name.Substring(0, 1); + var chars = placeholder.ToCharArray(); + var sum = 0; + foreach (var c in chars) sum += Math.Abs(c); + + var hash = MD5.Create().ComputeHash(Encoding.Default.GetBytes(avatar.User.Email.ToLower().Trim())); + var builder = new StringBuilder(); + foreach (var c in hash) builder.Append(c.ToString("x2")); + var md5 = builder.ToString(); + if (avatar._emailMD5 != md5) { + avatar._emailMD5 = md5; + avatar._image = Models.AvatarManager.Request(md5, false); + } + + avatar._fallbackBrush = new LinearGradientBrush { + GradientStops = FALLBACK_GRADIENTS[sum % FALLBACK_GRADIENTS.Length], + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }; + + var typeface = avatar.FallbackFontFamily == null ? Typeface.Default : new Typeface(avatar.FallbackFontFamily); + + avatar._fallbackLabel = new FormattedText( + placeholder, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + avatar.Width * 0.65, + Brushes.White); + + avatar.InvalidateVisual(); + } + + private FormattedText _fallbackLabel = null; + private LinearGradientBrush _fallbackBrush = null; + private string _emailMD5 = null; + private Bitmap _image = null; + } +} diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml new file mode 100644 index 00000000..d3d054da --- /dev/null +++ b/src/Views/Blame.axaml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs new file mode 100644 index 00000000..5492cba7 --- /dev/null +++ b/src/Views/Blame.axaml.cs @@ -0,0 +1,261 @@ +using Avalonia; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Media; +using Avalonia.Controls; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Styling; +using AvaloniaEdit; +using AvaloniaEdit.Document; +using AvaloniaEdit.Editing; +using AvaloniaEdit.Rendering; +using AvaloniaEdit.TextMate; +using AvaloniaEdit.Utils; +using System; +using System.Globalization; +using System.IO; +using TextMateSharp.Grammars; + +namespace SourceGit.Views { + public class BlameTextEditor : TextEditor { + public class CommitInfoMargin : AbstractMargin { + public CommitInfoMargin(BlameTextEditor editor) { + _editor = editor; + ClipToBounds = true; + } + + public override void Render(DrawingContext context) { + if (_editor.BlameData == null) return; + + var view = TextView; + if (view != null && view.VisualLinesValid) { + var typeface = view.CreateTypeface(); + var underlinePen = new Pen(Brushes.DarkOrange, 1); + + foreach (var line in view.VisualLines) { + var lineNumber = line.FirstDocumentLine.LineNumber; + if (lineNumber > _editor.BlameData.LineInfos.Count) break; + + var info = _editor.BlameData.LineInfos[lineNumber - 1]; + if (!info.IsFirstInGroup) continue; + + var x = 0.0; + var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop) - view.VerticalOffset; + + var shaLink = new FormattedText( + info.CommitSHA, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + Brushes.DarkOrange); + context.DrawText(shaLink, new Point(x, y)); + context.DrawLine(underlinePen, new Point(x, y + shaLink.Baseline + 2), new Point(x + shaLink.Width, y + shaLink.Baseline + 2)); + x += shaLink.Width + 8; + + var time = new FormattedText( + info.Time, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + _editor.Foreground); + context.DrawText(time, new Point(x, y)); + x += time.Width + 8; + + var author = new FormattedText( + info.Author, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + _editor.Foreground); + context.DrawText(author, new Point(x, y)); + } + } + } + + protected override Size MeasureOverride(Size availableSize) { + return new Size(250, 0); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) { + base.OnPointerPressed(e); + + var view = TextView; + if (!e.Handled && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && view != null && view.VisualLinesValid) { + var pos = e.GetPosition(this); + var typeface = view.CreateTypeface(); + + foreach (var line in view.VisualLines) { + var lineNumber = line.FirstDocumentLine.LineNumber; + if (lineNumber >= _editor.BlameData.LineInfos.Count) break; + + var info = _editor.BlameData.LineInfos[lineNumber - 1]; + if (!info.IsFirstInGroup) continue; + + var y = line.GetTextLineVisualYPosition(line.TextLines[0], VisualYPosition.TextTop) - view.VerticalOffset; + var shaLink = new FormattedText( + info.CommitSHA, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + _editor.FontSize, + Brushes.DarkOrange); + + var rect = new Rect(0, y, shaLink.Width, shaLink.Height); + if (rect.Contains(pos)) { + _editor.OnCommitSHAClicked(info.CommitSHA); + e.Handled = true; + break; + } + } + } + } + + private BlameTextEditor _editor = null; + } + + public class VerticalSeperatorMargin : AbstractMargin { + public VerticalSeperatorMargin(BlameTextEditor editor) { + _editor = editor; + } + + public override void Render(DrawingContext context) { + var pen = new Pen(_editor.BorderBrush, 1); + context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height)); + } + + protected override Size MeasureOverride(Size availableSize) { + return new Size(1, 0); + } + + private BlameTextEditor _editor = null; + } + + public static readonly StyledProperty BlameDataProperty = + AvaloniaProperty.Register(nameof(BlameData)); + + public Models.BlameData BlameData { + get => GetValue(BlameDataProperty); + set => SetValue(BlameDataProperty, value); + } + + protected override Type StyleKeyOverride => typeof(TextEditor); + + public BlameTextEditor() : base(new TextArea(), new TextDocument()) { + IsReadOnly = true; + ShowLineNumbers = false; + WordWrap = false; + } + + public void OnCommitSHAClicked(string sha) { + if (DataContext is ViewModels.Blame blame) { + blame.NavigateToCommit(sha); + } + } + + protected override void OnLoaded(RoutedEventArgs e) { + base.OnLoaded(e); + + TextArea.LeftMargins.Add(new LineNumberMargin() { Margin = new Thickness(8, 0) }); + TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this)); + TextArea.LeftMargins.Add(new CommitInfoMargin(this) { Margin = new Thickness(8, 0) }); + TextArea.LeftMargins.Add(new VerticalSeperatorMargin(this)); + TextArea.TextView.ContextRequested += OnTextViewContextRequested; + TextArea.TextView.Margin = new Thickness(4, 0); + + if (App.Current?.ActualThemeVariant == ThemeVariant.Dark) { + _registryOptions = new RegistryOptions(ThemeName.DarkPlus); + } else { + _registryOptions = new RegistryOptions(ThemeName.LightPlus); + } + + _textMate = this.InstallTextMate(_registryOptions); + + if (BlameData != null) { + _textMate.SetGrammar(_registryOptions.GetScopeByExtension(Path.GetExtension(BlameData.File))); + } + } + + protected override void OnUnloaded(RoutedEventArgs e) { + base.OnUnloaded(e); + + TextArea.LeftMargins.Clear(); + TextArea.TextView.ContextRequested -= OnTextViewContextRequested; + + _registryOptions = null; + _textMate.Dispose(); + _textMate = null; + } + + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) { + base.OnPropertyChanged(change); + + if (change.Property == BlameDataProperty) { + if (BlameData != null) { + Text = BlameData.Content; + if (_textMate != null) _textMate.SetGrammar(_registryOptions.GetScopeByExtension(Path.GetExtension(BlameData.File))); + } else { + Text = string.Empty; + } + } else if (change.Property.Name == "ActualThemeVariant" && change.NewValue != null && _textMate != null) { + if (App.Current?.ActualThemeVariant == ThemeVariant.Dark) { + _textMate.SetTheme(_registryOptions.LoadTheme(ThemeName.DarkPlus)); + } else { + _textMate.SetTheme(_registryOptions.LoadTheme(ThemeName.LightPlus)); + } + } + } + + private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e) { + var selected = SelectedText; + if (string.IsNullOrEmpty(selected)) return; + + var icon = new Avalonia.Controls.Shapes.Path(); + icon.Width = 10; + icon.Height = 10; + icon.Stretch = Stretch.Uniform; + icon.Data = App.Current?.FindResource("Icons.Copy") as StreamGeometry; + + var copy = new MenuItem(); + copy.Header = App.Text("Copy"); + copy.Icon = icon; + copy.Click += (o, ev) => { + App.CopyText(selected); + ev.Handled = true; + }; + + var menu = new ContextMenu(); + menu.Items.Add(copy); + menu.Open(TextArea.TextView); + e.Handled = true; + } + + private RegistryOptions _registryOptions = null; + private TextMate.Installation _textMate = null; + } + + public partial class Blame : Window { + public Blame() { + if (App.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { + Owner = desktop.MainWindow; + } + + InitializeComponent(); + } + + protected override void OnClosed(EventArgs e) { + base.OnClosed(e); + GC.Collect(); + } + + private void OnCommitSHAPointerPressed(object sender, PointerPressedEventArgs e) { + if (DataContext is ViewModels.Blame blame) { + var txt = sender as TextBlock; + blame.NavigateToCommit(txt.Text); + } + e.Handled = true; + } + } +} diff --git a/src/Views/Blame.xaml b/src/Views/Blame.xaml deleted file mode 100644 index f2c46655..00000000 --- a/src/Views/Blame.xaml +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Views/Blame.xaml.cs b/src/Views/Blame.xaml.cs deleted file mode 100644 index 2a8c1598..00000000 --- a/src/Views/Blame.xaml.cs +++ /dev/null @@ -1,173 +0,0 @@ -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; -using System.Windows.Navigation; - -namespace SourceGit.Views { - /// - /// 逐行追溯 - /// - public partial class Blame : Controls.Window { - /// - /// DataGrid数据源结构 - /// - public class Record : INotifyPropertyChanged { - public event PropertyChangedEventHandler PropertyChanged; - - /// - /// 原始Blame行数据 - /// - public Models.BlameLine Line { get; set; } - - /// - /// 是否是第一行 - /// - public bool IsFirstLine { get; set; } = false; - - /// - /// 前一行与本行的提交不同 - /// - public bool IsFirstLineInGroup { get; set; } = false; - - /// - /// 是否当前选中，会影响背景色 - /// - private bool isSelected = false; - public bool IsSelected { - get { return isSelected; } - set { - if (isSelected != value) { - isSelected = value; - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("IsSelected")); - } - } - } - } - - /// - /// Blame数据 - /// - public ObservableCollection Records { get; set; } - - public Blame(string repo, string file, string revision) { - InitializeComponent(); - - this.repo = repo; - Records = new ObservableCollection(); - txtFile.Text = $"{file}@{revision.Substring(0, 8)}"; - - Task.Run(() => { - var lfs = new Commands.LFS(repo).IsFiltered(file); - if (lfs) { - Dispatcher.Invoke(() => { - loading.IsAnimating = false; - loading.Visibility = Visibility.Collapsed; - notSupport.Visibility = Visibility.Visible; - }); - return; - } - - var rs = new Commands.Blame(repo, file, revision).Result(); - if (rs.IsBinary) { - Dispatcher.Invoke(() => { - loading.IsAnimating = false; - loading.Visibility = Visibility.Collapsed; - notSupport.Visibility = Visibility.Visible; - }); - } else { - string lastSHA = null; - foreach (var line in rs.Lines) { - var r = new Record(); - r.Line = line; - r.IsSelected = false; - - if (line.CommitSHA != lastSHA) { - lastSHA = line.CommitSHA; - r.IsFirstLineInGroup = true; - } else { - r.IsFirstLineInGroup = false; - } - - Records.Add(r); - } - - if (Records.Count > 0) Records[0].IsFirstLine = true; - - Dispatcher.Invoke(() => { - loading.IsAnimating = false; - loading.Visibility = Visibility.Collapsed; - blame.ItemsSource = Records; - }); - } - }); - } - - #region WINDOW_COMMANDS - private void Minimize(object sender, RoutedEventArgs e) { - SystemCommands.MinimizeWindow(this); - } - - private void Quit(object sender, RoutedEventArgs e) { - Close(); - } - #endregion - - #region EVENTS - private T GetVisualChild(DependencyObject parent) where T : Visual { - T child = null; - - int count = VisualTreeHelper.GetChildrenCount(parent); - for (int i = 0; i < count; i++) { - Visual v = (Visual)VisualTreeHelper.GetChild(parent, i); - child = v as T; - - if (child == null) { - child = GetVisualChild(v); - } - - if (child != null) { - break; - } - } - - return child; - } - - private void OnViewerSizeChanged(object sender, SizeChangedEventArgs e) { - var total = blame.ActualWidth; - var offset = blame.NonFrozenColumnsViewportHorizontalOffset; - var minWidth = total - offset; - - var scroller = GetVisualChild(blame); - if (scroller != null && scroller.ComputedVerticalScrollBarVisibility == Visibility.Visible) minWidth -= 8; - - blame.Columns[2].MinWidth = minWidth; - blame.Columns[2].Width = DataGridLength.SizeToCells; - blame.UpdateLayout(); - } - - private void OnViewerRequestBringIntoView(object sender, RequestBringIntoViewEventArgs e) { - e.Handled = true; - } - - private void OnSelectionChanged(object sender, SelectionChangedEventArgs e) { - var r = blame.SelectedItem as Record; - if (r == null) return; - - foreach (var one in Records) { - one.IsSelected = one.Line.CommitSHA == r.Line.CommitSHA; - } - } - - private void GotoCommit(object sender, RequestNavigateEventArgs e) { - Models.Watcher.Get(repo).NavigateTo(e.Uri.OriginalString); - e.Handled = true; - } - #endregion - - private string repo = null; - } -} diff --git a/src/Views/CaptionButtons.axaml b/src/Views/CaptionButtons.axaml new file mode 100644 index 00000000..581f7be1 --- /dev/null +++ b/src/Views/CaptionButtons.axaml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/src/Views/CaptionButtons.axaml.cs b/src/Views/CaptionButtons.axaml.cs new file mode 100644 index 00000000..09f70dad --- /dev/null +++ b/src/Views/CaptionButtons.axaml.cs @@ -0,0 +1,33 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.VisualTree; + +namespace SourceGit.Views { + public partial class CaptionButtons : UserControl { + public CaptionButtons() { + InitializeComponent(); + } + + private void MinimizeWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.WindowState = WindowState.Minimized; + } + } + + private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; + } + } + + private void CloseWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.Close(); + } + } + } +} + diff --git a/src/Views/CaptionButtonsMacOS.axaml b/src/Views/CaptionButtonsMacOS.axaml new file mode 100644 index 00000000..fa3f1f34 --- /dev/null +++ b/src/Views/CaptionButtonsMacOS.axaml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/src/Views/CaptionButtonsMacOS.axaml.cs b/src/Views/CaptionButtonsMacOS.axaml.cs new file mode 100644 index 00000000..64b93d21 --- /dev/null +++ b/src/Views/CaptionButtonsMacOS.axaml.cs @@ -0,0 +1,33 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.VisualTree; + +namespace SourceGit.Views { + public partial class CaptionButtonsMacOS : UserControl { + public CaptionButtonsMacOS() { + InitializeComponent(); + } + + private void MinimizeWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.WindowState = WindowState.Minimized; + } + } + + private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; + } + } + + private void CloseWindow(object sender, RoutedEventArgs e) { + var window = this.FindAncestorOfType(); + if (window != null) { + window.Close(); + } + } + } +} + diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs new file mode 100644 index 00000000..8d0001e6 --- /dev/null +++ b/src/Views/ChangeStatusIcon.cs @@ -0,0 +1,112 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using System; +using System.Globalization; + +namespace SourceGit.Views { + public class ChangeStatusIcon : Control { + private static readonly IBrush[] BACKGROUNDS = [ + Brushes.Transparent, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Colors.Tomato, 0), new GradientStop(Color.FromRgb(252, 165, 150), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Colors.Orchid, 0), new GradientStop(Color.FromRgb(248, 161, 245), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(238, 160, 14), 0), new GradientStop(Color.FromRgb(228, 172, 67), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + new LinearGradientBrush { + GradientStops = new GradientStops() { new GradientStop(Color.FromRgb(47, 185, 47), 0), new GradientStop(Color.FromRgb(75, 189, 75), 1) }, + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + }, + ]; + + private static readonly string[] INDICATOR = ["?", "±", "+", "−", "➜", "❏", "U", "★"]; + + public static readonly StyledProperty IsWorkingCopyChangeProperty = + AvaloniaProperty.Register(nameof(IsWorkingCopyChange)); + + public bool IsWorkingCopyChange { + get => GetValue(IsWorkingCopyChangeProperty); + set => SetValue(IsWorkingCopyChangeProperty, value); + } + + public static readonly StyledProperty ChangeProperty = + AvaloniaProperty.Register(nameof(Change)); + + public Models.Change Change { + get => GetValue(ChangeProperty); + set => SetValue(ChangeProperty, value); + } + + public static readonly StyledProperty IconFontFamilyProperty = + AvaloniaProperty.Register(nameof(IconFontFamily)); + + public FontFamily IconFontFamily { + get => GetValue(IconFontFamilyProperty); + set => SetValue(IconFontFamilyProperty, value); + } + + static ChangeStatusIcon() { + AffectsRender(IsWorkingCopyChangeProperty, ChangeProperty, IconFontFamilyProperty); + } + + public override void Render(DrawingContext context) { + if (Change == null || Bounds.Width <= 0) return; + + var typeface = IconFontFamily == null ? Typeface.Default : new Typeface(IconFontFamily); + + IBrush background = null; + string indicator; + if (IsWorkingCopyChange) { + if (Change.IsConflit) { + background = Brushes.OrangeRed; + indicator = "!"; + } else { + background = BACKGROUNDS[(int)Change.WorkTree]; + indicator = INDICATOR[(int)Change.WorkTree]; + } + } else { + background = BACKGROUNDS[(int)Change.Index]; + indicator = INDICATOR[(int)Change.Index]; + } + + var txt = new FormattedText( + indicator, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + typeface, + Bounds.Width * 0.8, + Brushes.White); + + float corner = (float)Math.Max(2, Bounds.Width / 16); + Point textOrigin = new Point((Bounds.Width - txt.Width) * 0.5, (Bounds.Height - txt.Height) * 0.5); + context.DrawRectangle(background, null, new Rect(0, 0, Bounds.Width, Bounds.Height), corner, corner); + context.DrawText(txt, textOrigin); + } + } +} diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml new file mode 100644 index 00000000..32d4f1e9 --- /dev/null +++ b/src/Views/ChangeViewModeSwitcher.axaml @@ -0,0 +1,35 @@ + + + diff --git a/src/Views/ChangeViewModeSwitcher.axaml.cs b/src/Views/ChangeViewModeSwitcher.axaml.cs new file mode 100644 index 00000000..59a041e9 --- /dev/null +++ b/src/Views/ChangeViewModeSwitcher.axaml.cs @@ -0,0 +1,23 @@ +using Avalonia; +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class ChangeViewModeSwitcher : UserControl { + public static readonly StyledProperty ViewModeProperty = + AvaloniaProperty.Register(nameof(ViewMode)); + + public Models.ChangeViewMode ViewMode { + get => GetValue(ViewModeProperty); + set => SetValue(ViewModeProperty, value); + } + + public ChangeViewModeSwitcher() { + DataContext = this; + InitializeComponent(); + } + + public void SwitchMode(object param) { + ViewMode = (Models.ChangeViewMode)param; + } + } +} diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml new file mode 100644 index 00000000..f921326b --- /dev/null +++ b/src/Views/Checkout.axaml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/src/Views/Checkout.axaml.cs b/src/Views/Checkout.axaml.cs new file mode 100644 index 00000000..d2d9edca --- /dev/null +++ b/src/Views/Checkout.axaml.cs @@ -0,0 +1,9 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class Checkout : UserControl { + public Checkout() { + InitializeComponent(); + } + } +} diff --git a/src/Views/CherryPick.axaml b/src/Views/CherryPick.axaml new file mode 100644 index 00000000..a4b654fd --- /dev/null +++ b/src/Views/CherryPick.axaml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff --git a/src/Views/CherryPick.axaml.cs b/src/Views/CherryPick.axaml.cs new file mode 100644 index 00000000..306d4702 --- /dev/null +++ b/src/Views/CherryPick.axaml.cs @@ -0,0 +1,9 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class CherryPick : UserControl { + public CherryPick() { + InitializeComponent(); + } + } +} diff --git a/src/Views/Cleanup.axaml b/src/Views/Cleanup.axaml new file mode 100644 index 00000000..7e5d8ff9 --- /dev/null +++ b/src/Views/Cleanup.axaml @@ -0,0 +1,19 @@ + + + + + + diff --git a/src/Views/Cleanup.axaml.cs b/src/Views/Cleanup.axaml.cs new file mode 100644 index 00000000..a098d9a4 --- /dev/null +++ b/src/Views/Cleanup.axaml.cs @@ -0,0 +1,9 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class Cleanup : UserControl { + public Cleanup() { + InitializeComponent(); + } + } +} diff --git a/src/Views/ClearStashes.axaml b/src/Views/ClearStashes.axaml new file mode 100644 index 00000000..666bf273 --- /dev/null +++ b/src/Views/ClearStashes.axaml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/src/Views/ClearStashes.axaml.cs b/src/Views/ClearStashes.axaml.cs new file mode 100644 index 00000000..d95e18c1 --- /dev/null +++ b/src/Views/ClearStashes.axaml.cs @@ -0,0 +1,9 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class ClearStashes : UserControl { + public ClearStashes() { + InitializeComponent(); + } + } +} diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml new file mode 100644 index 00000000..ca3a4d3f --- /dev/null +++ b/src/Views/Clone.axaml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/Clone.axaml.cs b/src/Views/Clone.axaml.cs new file mode 100644 index 00000000..cd52e0bf --- /dev/null +++ b/src/Views/Clone.axaml.cs @@ -0,0 +1,33 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Platform.Storage; + +namespace SourceGit.Views { + public partial class Clone : UserControl { + public Clone() { + InitializeComponent(); + } + + private async void SelectParentFolder(object sender, RoutedEventArgs e) { + var options = new FolderPickerOpenOptions() { AllowMultiple = false }; + var toplevel = TopLevel.GetTopLevel(this); + var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options); + if (selected.Count == 1) { + txtParentFolder.Text = selected[0].Path.LocalPath; + } + + e.Handled = true; + } + + private async void SelectSSHKey(object sender, RoutedEventArgs e) { + var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] }; + var toplevel = TopLevel.GetTopLevel(this); + var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options); + if (selected.Count == 1) { + txtSSHKey.Text = selected[0].Path.LocalPath; + } + + e.Handled = true; + } + } +} diff --git a/src/Views/Clone.xaml b/src/Views/Clone.xaml deleted file mode 100644 index 07536e82..00000000 --- a/src/Views/Clone.xaml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/CommitChanges.axaml.cs b/src/Views/CommitChanges.axaml.cs new file mode 100644 index 00000000..db65922d --- /dev/null +++ b/src/Views/CommitChanges.axaml.cs @@ -0,0 +1,39 @@ +using Avalonia.Controls; + +namespace SourceGit.Views { + public partial class CommitChanges : UserControl { + public CommitChanges() { + InitializeComponent(); + } + + private void OnDataGridSelectionChanged(object sender, SelectionChangedEventArgs e) { + if (sender is DataGrid datagrid && datagrid.IsVisible && datagrid.SelectedItem != null) { + datagrid.ScrollIntoView(datagrid.SelectedItem, null); + } + e.Handled = true; + } + + private void OnDataGridContextRequested(object sender, ContextRequestedEventArgs e) { + if (sender is DataGrid datagrid && datagrid.SelectedItem != null) { + var detail = DataContext as ViewModels.CommitDetail; + var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change); + menu.Open(datagrid); + } + + e.Handled = true; + } + + private void OnTreeViewContextRequested(object sender, ContextRequestedEventArgs e) { + if (sender is TreeView view && view.SelectedItem != null) { + var detail = DataContext as ViewModels.CommitDetail; + var node = view.SelectedItem as ViewModels.FileTreeNode; + if (node != null && !node.IsFolder) { + var menu = detail.CreateChangeContextMenu(node.Backend as Models.Change); + menu.Open(view); + } + } + + e.Handled = true; + } + } +} diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml new file mode 100644 index 00000000..47d9fde7 --- /dev/null +++ b/src/Views/CommitDetail.axaml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs new file mode 100644 index 00000000..326c612d --- /dev/null +++ b/src/Views/CommitDetail.axaml.cs @@ -0,0 +1,28 @@ +using Avalonia.Controls; +using Avalonia.Input; + +namespace SourceGit.Views { + public partial class CommitDetail : UserControl { + public CommitDetail() { + InitializeComponent(); + } + + private void OnChangeListDoubleTapped(object sender, TappedEventArgs e) { + if (DataContext is ViewModels.CommitDetail detail) { + var datagrid = sender as DataGrid; + detail.ActivePageIndex = 1; + detail.SelectedChange = datagrid.SelectedItem as Models.Change; + } + e.Handled = true; + } + + private void OnChangeListContextRequested(object sender, ContextRequestedEventArgs e) { + if (DataContext is ViewModels.CommitDetail detail) { + var datagrid = sender as DataGrid; + var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change); + menu.Open(datagrid); + } + e.Handled = true; + } + } +} diff --git a/src/Views/ConfirmDialog.xaml b/src/Views/ConfirmDialog.xaml deleted file mode 100644 index 867fedb1..00000000 --- a/src/Views/ConfirmDialog.xaml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -