2024-03-17 18:37:06 -07:00
|
|
|
|
using System;
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
using System.IO;
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
|
|
|
|
|
|
using Avalonia;
|
2024-02-28 19:29:54 -08:00
|
|
|
|
using Avalonia.Controls;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
using Avalonia.Platform.Storage;
|
|
|
|
|
using Avalonia.Threading;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
using CommunityToolkit.Mvvm.ComponentModel;
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
namespace SourceGit.ViewModels
|
|
|
|
|
{
|
|
|
|
|
public class ConflictContext
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
public Models.Change Change { get; set; }
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public class WorkingCopy : ObservableObject
|
|
|
|
|
{
|
|
|
|
|
public bool IsStaging
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _isStaging;
|
|
|
|
|
private set => SetProperty(ref _isStaging, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public bool IsUnstaging
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _isUnstaging;
|
|
|
|
|
private set => SetProperty(ref _isUnstaging, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public bool IsCommitting
|
|
|
|
|
{
|
|
|
|
|
get => _isCommitting;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
private set => SetProperty(ref _isCommitting, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public bool UseAmend
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _useAmend;
|
|
|
|
|
set => SetProperty(ref _useAmend, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public List<Models.Change> Unstaged
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _unstaged;
|
|
|
|
|
private set => SetProperty(ref _unstaged, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public List<Models.Change> Staged
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _staged;
|
|
|
|
|
private set => SetProperty(ref _staged, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public int Count
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _count;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public Models.Change SelectedUnstagedChange
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
get => _selectedUnstagedChange;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
set
|
|
|
|
|
{
|
|
|
|
|
if (SetProperty(ref _selectedUnstagedChange, value) && value != null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedStagedChange = null;
|
|
|
|
|
SelectedStagedTreeNode = null;
|
|
|
|
|
SetDetail(value, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public Models.Change SelectedStagedChange
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
get => _selectedStagedChange;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
set
|
|
|
|
|
{
|
|
|
|
|
if (SetProperty(ref _selectedStagedChange, value) && value != null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedUnstagedChange = null;
|
|
|
|
|
SelectedUnstagedTreeNode = null;
|
|
|
|
|
SetDetail(value, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public List<FileTreeNode> UnstagedTree
|
|
|
|
|
{
|
|
|
|
|
get => _unstagedTree;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
private set => SetProperty(ref _unstagedTree, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public List<FileTreeNode> StagedTree
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _stagedTree;
|
|
|
|
|
private set => SetProperty(ref _stagedTree, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public FileTreeNode SelectedUnstagedTreeNode
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
get => _selectedUnstagedTreeNode;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
set
|
|
|
|
|
{
|
|
|
|
|
if (SetProperty(ref _selectedUnstagedTreeNode, value))
|
|
|
|
|
{
|
|
|
|
|
if (value == null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedUnstagedChange = null;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedUnstagedChange = value.Backend as Models.Change;
|
|
|
|
|
SelectedStagedTreeNode = null;
|
|
|
|
|
SelectedStagedChange = null;
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (value.IsFolder)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SetDetail(null, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public FileTreeNode SelectedStagedTreeNode
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
get => _selectedStagedTreeNode;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
set
|
|
|
|
|
{
|
|
|
|
|
if (SetProperty(ref _selectedStagedTreeNode, value))
|
|
|
|
|
{
|
|
|
|
|
if (value == null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedStagedChange = null;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedStagedChange = value.Backend as Models.Change;
|
|
|
|
|
SelectedUnstagedTreeNode = null;
|
|
|
|
|
SelectedUnstagedChange = null;
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (value.IsFolder)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SetDetail(null, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public object DetailContext
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _detailContext;
|
|
|
|
|
private set => SetProperty(ref _detailContext, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public string CommitMessage
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
get => _commitMessage;
|
|
|
|
|
set => SetProperty(ref _commitMessage, value);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public WorkingCopy(Repository repo)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo = repo;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public void Cleanup()
|
|
|
|
|
{
|
2024-02-20 02:27:59 -08:00
|
|
|
|
_repo = null;
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_unstaged != null)
|
|
|
|
|
_unstaged.Clear();
|
|
|
|
|
if (_staged != null)
|
|
|
|
|
_staged.Clear();
|
|
|
|
|
if (_unstagedTree != null)
|
|
|
|
|
_unstagedTree.Clear();
|
|
|
|
|
if (_stagedTree != null)
|
|
|
|
|
_stagedTree.Clear();
|
2024-02-27 02:26:05 -08:00
|
|
|
|
_selectedUnstagedChange = null;
|
|
|
|
|
_selectedStagedChange = null;
|
|
|
|
|
_selectedUnstagedTreeNode = null;
|
|
|
|
|
_selectedStagedTreeNode = null;
|
2024-02-20 02:27:59 -08:00
|
|
|
|
_detailContext = null;
|
|
|
|
|
_commitMessage = string.Empty;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public bool SetData(List<Models.Change> changes)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var unstaged = new List<Models.Change>();
|
|
|
|
|
var staged = new List<Models.Change>();
|
2024-03-17 18:37:06 -07:00
|
|
|
|
|
2024-02-27 02:26:05 -08:00
|
|
|
|
var viewFile = string.Empty;
|
|
|
|
|
var lastSelectedIsUnstaged = false;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (_selectedUnstagedChange != null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
viewFile = _selectedUnstagedChange.Path;
|
|
|
|
|
lastSelectedIsUnstaged = true;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else if (_selectedStagedChange != null)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
viewFile = _selectedStagedChange.Path;
|
|
|
|
|
}
|
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var viewChange = null as Models.Change;
|
|
|
|
|
var hasConflict = false;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
foreach (var c in changes)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
if (c.Index == Models.ChangeState.Modified
|
|
|
|
|
|| c.Index == Models.ChangeState.Added
|
|
|
|
|
|| c.Index == Models.ChangeState.Deleted
|
2024-03-17 18:37:06 -07:00
|
|
|
|
|| c.Index == Models.ChangeState.Renamed)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
staged.Add(c);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (!lastSelectedIsUnstaged && c.Path == viewFile)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
viewChange = c;
|
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (c.WorkTree != Models.ChangeState.None)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
unstaged.Add(c);
|
|
|
|
|
hasConflict |= c.IsConflit;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (lastSelectedIsUnstaged && c.Path == viewFile)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
viewChange = c;
|
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_count = changes.Count;
|
|
|
|
|
|
|
|
|
|
var unstagedTree = FileTreeNode.Build(unstaged);
|
|
|
|
|
var stagedTree = FileTreeNode.Build(staged);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
Dispatcher.UIThread.Invoke(() =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_isLoadingData = true;
|
|
|
|
|
Unstaged = unstaged;
|
|
|
|
|
Staged = staged;
|
|
|
|
|
UnstagedTree = unstagedTree;
|
|
|
|
|
StagedTree = stagedTree;
|
|
|
|
|
_isLoadingData = false;
|
2024-02-27 02:26:05 -08:00
|
|
|
|
|
|
|
|
|
// Restore last selection states.
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (viewChange != null)
|
|
|
|
|
{
|
2024-02-28 19:29:54 -08:00
|
|
|
|
var scrollOffset = Vector.Zero;
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_detailContext is DiffContext old)
|
|
|
|
|
scrollOffset = old.SyncScrollOffset;
|
2024-02-28 19:29:54 -08:00
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (lastSelectedIsUnstaged)
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedUnstagedChange = viewChange;
|
|
|
|
|
SelectedUnstagedTreeNode = FileTreeNode.SelectByPath(_unstagedTree, viewFile);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedStagedChange = viewChange;
|
|
|
|
|
SelectedStagedTreeNode = FileTreeNode.SelectByPath(_stagedTree, viewFile);
|
|
|
|
|
}
|
2024-02-28 19:29:54 -08:00
|
|
|
|
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_detailContext is DiffContext cur)
|
|
|
|
|
cur.SyncScrollOffset = scrollOffset;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-27 02:26:05 -08:00
|
|
|
|
SelectedUnstagedChange = null;
|
|
|
|
|
SelectedUnstagedTreeNode = null;
|
|
|
|
|
SelectedStagedChange = null;
|
|
|
|
|
SelectedStagedTreeNode = null;
|
|
|
|
|
SetDetail(null, false);
|
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
return hasConflict;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public void SetDetail(Models.Change change, bool isUnstaged)
|
|
|
|
|
{
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_isLoadingData)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (change == null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
DetailContext = null;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else if (change.IsConflit)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
DetailContext = new ConflictContext() { Change = change };
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-03-20 03:27:48 -07:00
|
|
|
|
if (_detailContext is DiffContext previous)
|
|
|
|
|
{
|
|
|
|
|
DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), previous);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged));
|
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void StageChanges(List<Models.Change> changes)
|
|
|
|
|
{
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_unstaged.Count == 0 || changes.Count == 0)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
2024-02-18 00:32:30 -08:00
|
|
|
|
SetDetail(null, true);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
IsStaging = true;
|
|
|
|
|
_repo.SetWatcherEnabled(false);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (changes.Count == _unstaged.Count)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
await Task.Run(() => new Commands.Add(_repo.FullPath).Exec());
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < changes.Count; i += 10)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var count = Math.Min(10, changes.Count - i);
|
|
|
|
|
var step = changes.GetRange(i, count);
|
|
|
|
|
await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-03-07 17:57:29 -08:00
|
|
|
|
_repo.MarkWorkingCopyDirtyManually();
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(true);
|
|
|
|
|
IsStaging = false;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void UnstageChanges(List<Models.Change> changes)
|
|
|
|
|
{
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (_staged.Count == 0 || changes.Count == 0)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
2024-02-18 00:32:30 -08:00
|
|
|
|
SetDetail(null, false);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
IsUnstaging = true;
|
|
|
|
|
_repo.SetWatcherEnabled(false);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (changes.Count == _staged.Count)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
await Task.Run(() => new Commands.Reset(_repo.FullPath).Exec());
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < changes.Count; i += 10)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var count = Math.Min(10, changes.Count - i);
|
|
|
|
|
var step = changes.GetRange(i, count);
|
|
|
|
|
await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-03-07 17:57:29 -08:00
|
|
|
|
_repo.MarkWorkingCopyDirtyManually();
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(true);
|
|
|
|
|
IsUnstaging = false;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public void Discard(List<Models.Change> changes, bool isUnstaged)
|
|
|
|
|
{
|
|
|
|
|
if (PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
|
|
|
|
if (isUnstaged)
|
|
|
|
|
{
|
|
|
|
|
if (changes.Count == _unstaged.Count && _staged.Count == 0)
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
PopupHost.ShowPopup(new Discard(_repo));
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
PopupHost.ShowPopup(new Discard(_repo, changes, true));
|
|
|
|
|
}
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (changes.Count == _staged.Count && _unstaged.Count == 0)
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
PopupHost.ShowPopup(new Discard(_repo));
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
PopupHost.ShowPopup(new Discard(_repo, changes, false));
|
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void UseTheirs()
|
|
|
|
|
{
|
|
|
|
|
if (_detailContext is ConflictContext ctx)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(false);
|
|
|
|
|
var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).File(ctx.Change.Path, true));
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());
|
|
|
|
|
}
|
2024-03-07 17:57:29 -08:00
|
|
|
|
_repo.MarkWorkingCopyDirtyManually();
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void UseMine()
|
|
|
|
|
{
|
|
|
|
|
if (_detailContext is ConflictContext ctx)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(false);
|
|
|
|
|
var succ = await Task.Run(() => new Commands.Checkout(_repo.FullPath).File(ctx.Change.Path, false));
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());
|
|
|
|
|
}
|
2024-03-07 17:57:29 -08:00
|
|
|
|
_repo.MarkWorkingCopyDirtyManually();
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void UseExternalMergeTool()
|
|
|
|
|
{
|
|
|
|
|
if (_detailContext is ConflictContext ctx)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var type = Preference.Instance.ExternalMergeToolType;
|
|
|
|
|
var exec = Preference.Instance.ExternalMergeToolPath;
|
|
|
|
|
|
2024-04-08 19:41:37 -07:00
|
|
|
|
var tool = Models.ExternalMerger.Supported.Find(x => x.Type == type);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (tool == null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public async void DoCommit(bool autoPush)
|
|
|
|
|
{
|
|
|
|
|
if (!PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
App.RaiseException(_repo.FullPath, "Repository has unfinished job! Please wait!");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (_staged.Count == 0)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
App.RaiseException(_repo.FullPath, "No files added to commit!");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (string.IsNullOrWhiteSpace(_commitMessage))
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
App.RaiseException(_repo.FullPath, "Commit without message is NOT allowed!");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PushCommitMessage();
|
|
|
|
|
|
2024-02-18 18:33:28 -08:00
|
|
|
|
SetDetail(null, false);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
IsCommitting = true;
|
|
|
|
|
_repo.SetWatcherEnabled(false);
|
|
|
|
|
var succ = await Task.Run(() => new Commands.Commit(_repo.FullPath, _commitMessage, _useAmend).Exec());
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
CommitMessage = string.Empty;
|
|
|
|
|
UseAmend = false;
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (autoPush)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
PopupHost.ShowAndStartPopup(new Push(_repo, null));
|
|
|
|
|
}
|
|
|
|
|
}
|
2024-03-07 17:57:29 -08:00
|
|
|
|
_repo.MarkWorkingCopyDirtyManually();
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.SetWatcherEnabled(true);
|
|
|
|
|
IsCommitting = false;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public ContextMenu CreateContextMenuForUnstagedChanges(List<Models.Change> changes)
|
|
|
|
|
{
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (changes.Count == 0)
|
|
|
|
|
return null;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
var menu = new ContextMenu();
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (changes.Count == 1)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var change = changes[0];
|
|
|
|
|
var path = Path.GetFullPath(Path.Combine(_repo.FullPath, change.Path));
|
|
|
|
|
|
|
|
|
|
var explore = new MenuItem();
|
|
|
|
|
explore.Header = App.Text("RevealFile");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
explore.Icon = App.CreateMenuIcon("Icons.Folder.Open");
|
2024-02-05 23:08:37 -08:00
|
|
|
|
explore.IsEnabled = File.Exists(path) || Directory.Exists(path);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
explore.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
Native.OS.OpenInFileManager(path, true);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
2024-03-17 18:37:06 -07:00
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var openWith = new MenuItem();
|
|
|
|
|
openWith.Header = App.Text("OpenWith");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
openWith.Icon = App.CreateMenuIcon("Icons.OpenWith");
|
2024-02-05 23:08:37 -08:00
|
|
|
|
openWith.IsEnabled = File.Exists(path);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
openWith.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
Native.OS.OpenWithDefaultEditor(path);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var stage = new MenuItem();
|
|
|
|
|
stage.Header = App.Text("FileCM.Stage");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stage.Icon = App.CreateMenuIcon("Icons.File.Add");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stage.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
StageChanges(changes);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var discard = new MenuItem();
|
|
|
|
|
discard.Header = App.Text("FileCM.Discard");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
discard.Icon = App.CreateMenuIcon("Icons.Undo");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
discard.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
Discard(changes, true);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var stash = new MenuItem();
|
|
|
|
|
stash.Header = App.Text("FileCM.Stash");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stash.Click += (_, e) =>
|
|
|
|
|
{
|
|
|
|
|
if (PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
PopupHost.ShowPopup(new StashChanges(_repo, changes, false));
|
|
|
|
|
}
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var patch = new MenuItem();
|
|
|
|
|
patch.Header = App.Text("FileCM.SaveAsPatch");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
patch.Icon = App.CreateMenuIcon("Icons.Diff");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
patch.Click += async (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var topLevel = App.GetTopLevel();
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (topLevel == null)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
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);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (storageFile != null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath));
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var history = new MenuItem();
|
|
|
|
|
history.Header = App.Text("FileHistory");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
history.Icon = App.CreateMenuIcon("Icons.Histories");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
history.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
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");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
assumeUnchanged.Icon = App.CreateMenuIcon("Icons.File.Ignore");
|
2024-02-05 23:08:37 -08:00
|
|
|
|
assumeUnchanged.IsEnabled = change.WorkTree != Models.ChangeState.Untracked;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
assumeUnchanged.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
new Commands.AssumeUnchanged(_repo.FullPath).Add(change.Path);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var copy = new MenuItem();
|
|
|
|
|
copy.Header = App.Text("CopyPath");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
copy.Icon = App.CreateMenuIcon("Icons.Copy");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
copy.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
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);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var stage = new MenuItem();
|
|
|
|
|
stage.Header = App.Text("FileCM.StageMulti", changes.Count);
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stage.Icon = App.CreateMenuIcon("Icons.File.Add");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stage.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
StageChanges(changes);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var discard = new MenuItem();
|
|
|
|
|
discard.Header = App.Text("FileCM.DiscardMulti", changes.Count);
|
2024-02-27 02:26:05 -08:00
|
|
|
|
discard.Icon = App.CreateMenuIcon("Icons.Undo");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
discard.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
Discard(changes, true);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var stash = new MenuItem();
|
|
|
|
|
stash.Header = App.Text("FileCM.StashMulti", changes.Count);
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stash.Click += (_, e) =>
|
|
|
|
|
{
|
|
|
|
|
if (PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
PopupHost.ShowPopup(new StashChanges(_repo, changes, false));
|
|
|
|
|
}
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var patch = new MenuItem();
|
|
|
|
|
patch.Header = App.Text("FileCM.SaveAsPatch");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
patch.Icon = App.CreateMenuIcon("Icons.Diff");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
patch.Click += async (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var topLevel = App.GetTopLevel();
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (topLevel == null)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
var options = new FilePickerSaveOptions();
|
|
|
|
|
options.Title = App.Text("FileCM.SaveAsPatch");
|
|
|
|
|
options.DefaultExtension = ".patch";
|
|
|
|
|
options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
|
2024-03-17 18:37:06 -07:00
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (storageFile != null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, true, storageFile.Path.LocalPath));
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu.Items.Add(stage);
|
|
|
|
|
menu.Items.Add(discard);
|
|
|
|
|
menu.Items.Add(stash);
|
|
|
|
|
menu.Items.Add(patch);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
return menu;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public ContextMenu CreateContextMenuForStagedChanges(List<Models.Change> changes)
|
|
|
|
|
{
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (changes.Count == 0)
|
|
|
|
|
return null;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
var menu = new ContextMenu();
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (changes.Count == 1)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
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");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
explore.Icon = App.CreateMenuIcon("Icons.Folder.Open");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
explore.Click += (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
Native.OS.OpenInFileManager(path, true);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var openWith = new MenuItem();
|
|
|
|
|
openWith.Header = App.Text("OpenWith");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
openWith.Icon = App.CreateMenuIcon("Icons.OpenWith");
|
2024-02-05 23:08:37 -08:00
|
|
|
|
openWith.IsEnabled = File.Exists(path);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
openWith.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
Native.OS.OpenWithDefaultEditor(path);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var unstage = new MenuItem();
|
|
|
|
|
unstage.Header = App.Text("FileCM.Unstage");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
unstage.Icon = App.CreateMenuIcon("Icons.File.Remove");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
unstage.Click += (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
UnstageChanges(changes);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
2024-02-29 19:34:32 -08:00
|
|
|
|
var discard = new MenuItem();
|
|
|
|
|
discard.Header = App.Text("FileCM.Discard");
|
|
|
|
|
discard.Icon = App.CreateMenuIcon("Icons.Undo");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
discard.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
Discard(changes, false);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var stash = new MenuItem();
|
|
|
|
|
stash.Header = App.Text("FileCM.Stash");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stash.Click += (_, e) =>
|
|
|
|
|
{
|
|
|
|
|
if (PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
PopupHost.ShowPopup(new StashChanges(_repo, changes, false));
|
|
|
|
|
}
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var patch = new MenuItem();
|
|
|
|
|
patch.Header = App.Text("FileCM.SaveAsPatch");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
patch.Icon = App.CreateMenuIcon("Icons.Diff");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
patch.Click += async (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var topLevel = App.GetTopLevel();
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (topLevel == null)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
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);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (storageFile != null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath));
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var copyPath = new MenuItem();
|
|
|
|
|
copyPath.Header = App.Text("CopyPath");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
copyPath.Click += (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
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);
|
2024-02-29 19:34:32 -08:00
|
|
|
|
menu.Items.Add(discard);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
menu.Items.Add(stash);
|
|
|
|
|
menu.Items.Add(patch);
|
|
|
|
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
|
|
|
|
menu.Items.Add(copyPath);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var unstage = new MenuItem();
|
|
|
|
|
unstage.Header = App.Text("FileCM.UnstageMulti", changes.Count);
|
2024-02-27 02:26:05 -08:00
|
|
|
|
unstage.Icon = App.CreateMenuIcon("Icons.File.Remove");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
unstage.Click += (o, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
UnstageChanges(changes);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
2024-02-29 19:34:32 -08:00
|
|
|
|
var discard = new MenuItem();
|
|
|
|
|
discard.Header = App.Text("FileCM.DiscardMulti", changes.Count);
|
|
|
|
|
discard.Icon = App.CreateMenuIcon("Icons.Undo");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
discard.Click += (_, e) =>
|
|
|
|
|
{
|
2024-02-29 19:34:32 -08:00
|
|
|
|
Discard(changes, false);
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var stash = new MenuItem();
|
|
|
|
|
stash.Header = App.Text("FileCM.StashMulti", changes.Count);
|
2024-02-27 02:26:05 -08:00
|
|
|
|
stash.Icon = App.CreateMenuIcon("Icons.Stashes");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
stash.Click += (_, e) =>
|
|
|
|
|
{
|
|
|
|
|
if (PopupHost.CanCreatePopup())
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
PopupHost.ShowPopup(new StashChanges(_repo, changes, false));
|
|
|
|
|
}
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
var patch = new MenuItem();
|
|
|
|
|
patch.Header = App.Text("FileCM.SaveAsPatch");
|
2024-02-27 02:26:05 -08:00
|
|
|
|
patch.Icon = App.CreateMenuIcon("Icons.Diff");
|
2024-03-17 18:37:06 -07:00
|
|
|
|
patch.Click += async (_, e) =>
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var topLevel = App.GetTopLevel();
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (topLevel == null)
|
|
|
|
|
return;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
|
|
|
|
|
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);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (storageFile != null)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var succ = await Task.Run(() => Commands.SaveChangesAsPatch.Exec(_repo.FullPath, changes, false, storageFile.Path.LocalPath));
|
2024-03-31 01:54:29 -07:00
|
|
|
|
if (succ)
|
|
|
|
|
App.SendNotification(_repo.FullPath, App.Text("SaveAsPatchSuccess"));
|
2024-02-05 23:08:37 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu.Items.Add(unstage);
|
2024-02-29 19:34:32 -08:00
|
|
|
|
menu.Items.Add(discard);
|
2024-02-05 23:08:37 -08:00
|
|
|
|
menu.Items.Add(stash);
|
|
|
|
|
menu.Items.Add(patch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return menu;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
public ContextMenu CreateContextMenuForCommitMessages()
|
|
|
|
|
{
|
2024-02-17 23:44:05 -08:00
|
|
|
|
var menu = new ContextMenu();
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (_repo.CommitMessages.Count == 0)
|
|
|
|
|
{
|
2024-02-17 23:44:05 -08:00
|
|
|
|
var empty = new MenuItem();
|
|
|
|
|
empty.Header = App.Text("WorkingCopy.NoCommitHistories");
|
|
|
|
|
empty.IsEnabled = false;
|
|
|
|
|
menu.Items.Add(empty);
|
|
|
|
|
return menu;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var tip = new MenuItem();
|
|
|
|
|
tip.Header = App.Text("WorkingCopy.HasCommitHistories");
|
|
|
|
|
tip.IsEnabled = false;
|
|
|
|
|
menu.Items.Add(tip);
|
|
|
|
|
menu.Items.Add(new MenuItem() { Header = "-" });
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
foreach (var message in _repo.CommitMessages)
|
|
|
|
|
{
|
2024-02-17 23:44:05 -08:00
|
|
|
|
var dump = message;
|
|
|
|
|
|
|
|
|
|
var item = new MenuItem();
|
|
|
|
|
item.Header = dump;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
item.Click += (o, e) =>
|
|
|
|
|
{
|
2024-02-17 23:44:05 -08:00
|
|
|
|
CommitMessage = dump;
|
|
|
|
|
e.Handled = true;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
menu.Items.Add(item);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return menu;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
private void PushCommitMessage()
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
var existIdx = _repo.CommitMessages.IndexOf(CommitMessage);
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (existIdx == 0)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
return;
|
2024-03-17 18:37:06 -07:00
|
|
|
|
}
|
|
|
|
|
else if (existIdx > 0)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_repo.CommitMessages.Move(existIdx, 0);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-17 18:37:06 -07:00
|
|
|
|
if (_repo.CommitMessages.Count > 9)
|
|
|
|
|
{
|
2024-02-05 23:08:37 -08:00
|
|
|
|
_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<Models.Change> _unstaged = null;
|
|
|
|
|
private List<Models.Change> _staged = null;
|
2024-02-27 02:26:05 -08:00
|
|
|
|
private Models.Change _selectedUnstagedChange = null;
|
|
|
|
|
private Models.Change _selectedStagedChange = null;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
private int _count = 0;
|
|
|
|
|
private List<FileTreeNode> _unstagedTree = null;
|
|
|
|
|
private List<FileTreeNode> _stagedTree = null;
|
2024-02-27 02:26:05 -08:00
|
|
|
|
private FileTreeNode _selectedUnstagedTreeNode = null;
|
|
|
|
|
private FileTreeNode _selectedStagedTreeNode = null;
|
2024-02-05 23:08:37 -08:00
|
|
|
|
private object _detailContext = null;
|
|
|
|
|
private string _commitMessage = string.Empty;
|
|
|
|
|
}
|
2024-03-31 01:54:29 -07:00
|
|
|
|
}
|