mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
In date order, the branches panel lists a stack of branches alphabetically rather than from the top of the stack down. Rebasing a stack creates all of its commits within the same second, so all of its branch tips end up carrying the same committer date, and git sorts refs with equal committer dates by name. Sort each group of branches that share a committer date by ancestry instead, so that a branch comes before the branches it is based on. Branches that are not descended from one another keep the alphabetical order git gave them. Determining the ancestry takes one more for-each-ref call, and it only runs when there is a group to sort. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
258 lines
8.2 KiB
Go
258 lines
8.2 KiB
Go
package git_commands
|
|
|
|
// "*|feat/detect-purge|origin/feat/detect-purge|[ahead 1]"
|
|
import (
|
|
"strconv"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestObtainBranch(t *testing.T) {
|
|
type scenario struct {
|
|
testName string
|
|
input []string
|
|
storeCommitDateAsRecency bool
|
|
expectedBranch *models.Branch
|
|
}
|
|
|
|
// Use a time stamp of 2 1/2 hours ago, resulting in a recency string of "2h"
|
|
now := time.Now().Unix()
|
|
timeStamp := strconv.Itoa(int(now - 2.5*60*60))
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
testName: "TrimHeads",
|
|
input: []string{"", "heads/a_branch", "", "", "", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: false,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
AheadForPull: "?",
|
|
BehindForPull: "?",
|
|
AheadForPush: "?",
|
|
BehindForPush: "?",
|
|
Head: false,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
{
|
|
testName: "NoUpstream",
|
|
input: []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: false,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
AheadForPull: "?",
|
|
BehindForPull: "?",
|
|
AheadForPush: "?",
|
|
BehindForPush: "?",
|
|
Head: false,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
{
|
|
testName: "IsHead",
|
|
input: []string{"*", "a_branch", "", "", "", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: false,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
AheadForPull: "?",
|
|
BehindForPull: "?",
|
|
AheadForPush: "?",
|
|
BehindForPush: "?",
|
|
Head: true,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
{
|
|
testName: "IsBehindAndAhead",
|
|
input: []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "[behind 2, ahead 3]", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: false,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
AheadForPull: "3",
|
|
BehindForPull: "2",
|
|
AheadForPush: "3",
|
|
BehindForPush: "2",
|
|
Head: false,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
{
|
|
testName: "RemoteBranchIsGone",
|
|
input: []string{"", "a_branch", "a_remote/a_branch", "[gone]", "[gone]", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: false,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
UpstreamGone: true,
|
|
AheadForPull: "?",
|
|
BehindForPull: "?",
|
|
AheadForPush: "?",
|
|
BehindForPush: "?",
|
|
Head: false,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
{
|
|
testName: "WithCommitDateAsRecency",
|
|
input: []string{"", "a_branch", "", "", "", "subject", "123", timeStamp},
|
|
storeCommitDateAsRecency: true,
|
|
expectedBranch: &models.Branch{
|
|
Name: "a_branch",
|
|
Recency: "2h",
|
|
AheadForPull: "?",
|
|
BehindForPull: "?",
|
|
AheadForPush: "?",
|
|
BehindForPush: "?",
|
|
Head: false,
|
|
Subject: "subject",
|
|
CommitHash: "123",
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
branch, tip := obtainBranch(s.input, s.storeCommitDateAsRecency)
|
|
assert.EqualValues(t, s.expectedBranch, branch)
|
|
assert.Equal(t, refTip{hash: "123", committerDate: timeStamp}, tip)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetBehindBaseBranchValuesForAllBranches_FastPath(t *testing.T) {
|
|
mainBranchRefs := []string{"refs/heads/master", "refs/remotes/origin/develop"}
|
|
|
|
// Two branches: feat-x has clear divergence from develop; main matches master exactly.
|
|
branches := []*models.Branch{
|
|
{Name: "feat-x"},
|
|
{Name: "main"},
|
|
}
|
|
|
|
expectedFormat := "%(refname)%00%(ahead-behind:refs/heads/master)%00%(ahead-behind:refs/remotes/origin/develop)"
|
|
output := "refs/heads/feat-x\x0055 0\x005 5\n" + // picks develop (ahead=5 < 55), behind=5
|
|
"refs/heads/main\x000 0\x000 0\n" // picks master (first, tie), behind=0
|
|
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"for-each-ref", "--format=" + expectedFormat, "refs/heads"}, output, nil)
|
|
|
|
gitCommon := buildGitCommon(commonDeps{
|
|
runner: runner,
|
|
gitVersion: &GitVersion{2, 41, 0, ""},
|
|
})
|
|
|
|
loader := &BranchLoader{
|
|
Common: gitCommon.Common,
|
|
GitCommon: gitCommon,
|
|
cmd: gitCommon.cmd,
|
|
}
|
|
|
|
mainBranches := &MainBranches{
|
|
c: gitCommon.Common,
|
|
cmd: gitCommon.cmd,
|
|
existingMainBranches: mainBranchRefs,
|
|
previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches,
|
|
}
|
|
|
|
rendered := false
|
|
err := loader.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, func() { rendered = true })
|
|
assert.NoError(t, err)
|
|
assert.True(t, rendered, "renderFunc should have been called")
|
|
|
|
assert.Equal(t, int32(5), branches[0].BehindBaseBranch.Load(), "feat-x should be behind develop by 5")
|
|
assert.Equal(t, int32(0), branches[1].BehindBaseBranch.Load(), "main should be behind master by 0")
|
|
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
// edge case where a failure would leave artifacts from prior load
|
|
func TestGetBehindBaseBranchValuesForAllBranches_FastPath_ClearsStaleValueWhenBranchMissingFromOutput(t *testing.T) {
|
|
mainBranchRefs := []string{"refs/heads/master"}
|
|
|
|
feat := &models.Branch{Name: "feat-x"}
|
|
feat.BehindBaseBranch.Store(99) // stale value from a prior load
|
|
ghost := &models.Branch{Name: "ghost"}
|
|
ghost.BehindBaseBranch.Store(42) // stale value from a prior load
|
|
|
|
expectedFormat := "%(refname)%00%(ahead-behind:refs/heads/master)"
|
|
output := "refs/heads/feat-x\x003 5\n" // ghost is intentionally absent
|
|
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"for-each-ref", "--format=" + expectedFormat, "refs/heads"}, output, nil)
|
|
|
|
gitCommon := buildGitCommon(commonDeps{
|
|
runner: runner,
|
|
gitVersion: &GitVersion{2, 41, 0, ""},
|
|
})
|
|
|
|
loader := &BranchLoader{
|
|
Common: gitCommon.Common,
|
|
GitCommon: gitCommon,
|
|
cmd: gitCommon.cmd,
|
|
}
|
|
|
|
mainBranches := &MainBranches{
|
|
c: gitCommon.Common,
|
|
cmd: gitCommon.cmd,
|
|
existingMainBranches: mainBranchRefs,
|
|
previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches,
|
|
}
|
|
|
|
err := loader.GetBehindBaseBranchValuesForAllBranches(
|
|
[]*models.Branch{feat, ghost}, mainBranches, func() {})
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, int32(5), feat.BehindBaseBranch.Load(), "feat-x should be updated to fresh value")
|
|
assert.Equal(t, int32(0), ghost.BehindBaseBranch.Load(), "ghost should be reset to 0 since it has no fresh data")
|
|
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestGetBehindBaseBranchValuesForAllBranches_LegacyPath(t *testing.T) {
|
|
mainBranchRefs := []string{"refs/heads/master"}
|
|
|
|
branches := []*models.Branch{
|
|
{Name: "feat-x"},
|
|
}
|
|
|
|
// In legacy path: per-branch GetBaseBranch (merge-base + for-each-ref --contains)
|
|
// then rev-list --left-right --count.
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"merge-base", "refs/heads/feat-x", "refs/heads/master"}, "abc123\n", nil).
|
|
ExpectGitArgs([]string{"for-each-ref", "--contains", "abc123", "--format=%(refname)", "refs/heads/master"}, "refs/heads/master\n", nil).
|
|
ExpectGitArgs([]string{"rev-list", "--left-right", "--count", "refs/heads/feat-x...refs/heads/master"}, "5\t7\n", nil)
|
|
|
|
gitCommon := buildGitCommon(commonDeps{
|
|
runner: runner,
|
|
gitVersion: &GitVersion{2, 34, 0, ""}, // pre-2.41, forces legacy
|
|
})
|
|
|
|
loader := &BranchLoader{
|
|
Common: gitCommon.Common,
|
|
GitCommon: gitCommon,
|
|
cmd: gitCommon.cmd,
|
|
}
|
|
|
|
mainBranches := &MainBranches{
|
|
c: gitCommon.Common,
|
|
cmd: gitCommon.cmd,
|
|
existingMainBranches: mainBranchRefs,
|
|
previousMainBranches: gitCommon.Common.UserConfig().Git.MainBranches,
|
|
}
|
|
|
|
rendered := false
|
|
err := loader.GetBehindBaseBranchValuesForAllBranches(branches, mainBranches, func() { rendered = true })
|
|
assert.NoError(t, err)
|
|
assert.True(t, rendered)
|
|
assert.Equal(t, int32(7), branches[0].BehindBaseBranch.Load())
|
|
|
|
runner.CheckForMissingCalls()
|
|
}
|