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.

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

Branching #1217

Merged
merged 29 commits into from
Mar 5, 2024
Merged

Branching #1217

merged 29 commits into from
Mar 5, 2024

Conversation

quinchs
Copy link
Contributor

@quinchs quinchs commented Feb 21, 2024

Summary

PR implementing commands/features outlined in #1204 and RFC 1025.

TODOs

  • edgedb branch create
  • edgedb branch drop
  • edgedb branch list
  • edgedb branch rename
  • edgedb branch wipe
  • edgedb.auto.toml
    • store/read current branch
    • create and use from legacy projects
  • edgedb.toml branch
  • edgedb branch rebase different PR
  • edgedb branch merge different PR

src/portable/link.rs Outdated Show resolved Hide resolved
src/branch/create.rs Outdated Show resolved Hide resolved
src/branch/create.rs Outdated Show resolved Hide resolved
src/branch/create.rs Outdated Show resolved Hide resolved
src/branch/drop.rs Outdated Show resolved Hide resolved
src/branch/main.rs Outdated Show resolved Hide resolved
src/portable/config.rs Outdated Show resolved Hide resolved
@quinchs quinchs marked this pull request as ready for review March 1, 2024 17:35
@quinchs quinchs requested a review from aljazerzen March 1, 2024 17:35
@quinchs
Copy link
Contributor Author

quinchs commented Mar 1, 2024

One thing that needs a glossover is our terminology in the CLI regarding 'database', do we want to rename all terms referring to 'database' to 'branch'?

@quinchs
Copy link
Contributor Author

quinchs commented Mar 1, 2024

Probably also want to change /connect and /list databasees

@aljazerzen
Copy link
Contributor

One thing that needs a glossover is our terminology in the CLI regarding 'database', do we want to rename all terms referring to 'database' to 'branch'?

Yes, let's rename all mentions of database to branch. We need to be consistent.

But let's do that in a separate PR.

src/branch/create.rs Outdated Show resolved Hide resolved
src/branch/rename.rs Outdated Show resolved Hide resolved
Copy link
Member

@fantix fantix left a comment

Choose a reason for hiding this comment

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

Looks good overall, we need to pass the CI and fix the unused imports though.

src/options.rs Outdated Show resolved Hide resolved
@quinchs
Copy link
Contributor Author

quinchs commented Mar 5, 2024

With edgedb.auto.toml gone, the new mechanism is to use the database field in the credentials.json file, the issue with this is that could instances don't have a credentials.json file meaning we cant use them for branching

@quinchs quinchs merged commit 9dd2217 into master Mar 5, 2024
13 of 16 checks passed
@quinchs quinchs deleted the feat/branching branch March 5, 2024 21:20
@aljazerzen
Copy link
Contributor

For future reference: the failing test is caused by a bad nightly build of edgedb-server

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants