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

enhance: makes Create New Branch option as the default selected mode for adding new worktree

Browse source
This commit is contained in:
leo 2024-06-28 14:11:13 +08:00
parent db8e534a0a
commit 3e54ab0227
No known key found for this signature in database
3 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ViewModels/AddWorktree.cs
View file

@ -15,17 +15,17 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _path, value);
}
public bool UseExistingBranch
public bool CreateNewBranch
{
get => _useExistingBranch;
get => _createNewBranch;
set
{
if (SetProperty(ref _useExistingBranch, value, true))
if (SetProperty(ref _createNewBranch, value, true))
{
if (value)
SelectedBranch = LocalBranches.Count > 0 ? LocalBranches[0] : string.Empty;
else
SelectedBranch = string.Empty;
else
SelectedBranch = LocalBranches.Count > 0 ? LocalBranches[0] : string.Empty;
}
}
}
@ -74,11 +74,6 @@ namespace SourceGit.ViewModels
RemoteBranches.Add($"{branch.Remote}/{branch.Name}");
}
if (LocalBranches.Count > 0)
SelectedBranch = LocalBranches[0];
else
SelectedBranch = string.Empty;
if (RemoteBranches.Count > 0)
SelectedTrackingBranch = RemoteBranches[0];
else
@ -114,11 +109,12 @@ namespace SourceGit.ViewModels
_repo.SetWatcherEnabled(false);
ProgressDescription = "Adding worktree ...";
var branchName = _selectedBranch;
var tracking = _setTrackingBranch ? SelectedTrackingBranch : string.Empty;
return Task.Run(() =>
{
var succ = new Commands.Worktree(_repo.FullPath).Add(_path, _selectedBranch, tracking, SetProgressDescription);
var succ = new Commands.Worktree(_repo.FullPath).Add(_path, branchName, _createNewBranch, tracking, SetProgressDescription);
CallUIThread(() => _repo.SetWatcherEnabled(true));
return succ;
});
@ -126,7 +122,7 @@ namespace SourceGit.ViewModels
private Repository _repo = null;
private string _path = string.Empty;
private bool _useExistingBranch = true;
private bool _createNewBranch = true;
private string _selectedBranch = string.Empty;
private bool _setTrackingBranch = false;
}