Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update recorded parent's HEAD after rebase #104

Merged
merged 1 commit into from
May 8, 2023
Merged

fix: Update recorded parent's HEAD after rebase #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions e2e_tests/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"testing"

"github.com/aviator-co/av/internal/git"
"github.com/aviator-co/av/internal/meta"
"github.com/aviator-co/av/internal/meta/jsonfiledb"
"github.com/stretchr/testify/require"
)

Expand All @@ -12,3 +14,11 @@ func RequireCurrentBranchName(t *testing.T, repo *git.Repo, name string) {
require.NoError(t, err, "failed to determine current branch name")
require.Equal(t, name, currentBranch, "expected current branch to be %q, got %q", name, currentBranch)
}

func GetStoredParentBranchState(t *testing.T, repo *git.Repo, name string) meta.BranchState {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not for this PR, but we should add a command to get this information that way we don't have to do this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

// We shouldn't do this as part of an E2E test, but it's hard to ensure otherwise.
db, err := jsonfiledb.OpenRepo(repo)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to close this to close the file handle? (not sure if that's actually a part of the DB interface in hindsight... 🤔)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsonfiledb doesn't have a file handle in it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that you say that I remember it lol. I wrote that code all of two weeks ago and remember none of it apparently.

require.NoError(t, err, "failed to open repo db")
br, _ := db.ReadTx().Branch(name)
return br.Parent
}
20 changes: 20 additions & 0 deletions e2e_tests/stack_sync_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/aviator-co/av/internal/git"
"github.com/aviator-co/av/internal/git/gittest"
"github.com/aviator-co/av/internal/meta"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -126,6 +127,25 @@ func TestStackSync(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, 4, len(revs))

stack1Commit, err := repo.RevParse(&git.RevParse{Rev: "stack-1"})
require.NoError(t, err)

stack2Commit, err := repo.RevParse(&git.RevParse{Rev: "stack-2"})
require.NoError(t, err)

require.Equal(t, meta.BranchState{
Name: "main",
Trunk: true,
}, GetStoredParentBranchState(t, repo, "stack-1"))
require.Equal(t, meta.BranchState{
Name: "stack-1",
Head: stack1Commit,
}, GetStoredParentBranchState(t, repo, "stack-2"))
require.Equal(t, meta.BranchState{
Name: "stack-2",
Head: stack2Commit,
}, GetStoredParentBranchState(t, repo, "stack-3"))
}

func TestStackSyncAbort(t *testing.T) {
Expand Down
4 changes: 4 additions & 0 deletions internal/actions/sync_branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@ func syncBranchRebase(
}
msgRebaseResult(rebase)

branch.Parent = parentState
branch.Parent.Head = parentHead
tx.SetBranch(branch)

//nolint:exhaustive
switch rebase.Status {
case git.RebaseConflict:
Expand Down