github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-26 03:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

code_review: PR #1416

Browse Source 
- Split `DoubleTapped` into two methods: `CheckoutBranchByDecorator` and `CheckoutBranchByCommit`
- Move `DoubleTappedEvent` from whole ListBox to the row tapped actually
- Do nothing if the decorator double-clicked is HEAD
- Code-style

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-06-19 11:31:04 +08:00
parent 88fd8f32f1
commit af2b644792
6 changed files with 101 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/ViewModels/Histories.cs
View File

@@ -209,48 +209,56 @@ namespace SourceGit.ViewModels
}
}
public void DoubleTapped(Models.Commit commit, Models.Decorator decorator = null)
public bool CheckoutBranchByDecorator(Models.Decorator decorator)
{
if (decorator != null)
if (decorator == null)
return false;
if (decorator.Type == Models.DecoratorType.CurrentBranchHead ||
decorator.Type == Models.DecoratorType.CurrentCommitHead)
return true;
if (decorator.Type == Models.DecoratorType.LocalBranchHead)
{
if (decorator.Type == Models.DecoratorType.LocalBranchHead)
{
var b = _repo.Branches.Find(x => x.FriendlyName == decorator.Name);
if (b != null)
{
_repo.CheckoutBranch(b);
return;
}
}
else if (decorator.Type == Models.DecoratorType.RemoteBranchHead)
{
var remoteBranch = _repo.Branches.Find(x => x.FriendlyName == decorator.Name);
if (remoteBranch != null)
{
var localBranch = _repo.Branches.Find(x => x.IsLocal && x.Upstream == remoteBranch.FullName);
if (localBranch != null)
{
if (localBranch.IsCurrent)
return;
if (localBranch.TrackStatus.Ahead.Count > 0)
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CreateBranch(_repo, remoteBranch));
}
else if (localBranch.TrackStatus.Behind.Count > 0)
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CheckoutAndFastForward(_repo, localBranch, remoteBranch));
}
else
_repo.CheckoutBranch(localBranch);
return;
}
}
}
var b = _repo.Branches.Find(x => x.Name == decorator.Name);
if (b == null)
return false;
_repo.CheckoutBranch(b);
return true;
}
if (commit == null || commit.IsCurrentHead)
if (decorator.Type == Models.DecoratorType.RemoteBranchHead)
{
var rb = _repo.Branches.Find(x => x.FriendlyName == decorator.Name);
if (rb == null)
return false;
var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);
if (lb == null || lb.TrackStatus.Ahead.Count > 0)
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CreateBranch(_repo, rb));
}
else if (lb.TrackStatus.Behind.Count > 0)
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));
}
else if (!lb.IsCurrent)
{
_repo.CheckoutBranch(lb);
}
return true;
}
return false;
}
public void CheckoutBranchByCommit(Models.Commit commit)
{
if (commit.IsCurrentHead)
return;
var firstRemoteBranch = null as Models.Branch;
@@ -258,28 +266,28 @@ namespace SourceGit.ViewModels
{
if (d.Type == Models.DecoratorType.LocalBranchHead)
{
var b = _repo.Branches.Find(x => x.FriendlyName == d.Name);
if (b != null)
{
_repo.CheckoutBranch(b);
return;
}
var b = _repo.Branches.Find(x => x.Name == d.Name);
if (b == null)
continue;
_repo.CheckoutBranch(b);
return;
}
else if (d.Type == Models.DecoratorType.RemoteBranchHead)
{
var remoteBranch = _repo.Branches.Find(x => x.FriendlyName == d.Name);
if (remoteBranch != null)
var rb = _repo.Branches.Find(x => x.FriendlyName == d.Name);
if (rb == null)
continue;
var lb = _repo.Branches.Find(x => x.IsLocal && x.Upstream == rb.FullName);
if (lb is { TrackStatus.Ahead.Count: 0 })
{
var localBranch = _repo.Branches.Find(x => x.IsLocal && x.Upstream == remoteBranch.FullName);
if (localBranch is { TrackStatus.Ahead.Count: 0 })
{
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CheckoutAndFastForward(_repo, localBranch, remoteBranch));
return;
}
if (_repo.CanCreatePopup())
_repo.ShowPopup(new CheckoutAndFastForward(_repo, lb, rb));
return;
}
firstRemoteBranch ??= remoteBranch;
firstRemoteBranch ??= rb;
}
}

4
src/ViewModels/WorkingCopy.cs
View File

@@ -810,7 +810,7 @@ namespace SourceGit.ViewModels
};
addToIgnore.Items.Add(byExtensionInSameFolder);
}
}
}
menu.Items.Add(addToIgnore);
hasExtra = true;
@@ -1414,7 +1414,7 @@ namespace SourceGit.ViewModels
menu.Items.Add(explore);
menu.Items.Add(new MenuItem() { Header = "-" });
}
}
var unstage = new MenuItem();
unstage.Header = App.Text("FileCM.UnstageMulti", _selectedStaged.Count);