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

code_review: PR #98

Browse source 
* remove the `Leave` option (it may lead to an undefined behaviour), so user can only choose `Stash & reapply` or `Discard`.
* re-design the UI
* remove unused resources
This commit is contained in:
leo 2024-04-29 17:22:22 +08:00
parent 927a1cab24
commit 776605cb68
7 changed files with 75 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/ViewModels/Checkout.cs
View file

@ -9,28 +9,11 @@ namespace SourceGit.ViewModels
get;
private set;
}
public bool HasLocalChanges
{
get => _repo.WorkingCopyChangesCount > 0;
}
public bool LeaveLocalChanges
public bool AutoStash
{
get => _leaveLocalChanges;
set => SetProperty(ref _leaveLocalChanges, value);
}
public bool DiscardLocalChanges
{
get => _discardLocalChanges;
set => SetProperty(ref _discardLocalChanges, value);
}
public bool StashLocalChanges
{
get => _stashLocalChanges;
set => SetProperty(ref _stashLocalChanges, value);
get => _autoStash;
set => SetProperty(ref _autoStash, value);
}
public Checkout(Repository repo, string branch)
@ -38,69 +21,63 @@ namespace SourceGit.ViewModels
_repo = repo;
Branch = branch;
View = new Views.Checkout() { DataContext = this };
StashLocalChanges = true;
}
public override Task<bool> Sure()
{
_repo.SetWatcherEnabled(false);
ProgressDescription = $"Checkout '{Branch}' ...";
var hasLocalChanges = HasLocalChanges;
var hasLocalChanges = _repo.WorkingCopyChangesCount > 0;
return Task.Run(() =>
{
var succ = false;
var needPopStash = false;
if (hasLocalChanges)
{
if (DiscardLocalChanges)
if (AutoStash)
{
SetProgressDescription("Discard local changes...");
Commands.Discard.All(_repo.FullPath);
}
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("CHECKOUT_AUTO_STASH");
}
if (StashLocalChanges)
if (!succ)
{
CallUIThread(() => _repo.SetWatcherEnabled(true));
return false;
}
needPopStash = true;
}
else
{
SetProgressDescription("Stash local changes...");
succ = new Commands.Add(_repo.FullPath).Exec();
succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
SetProgressDescription("Discard local changes ...");
Commands.Discard.All(_repo.FullPath);
}
}
SetProgressDescription("Checkout branch ...");
succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
var rs = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
if(hasLocalChanges && StashLocalChanges)
if(needPopStash)
{
SetProgressDescription("Re-apply local changes...");
succ = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
if (succ)
rs = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
if (rs)
{
succ = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
rs = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
}
}
CallUIThread(() => _repo.SetWatcherEnabled(true));
return succ;
return rs;
});
}
public static void ShowPopup(Repository repo, string branch)
{
var checkout = new Checkout(repo, branch);
if (repo.WorkingCopyChangesCount > 0)
{
PopupHost.ShowPopup(checkout);
}
else
{
PopupHost.ShowAndStartPopup(checkout);
}
}
private readonly Repository _repo;
private bool _leaveLocalChanges;
private bool _discardLocalChanges;
private bool _stashLocalChanges;
private readonly Repository _repo = null;
private bool _autoStash = true;
}
}

13
src/ViewModels/Histories.cs
View file

@ -447,10 +447,7 @@ namespace SourceGit.ViewModels
checkout.Icon = App.CreateMenuIcon("Icons.Check");
checkout.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup())
{
Checkout.ShowPopup(_repo, branch.Name);
}
_repo.CheckoutLocalBranch(branch.Name);
e.Handled = true;
};
submenu.Items.Add(checkout);
@ -526,16 +523,16 @@ namespace SourceGit.ViewModels
{
if (b.IsLocal && b.Upstream == branch.FullName)
{
if (b.IsCurrent)
return;
if (PopupHost.CanCreatePopup())
Checkout.ShowPopup(_repo, b.Name);
if (!b.IsCurrent)
_repo.CheckoutLocalBranch(b.Name);
return;
}
}
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new CreateBranch(_repo, branch));
e.Handled = true;
};
submenu.Items.Add(checkout);

17
src/ViewModels/Repository.cs
View file

@ -690,6 +690,17 @@ namespace SourceGit.ViewModels
PopupHost.ShowPopup(new CreateBranch(this, current));
}
public void CheckoutLocalBranch(string branch)
{
if (!PopupHost.CanCreatePopup())
return;
if (WorkingCopyChangesCount > 0)
PopupHost.ShowPopup(new Checkout(this, branch));
else
PopupHost.ShowAndStartPopup(new Checkout(this, branch));
}
public void CreateNewTag()
{
var current = Branches.Find(x => x.IsCurrent);
@ -842,11 +853,7 @@ namespace SourceGit.ViewModels
checkout.Icon = App.CreateMenuIcon("Icons.Check");
checkout.Click += (o, e) =>
{
if (PopupHost.CanCreatePopup())
{
Checkout.ShowPopup(this, branch.Name);
}
CheckoutLocalBranch(branch.Name);
e.Handled = true;
};
menu.Items.Add(checkout);