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

upload: Allow arbitrary topic order #155

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Conversation

jerry-skydio
Copy link
Collaborator

@jerry-skydio jerry-skydio commented Mar 12, 2024

Now that we're iterating over topics topologically
in the important places, we can remove the check
that requires topics to be in consecutive order.

This means revup is able to pull together relative
chains in any arbitrary order, as long as that order
is valid with no cycles.

Fixes: #156

@jerry-skydio
Copy link
Collaborator Author

jerry-skydio commented Mar 12, 2024

Reviews in this chain:
#155 upload: Allow arbitrary topic order
 ├#153 upload: Support Update-Pr-Body as a commit tag
 │└#167 upload: Add "branch-format" config option and commit tag
 └#165 restack: Be topological and update docs

@jerry-skydio
Copy link
Collaborator Author

jerry-skydio commented Mar 12, 2024

# head base diff date summary
0 f2506f16 df295937 diff Mar 12 13:31 PM 1 file changed, 14 insertions(+), 19 deletions(-)
1 2c810f31 91d3c784 diff Mar 12 14:46 PM 1 file changed, 38 insertions(+), 10 deletions(-)
2 b8f56cad e4431364 diff Mar 12 14:48 PM 1 file changed, 6 insertions(+), 8 deletions(-)
3 06778e61 e4431364 diff Mar 12 14:49 PM 0 files changed
4 57328501 0a455aa1 rebase Mar 12 15:04 PM 0 files changed
5 cdfceb11 b056a294 rebase Mar 12 15:07 PM 0 files changed
6 fd95dd87 b056a294 diff Mar 12 15:08 PM 1 file changed, 1 insertion(+), 3 deletions(-)
7 bc4eeaaf 09150f0d rebase Mar 12 15:16 PM 0 files changed
8 58d26e76 04de160d diff Mar 12 15:20 PM 0 files changed
9 a2975ed8 95840c7a rebase Mar 12 15:25 PM 0 files changed
10 ed750a85 30b14996 rebase Mar 12 15:27 PM 0 files changed
11 b48ebf47 250ab201 rebase Mar 13 10:58 AM 0 files changed
12 2d8cc8e9 d3a97751 rebase Mar 13 11:59 AM 0 files changed
13 65cc1b54 6c701b7b rebase Mar 13 12:03 PM 0 files changed
14 f3f012a2 5d08aabe rebase Mar 13 13:40 PM 0 files changed
15 1d3dfa14 eea47247 rebase Mar 13 13:46 PM 0 files changed
16 79d040b3 01112953 rebase Mar 13 13:50 PM 0 files changed
17 9a5a6e35 bb5f5040 diff Mar 13 14:02 PM 0 files changed

@jerry-skydio jerry-skydio changed the base branch from main to jerry/revup/main/toptop March 12, 2024 21:47
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from f2506f1 to 2c810f3 Compare March 12, 2024 21:48
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from 91d3c78 to e443136 Compare March 12, 2024 21:49
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch 3 times, most recently from 06778e6 to 5732850 Compare March 12, 2024 22:05
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from 0a455aa to b056a29 Compare March 12, 2024 22:08
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch 3 times, most recently from fd95dd8 to bc4eeaa Compare March 12, 2024 22:17
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch 2 times, most recently from 09150f0 to 04de160 Compare March 12, 2024 22:21
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from bc4eeaa to 58d26e7 Compare March 12, 2024 22:21
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from 58d26e7 to a2975ed Compare March 12, 2024 22:26
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch 2 times, most recently from 95840c7 to 30b1499 Compare March 12, 2024 22:28
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from a2975ed to ed750a8 Compare March 12, 2024 22:28
Copy link
Contributor

@aaron-skydio aaron-skydio left a comment

Choose a reason for hiding this comment

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

Awesome 🎉

@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from ed750a8 to b48ebf4 Compare March 13, 2024 17:59
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from 30b1499 to 250ab20 Compare March 13, 2024 17:59
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from b48ebf4 to 2d8cc8e Compare March 13, 2024 19:00
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from 250ab20 to d3a9775 Compare March 13, 2024 19:00
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from d3a9775 to 6c701b7 Compare March 13, 2024 19:04
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from 2d8cc8e to 65cc1b5 Compare March 13, 2024 19:04
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from 65cc1b5 to f3f012a Compare March 13, 2024 20:41
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch 2 times, most recently from 5d08aab to eea4724 Compare March 13, 2024 20:47
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch 2 times, most recently from 1d3dfa1 to 79d040b Compare March 13, 2024 20:51
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/toptop branch from eea4724 to 0111295 Compare March 13, 2024 20:51
Now that we're iterating over topics topologically
in the important places, we can remove the check
that requires topics to be in consecutive order.

This means revup is able to pull together relative
chains in any arbitrary order, as long as that order
is valid with no cycles.

Fixes: #156
Base automatically changed from jerry/revup/main/toptop to main March 13, 2024 21:03
@jerry-skydio jerry-skydio force-pushed the jerry/revup/main/anyorder branch from 79d040b to 9a5a6e3 Compare March 13, 2024 21:03
@jerry-skydio jerry-skydio merged commit 4c4b457 into main Mar 13, 2024
4 checks passed
@jerry-skydio jerry-skydio deleted the jerry/revup/main/anyorder branch March 13, 2024 21:04
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.

[upload] Support arbitrary topic order
2 participants