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

Introduce a builder for merged trees and use it in jj chmod #2164

Merged
merged 3 commits into from
Aug 26, 2023

Conversation

martinvonz
Copy link
Member

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@martinvonz martinvonz changed the base branch from main to push-kplqlwutpytm August 25, 2023 21:02
@ilyagr ilyagr changed the title Introduce a builder for merged trees Introduce a builder for merged trees and use it in jj chmod Aug 25, 2023
Copy link
Contributor

@ilyagr ilyagr left a comment

Choose a reason for hiding this comment

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

My review wasn't very careful, but this LGTM. Thank you for having the patience to move this half a step at a time!

lib/src/commit_builder.rs Show resolved Hide resolved
@martinvonz martinvonz force-pushed the push-kplqlwutpytm branch 2 times, most recently from 3ca214a to 620dc7d Compare August 26, 2023 13:15
@martinvonz martinvonz force-pushed the push-vqluklmkykux branch 2 times, most recently from 490e06a to c6d8bbc Compare August 26, 2023 13:36
Base automatically changed from push-kplqlwutpytm to main August 26, 2023 14:02
This introduces a `MergedTreeBuilder` type, which takes a set of base
trees and overrides. The idea is that it will be able to write
multiple trees or a legacy tree. For now, it's only able to write
legacy trees. To show that it works, the working copy's snaphotting
code has been updated to use it.
@martinvonz martinvonz enabled auto-merge (rebase) August 26, 2023 15:04
@martinvonz martinvonz merged commit a186b5f into main Aug 26, 2023
@martinvonz martinvonz deleted the push-vqluklmkykux branch August 26, 2023 15:16
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.

2 participants