go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-04 22:34:39 +02:00
Code Issues Releases Activity

Rename Pushables/Pullables to AheadForPull/BehindForPull

Browse Source 
In preparation for adding AheadForPush/BehindForPush in the next commit.
This commit is contained in:
Stefan Haller 2024-05-17 20:14:45 +02:00
parent b91b40ba4d
commit 0aba686f97
9 changed files with 88 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/commands/git_commands/branch_loader.go
View File

@ -199,7 +199,7 @@ func obtainBranch(split []string, storeCommitDateAsRecency bool) *models.Branch
commitDate := split[6] commitDate := split[6]
name := strings.TrimPrefix(fullName, "heads/") name := strings.TrimPrefix(fullName, "heads/")
pushables, pullables, gone := parseUpstreamInfo(upstreamName, track) aheadForPull, behindForPull, gone := parseUpstreamInfo(upstreamName, track)
recency := "" recency := ""
if storeCommitDateAsRecency { if storeCommitDateAsRecency {
@ -209,14 +209,14 @@ func obtainBranch(split []string, storeCommitDateAsRecency bool) *models.Branch
} }
return &models.Branch{ return &models.Branch{
Name: name, Name: name,
Recency: recency, Recency: recency,
Pushables: pushables, AheadForPull: aheadForPull,
Pullables: pullables, BehindForPull: behindForPull,
UpstreamGone: gone, UpstreamGone: gone,
Head: headMarker == "*", Head: headMarker == "*",
Subject: subject, Subject: subject,
CommitHash: commitHash, CommitHash: commitHash,
} }
} }
@ -232,10 +232,10 @@ func parseUpstreamInfo(upstreamName string, track string) (string, string, bool)
return "?", "?", true return "?", "?", true
} }
pushables := parseDifference(track, `ahead (\d+)`) ahead := parseDifference(track, `ahead (\d+)`)
pullables := parseDifference(track, `behind (\d+)`) behind := parseDifference(track, `behind (\d+)`)
return pushables, pullables, false return ahead, behind, false
} }
func parseDifference(track string, regexStr string) string { func parseDifference(track string, regexStr string) string {

76
pkg/commands/git_commands/branch_loader_test.go
View File

@ -28,12 +28,12 @@ func TestObtainBranch(t *testing.T) {
input: []string{"", "heads/a_branch", "", "", "subject", "123", timeStamp}, input: []string{"", "heads/a_branch", "", "", "subject", "123", timeStamp},
storeCommitDateAsRecency: false, storeCommitDateAsRecency: false,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
Pushables: "?", AheadForPull: "?",
Pullables: "?", BehindForPull: "?",
Head: false, Head: false,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
{ {
@ -41,12 +41,12 @@ func TestObtainBranch(t *testing.T) {
input: []string{"", "a_branch", "", "", "subject", "123", timeStamp}, input: []string{"", "a_branch", "", "", "subject", "123", timeStamp},
storeCommitDateAsRecency: false, storeCommitDateAsRecency: false,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
Pushables: "?", AheadForPull: "?",
Pullables: "?", BehindForPull: "?",
Head: false, Head: false,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
{ {
@ -54,12 +54,12 @@ func TestObtainBranch(t *testing.T) {
input: []string{"*", "a_branch", "", "", "subject", "123", timeStamp}, input: []string{"*", "a_branch", "", "", "subject", "123", timeStamp},
storeCommitDateAsRecency: false, storeCommitDateAsRecency: false,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
Pushables: "?", AheadForPull: "?",
Pullables: "?", BehindForPull: "?",
Head: true, Head: true,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
{ {
@ -67,12 +67,12 @@ func TestObtainBranch(t *testing.T) {
input: []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "subject", "123", timeStamp}, input: []string{"", "a_branch", "a_remote/a_branch", "[behind 2, ahead 3]", "subject", "123", timeStamp},
storeCommitDateAsRecency: false, storeCommitDateAsRecency: false,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
Pushables: "3", AheadForPull: "3",
Pullables: "2", BehindForPull: "2",
Head: false, Head: false,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
{ {
@ -80,13 +80,13 @@ func TestObtainBranch(t *testing.T) {
input: []string{"", "a_branch", "a_remote/a_branch", "[gone]", "subject", "123", timeStamp}, input: []string{"", "a_branch", "a_remote/a_branch", "[gone]", "subject", "123", timeStamp},
storeCommitDateAsRecency: false, storeCommitDateAsRecency: false,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
UpstreamGone: true, UpstreamGone: true,
Pushables: "?", AheadForPull: "?",
Pullables: "?", BehindForPull: "?",
Head: false, Head: false,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
{ {
@ -94,13 +94,13 @@ func TestObtainBranch(t *testing.T) {
input: []string{"", "a_branch", "", "", "subject", "123", timeStamp}, input: []string{"", "a_branch", "", "", "subject", "123", timeStamp},
storeCommitDateAsRecency: true, storeCommitDateAsRecency: true,
expectedBranch: &models.Branch{ expectedBranch: &models.Branch{
Name: "a_branch", Name: "a_branch",
Recency: "2h", Recency: "2h",
Pushables: "?", AheadForPull: "?",
Pullables: "?", BehindForPull: "?",
Head: false, Head: false,
Subject: "subject", Subject: "subject",
CommitHash: "123", CommitHash: "123",
}, },
}, },
} }

22
pkg/commands/models/branch.go
View File

@ -10,10 +10,10 @@ type Branch struct {
DisplayName string DisplayName string
// indicator of when the branch was last checked out e.g. '2d', '3m' // indicator of when the branch was last checked out e.g. '2d', '3m'
Recency string Recency string
// how many commits ahead we are from the remote branch (how many commits we can push) // how many commits ahead we are from the remote branch (how many commits we can push, assuming we push to our tracked remote branch)
Pushables string AheadForPull string
// how many commits behind we are from the remote branch (how many commits we can pull) // how many commits behind we are from the remote branch (how many commits we can pull)
Pullables string BehindForPull string
// whether the remote branch is 'gone' i.e. we're tracking a remote branch that has been deleted // whether the remote branch is 'gone' i.e. we're tracking a remote branch that has been deleted
UpstreamGone bool UpstreamGone bool
// whether this is the current branch. Exactly one branch should have this be true // whether this is the current branch. Exactly one branch should have this be true
@ -80,26 +80,26 @@ func (b *Branch) IsTrackingRemote() bool {
// we know that the remote branch is not stored locally based on our pushable/pullable // we know that the remote branch is not stored locally based on our pushable/pullable
// count being question marks. // count being question marks.
func (b *Branch) RemoteBranchStoredLocally() bool { func (b *Branch) RemoteBranchStoredLocally() bool {
return b.IsTrackingRemote() && b.Pushables != "?" && b.Pullables != "?" return b.IsTrackingRemote() && b.AheadForPull != "?" && b.BehindForPull != "?"
} }
func (b *Branch) RemoteBranchNotStoredLocally() bool { func (b *Branch) RemoteBranchNotStoredLocally() bool {
return b.IsTrackingRemote() && b.Pushables == "?" && b.Pullables == "?" return b.IsTrackingRemote() && b.AheadForPull == "?" && b.BehindForPull == "?"
} }
func (b *Branch) MatchesUpstream() bool { func (b *Branch) MatchesUpstream() bool {
return b.RemoteBranchStoredLocally() && b.Pushables == "0" && b.Pullables == "0" return b.RemoteBranchStoredLocally() && b.AheadForPull == "0" && b.BehindForPull == "0"
} }
func (b *Branch) HasCommitsToPush() bool { func (b *Branch) IsAheadForPull() bool {
return b.RemoteBranchStoredLocally() && b.Pushables != "0" return b.RemoteBranchStoredLocally() && b.AheadForPull != "0"
} }
func (b *Branch) HasCommitsToPull() bool { func (b *Branch) IsBehindForPull() bool {
return b.RemoteBranchStoredLocally() && b.Pullables != "0" return b.RemoteBranchStoredLocally() && b.BehindForPull != "0"
} }
// for when we're in a detached head state // for when we're in a detached head state
func (b *Branch) IsRealBranch() bool { func (b *Branch) IsRealBranch() bool {
return b.Pushables != "" && b.Pullables != "" return b.AheadForPull != "" && b.BehindForPull != ""
} }

2
pkg/gui/controllers/branches_controller.go
View File

@ -620,7 +620,7 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
if !branch.RemoteBranchStoredLocally() { if !branch.RemoteBranchStoredLocally() {
return errors.New(self.c.Tr.FwdNoLocalUpstream) return errors.New(self.c.Tr.FwdNoLocalUpstream)
} }
if branch.HasCommitsToPush() { if branch.IsAheadForPull() {
return errors.New(self.c.Tr.FwdCommitsToPush) return errors.New(self.c.Tr.FwdCommitsToPush)
} }

4
pkg/gui/controllers/sync_controller.go
View File

@ -87,10 +87,10 @@ func (self *SyncController) branchCheckedOut(f func(*models.Branch) error) func(
} }
func (self *SyncController) push(currentBranch *models.Branch) error { func (self *SyncController) push(currentBranch *models.Branch) error {
// if we have pullables we'll ask if the user wants to force push // if we are behind our upstream branch we'll ask if the user wants to force push
if currentBranch.IsTrackingRemote() { if currentBranch.IsTrackingRemote() {
opts := pushOpts{} opts := pushOpts{}
if currentBranch.HasCommitsToPull() { if currentBranch.IsBehindForPull() {
return self.requestToForcePush(currentBranch, opts) return self.requestToForcePush(currentBranch, opts)
} else { } else {
return self.pushAux(currentBranch, opts) return self.pushAux(currentBranch, opts)

8
pkg/gui/presentation/branches.go
View File

@ -196,11 +196,11 @@ func BranchStatus(
} }
result := "" result := ""
if branch.HasCommitsToPush() { if branch.IsAheadForPull() {
result = fmt.Sprintf("↑%s", branch.Pushables) result = fmt.Sprintf("↑%s", branch.AheadForPull)
} }
if branch.HasCommitsToPull() { if branch.IsBehindForPull() {
result = fmt.Sprintf("%s↓%s", result, branch.Pullables) result = fmt.Sprintf("%s↓%s", result, branch.BehindForPull)
} }
return result return result

24
pkg/gui/presentation/branches_test.go
View File

@ -58,8 +58,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
Name: "branch_name", Name: "branch_name",
Recency: "1m", Recency: "1m",
UpstreamRemote: "origin", UpstreamRemote: "origin",
Pushables: "0", AheadForPull: "0",
Pullables: "0", BehindForPull: "0",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,
fullDescription: false, fullDescription: false,
@ -73,8 +73,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
Name: "branch_name", Name: "branch_name",
Recency: "1m", Recency: "1m",
UpstreamRemote: "origin", UpstreamRemote: "origin",
Pushables: "3", AheadForPull: "3",
Pullables: "5", BehindForPull: "5",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,
fullDescription: false, fullDescription: false,
@ -99,8 +99,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
CommitHash: "1234567890", CommitHash: "1234567890",
UpstreamRemote: "origin", UpstreamRemote: "origin",
UpstreamBranch: "branch_name", UpstreamBranch: "branch_name",
Pushables: "0", AheadForPull: "0",
Pullables: "0", BehindForPull: "0",
Subject: "commit title", Subject: "commit title",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,
@ -144,8 +144,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
Name: "branch_name", Name: "branch_name",
Recency: "1m", Recency: "1m",
UpstreamRemote: "origin", UpstreamRemote: "origin",
Pushables: "0", AheadForPull: "0",
Pullables: "0", BehindForPull: "0",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,
fullDescription: false, fullDescription: false,
@ -159,8 +159,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
Name: "branch_name", Name: "branch_name",
Recency: "1m", Recency: "1m",
UpstreamRemote: "origin", UpstreamRemote: "origin",
Pushables: "3", AheadForPull: "3",
Pullables: "5", BehindForPull: "5",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,
fullDescription: false, fullDescription: false,
@ -212,8 +212,8 @@ func Test_getBranchDisplayStrings(t *testing.T) {
CommitHash: "1234567890", CommitHash: "1234567890",
UpstreamRemote: "origin", UpstreamRemote: "origin",
UpstreamBranch: "branch_name", UpstreamBranch: "branch_name",
Pushables: "0", AheadForPull: "0",
Pullables: "0", BehindForPull: "0",
Subject: "commit title", Subject: "commit title",
}, },
itemOperation: types.ItemOperationNone, itemOperation: types.ItemOperationNone,

6
pkg/gui/services/custom_commands/models.go
View File

@ -47,8 +47,10 @@ type Branch struct {
Name string Name string
DisplayName string DisplayName string
Recency string Recency string
Pushables string Pushables string // deprecated: use AheadForPull
Pullables string Pullables string // deprecated: use BehindForPull
AheadForPull string
BehindForPull string
UpstreamGone bool UpstreamGone bool
Head bool Head bool
DetachedHead bool DetachedHead bool

6
pkg/gui/services/custom_commands/session_state_loader.go
View File

@ -71,8 +71,10 @@ func branchShimFromModelBranch(branch *models.Branch) *Branch {
Name: branch.Name, Name: branch.Name,
DisplayName: branch.DisplayName, DisplayName: branch.DisplayName,
Recency: branch.Recency, Recency: branch.Recency,
Pushables: branch.Pushables, Pushables: branch.AheadForPull,
Pullables: branch.Pullables, Pullables: branch.BehindForPull,
AheadForPull: branch.AheadForPull,
BehindForPull: branch.BehindForPull,
UpstreamGone: branch.UpstreamGone, UpstreamGone: branch.UpstreamGone,
Head: branch.Head, Head: branch.Head,
DetachedHead: branch.DetachedHead, DetachedHead: branch.DetachedHead,