dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-24 05:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_review: PR #1153

Browse source 
- use a single filter for both unstage and staged files
- show confirm dialog if staged files are displayed partially

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-07 11:45:14 +08:00
parent a37c6b29ec
commit fa02c65da5
No known key found for this signature in database
9 changed files with 103 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ViewModels/ConfirmCommit.cs Normal file
View file

@ -0,0 +1,26 @@
using System;
namespace SourceGit.ViewModels
{
public class ConfirmCommit
{
public string Message
{
get;
private set;
}
public ConfirmCommit(string message, Action onSure)
{
Message = message;
_onSure = onSure;
}
public void Continue()
{
_onSure?.Invoke();
}
private Action _onSure;
}
}

19
src/ViewModels/ConfirmCommitWithoutFiles.cs
View file

@ -1,19 +0,0 @@
namespace SourceGit.ViewModels
{
public class ConfirmCommitWithoutFiles
{
public ConfirmCommitWithoutFiles(WorkingCopy wc, bool autoPush)
{
_wc = wc;
_autoPush = autoPush;
}
public void Continue()
{
_wc.CommitWithoutFiles(_autoPush);
}
private readonly WorkingCopy _wc;
private bool _autoPush;
}
}

75
src/ViewModels/WorkingCopy.cs
View file

@ -99,38 +99,23 @@ namespace SourceGit.ViewModels
}
}
public string UnstagedFilter
public string Filter
{
get => _unstagedFilter;
get => _filter;
set
{
if (SetProperty(ref _unstagedFilter, value))
if (SetProperty(ref _filter, value))
{
if (_isLoadingData)
return;
VisibleUnstaged = GetVisibleChanges(_unstaged, _unstagedFilter);
VisibleUnstaged = GetVisibleChanges(_unstaged);
VisibleStaged = GetVisibleChanges(_staged);
SelectedUnstaged = [];
}
}
}
public string StagedFilter
{
get => _stagedFilter;
set
{
if (SetProperty(ref _stagedFilter, value))
{
if (_isLoadingData)
return;
VisibleStaged = GetVisibleChanges(_staged, _stagedFilter);
SelectedStaged = [];
}
}
}
public List<Models.Change> Unstaged
{
get => _unstaged;
@ -294,7 +279,7 @@ namespace SourceGit.ViewModels
}
}
var visibleUnstaged = GetVisibleChanges(unstaged, _unstagedFilter);
var visibleUnstaged = GetVisibleChanges(unstaged);
var selectedUnstaged = new List<Models.Change>();
foreach (var c in visibleUnstaged)
{
@ -304,7 +289,7 @@ namespace SourceGit.ViewModels
var staged = GetStagedChanges();
var visibleStaged = GetVisibleChanges(staged, _stagedFilter);
var visibleStaged = GetVisibleChanges(staged);
var selectedStaged = new List<Models.Change>();
foreach (var c in visibleStaged)
{
@ -374,14 +359,9 @@ namespace SourceGit.ViewModels
_repo.ShowPopup(new Discard(_repo, changes));
}
public void ClearUnstagedFilter()
public void ClearFilter()
{
UnstagedFilter = string.Empty;
}
public void ClearStagedFilter()
{
StagedFilter = string.Empty;
Filter = string.Empty;
}
public async void UseTheirs(List<Models.Change> changes)
@ -571,11 +551,6 @@ namespace SourceGit.ViewModels
DoCommit(false, true, false);
}
public void CommitWithoutFiles(bool autoPush)
{
DoCommit(false, autoPush, true);
}
public ContextMenu CreateContextMenuForUnstagedChanges()
{
if (_selectedUnstaged == null || _selectedUnstaged.Count == 0)
@ -1505,16 +1480,16 @@ namespace SourceGit.ViewModels
return menu;
}
private List<Models.Change> GetVisibleChanges(List<Models.Change> changes, string filter)
private List<Models.Change> GetVisibleChanges(List<Models.Change> changes)
{
if (string.IsNullOrEmpty(filter))
if (string.IsNullOrEmpty(_filter))
return changes;
var visible = new List<Models.Change>();
foreach (var c in changes)
{
if (c.Path.Contains(filter, StringComparison.OrdinalIgnoreCase))
if (c.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase))
visible.Add(c);
}
@ -1675,7 +1650,7 @@ namespace SourceGit.ViewModels
DetailContext = new DiffContext(_repo.FullPath, new Models.DiffOption(change, isUnstaged), _detailContext as DiffContext);
}
private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty)
private void DoCommit(bool autoStage, bool autoPush, bool allowEmpty = false, bool confirmWithFilter = false)
{
if (!_repo.CanCreatePopup())
{
@ -1683,10 +1658,17 @@ namespace SourceGit.ViewModels
return;
}
if (!string.IsNullOrEmpty(_stagedFilter))
if (!string.IsNullOrEmpty(_filter) && _staged.Count > _visibleStaged.Count && !confirmWithFilter)
{
// FIXME - make this a proper warning message-box "Staged-area filter will not be applied to commit. Continue?" Yes/No
App.RaiseException(_repo.FullPath, "Committing with staged-area filter applied is NOT allowed!");
var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithFilter", _staged.Count, _visibleStaged.Count, _staged.Count - _visibleStaged.Count);
App.OpenDialog(new Views.ConfirmCommit()
{
DataContext = new ConfirmCommit(confirmMessage, () =>
{
DoCommit(autoStage, autoPush, allowEmpty, true);
})
});
return;
}
@ -1700,9 +1682,13 @@ namespace SourceGit.ViewModels
{
if ((autoStage && _count == 0) || (!autoStage && _staged.Count == 0))
{
App.OpenDialog(new Views.ConfirmCommitWithoutFiles()
var confirmMessage = App.Text("WorkingCopy.ConfirmCommitWithoutFiles");
App.OpenDialog(new Views.ConfirmCommit()
{
DataContext = new ConfirmCommitWithoutFiles(this, autoPush)
DataContext = new ConfirmCommit(confirmMessage, () =>
{
DoCommit(autoStage, autoPush, true, confirmWithFilter);
})
});
return;
@ -1774,8 +1760,7 @@ namespace SourceGit.ViewModels
private List<Models.Change> _selectedStaged = [];
private int _count = 0;
private object _detailContext = null;
private string _unstagedFilter = string.Empty;
private string _stagedFilter = string.Empty;
private string _filter = string.Empty;
private string _commitMessage = string.Empty;
private bool _hasUnsolvedConflicts = false;