implement tracking/non-tracking remote branches for import/fetch #2384
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The state field isn't saved yet. git import/export code paths are migrated, but new tracking state is always calculated based on git.auto-local-branch setting. So the tracking state is effectively a global flag. As we don't know whether the existing remote branches have been merged in to local branches, we assume that remote branches are "tracking" so long as the local counterparts exist. This means existing locally-deleted branch won't be pushed without re-tracking it. I think it's rare to leave locally-deleted branches for long. For "git.auto-local-branch = false" setup, users might have to untrack branches if they've manually "merged" remote branches and want to continue that workflow. I considered using git.auto-local-branch setting in the migration path, but I don't think that would give a better result. The setting may be toggled after the branches got merged, and I'm planning to change it default off for better Git interop. Implementation-wise, the state enum can be a simple bool. It's enum just because I originally considered to pack "forgotten" concept into it. I have no idea which will be better for future extension.
In this commit, new behavior is tested by using in-memory view data. Data persistence and track/untrack commands will be implemented soon.
We could instead migrate the storage types to (local_branches, remote_views), but that would be more involved and break forward compatibility with little benefit. Maybe we can do that later when we introduce remote tags.
I'm not sure if this is the best way to render non-tracking branches, but it helps to write CLI tests. Maybe we can add some hint or decoration to non-tracking branches, but I'd like to avoid bikeshedding at this point. Since we haven't migrated the push function yet, a deleted branch can be pushed to non-tracking remotes. This will be addressed later. jj-vcs#1136
This patch adds MutableRepo::track_remote_branch() as we'll probably need to track the default branch on "jj git clone". untrack_remote_branch() is also added for consistency.
yuja
force-pushed
the
push-vlpopwlmvpym
branch
from
3b8c1b1 to
b888fb0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/martinvonz/jj/blob/main/docs/design/tracking-branches.md#fetchimport
Checklist
If applicable:
CHANGELOG.md