github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 10:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: disable Fast-Forward if current branch is already up to date to its upstream

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-07-24 20:36:50 +08:00
parent 619fc3c073
commit a603f376ca
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Views/BranchTree.axaml.cs
View File

@@ -586,6 +586,7 @@ namespace SourceGit.Views
{
var current = repo.CurrentBranch;
var menu = new ContextMenu();
var upstream = repo.Branches.Find(x => x.FullName.Equals(branch.Upstream, StringComparison.Ordinal));
var push = new MenuItem();
push.Header = App.Text("BranchCM.Push", branch.Name);
@@ -602,27 +603,21 @@ namespace SourceGit.Views
{
if (!repo.IsBare)
{
if (!string.IsNullOrEmpty(branch.Upstream))
if (upstream != null)
{
var upstream = branch.Upstream.Substring(13);
var fastForward = new MenuItem();
fastForward.Header = App.Text("BranchCM.FastForward", upstream);
fastForward.Header = App.Text("BranchCM.FastForward", upstream.FriendlyName);
fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0 && branch.TrackStatus.Behind.Count > 0;
fastForward.Click += (_, e) =>
{
var b = repo.Branches.Find(x => x.FriendlyName == upstream);
if (b == null)
return;
if (repo.CanCreatePopup())
repo.ShowAndStartPopup(new ViewModels.Merge(repo, b, branch.Name, true));
repo.ShowAndStartPopup(new ViewModels.Merge(repo, upstream, branch.Name, true));
e.Handled = true;
};
var pull = new MenuItem();
pull.Header = App.Text("BranchCM.Pull", upstream);
pull.Header = App.Text("BranchCM.Pull", upstream.FriendlyName);
pull.Icon = App.CreateMenuIcon("Icons.Pull");
pull.Click += (_, e) =>
{
@@ -656,13 +651,12 @@ namespace SourceGit.Views
}
var worktree = repo.Worktrees.Find(x => x.Branch == branch.FullName);
var upstream = repo.Branches.Find(x => x.FullName == branch.Upstream);
if (upstream != null && worktree == null)
{
var fastForward = new MenuItem();
fastForward.Header = App.Text("BranchCM.FastForward", upstream.FriendlyName);
fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0 && branch.TrackStatus.Behind.Count > 0;
fastForward.Click += (_, e) =>
{
if (repo.CanCreatePopup())

2
src/Views/Histories.axaml.cs
View File

@@ -912,7 +912,7 @@ namespace SourceGit.Views
var fastForward = new MenuItem();
fastForward.Header = App.Text("BranchCM.FastForward", upstream);
fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0;
fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0 && current.TrackStatus.Behind.Count > 0;
fastForward.Click += (_, e) =>
{
var b = repo.Branches.Find(x => x.FriendlyName == upstream);