Rewrite ghstack head/base commit construction algorithm #200
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
Signed-off-by: Edward Z. Yang <ezyang@meta.com> [ghstack-poisoned]
This was referenced Dec 5, 2023
Merged
ezyang
added a commit
that referenced
this pull request
Dec 5, 2023
Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: c4aa536580ec65d2c5180647492d45a52c0eeb57 Pull Request resolved: #200
Signed-off-by: Edward Z. Yang <ezyang@meta.com> [ghstack-poisoned]
ezyang
added a commit
that referenced
this pull request
Dec 5, 2023
Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 83f3f7e0641b45638d5aa74dcf7ffafb257a7172 Pull Request resolved: #200
Signed-off-by: Edward Z. Yang <ezyang@meta.com> [ghstack-poisoned]
ezyang
added a commit
that referenced
this pull request
Dec 5, 2023
Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: 82f19adf911174e95fe358163d2e4be9e964599e Pull Request resolved: #200
ezyang
commented
Dec 5, 2023
| if commit_count == 0: | ||
| raise RuntimeError( | ||
| "There appears to be no commits to process, based on the revs you passed me. " | ||
| f"I determined this by running `git rev-list {' '.join(revs)} ^{base_ref}`." |
ezyang
commented
Dec 5, 2023
| ghstack.logs.record_status('{} "{}"'.format(stack[0].oid[:9], stack[0].title)) | ||
| # TODO: figure this out. BC when revs is standard; maybe multiple calls | ||
| # for non standard rev patterns | ||
| # run_pre_ghstack_hook(sh, base, top.oid) |
ezyang
commented
Dec 5, 2023
| if new_head := rebase_index.get(GitCommitHash(sh.git("rev-parse", "HEAD"))): | ||
| sh.git("reset", "--soft", new_head) | ||
| # TODO: print out commit hashes for things we rebased but not accessible | ||
| # from HEAD |
ezyang
added a commit
that referenced
this pull request
Dec 6, 2023
Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: b8adce7587d5c0fb55a08b33dbfda7a2cf67855b Pull Request resolved: #200
This was referenced Dec 7, 2023
ezyang
added a commit
that referenced
this pull request
Dec 8, 2023
Signed-off-by: Edward Z. Yang <ezyang@meta.com> ghstack-source-id: b8adce7587d5c0fb55a08b33dbfda7a2cf67855b Pull Request resolved: #200
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.
Stack from ghstack (oldest at bottom):
Fixes #123
Fixes #101
Signed-off-by: Edward Z. Yang ezyang@meta.com