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.

Sign up for GitHub

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

Jump to bottom

feat/custom-post-rewrite-game-changer #10

Draft
wants to merge 34 commits into
base: feat/continue
Choose a base branch
from
Draft

feat/custom-post-rewrite-game-changer #10

wants to merge 34 commits into from

Conversation

kiprasmel
Copy link
Owner

No description provided.

@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 260eb1b to 698f687 Compare April 11, 2022 02:51
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 698f687 to 6d6e29e Compare May 8, 2022 05:01
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 6d6e29e to f88d9f2 Compare May 8, 2022 07:49
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from f88d9f2 to 2402919 Compare May 8, 2022 08:44
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 2402919 to 2516aac Compare May 8, 2022 09:01
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 2516aac to 3a6a223 Compare May 8, 2022 09:04
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 3a6a223 to a0e6fa2 Compare May 8, 2022 09:10
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from a0e6fa2 to 3769010 Compare May 8, 2022 09:24
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 3769010 to d66583e Compare May 28, 2022 20:58
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from d66583e to 23a135e Compare May 28, 2022 23:56
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from 23a135e to e6b366a Compare June 7, 2022 02:50
kiprasmel added 8 commits June 7, 2022 05:51
@kiprasmel
editor script HELLA GOOD???
5b8c66b 
- https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
- https://git-scm.com/docs/githooks#_post_rewrite

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
initial experimentation with editorScript and reducePath
5647335 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
more experimentation
bc211d5 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
more experimentation. fix reducePath - if key === value, don't reduce…
d19d21a 
… itself

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
find the (bug?) in git's post-rewrite hook, attempt initial fix by me…
f844c4a 
…rging `amend`s & `rebase`s, figure out why fix is not sufficient for us yet

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
add the current commit's SHA to the rewritten list
34e3d42 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
move deletion into a separate phase so that multiple keys w/ same val…
7494261 
…ue all get reduced

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
undo the "current commit printing into rewrittenList"
49fa3fd 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
kiprasmel added 26 commits June 7, 2022 05:51
@kiprasmel
add back the "$1" in rewrittenList (type of command - amend or rebase)
3a76a02 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
merge amends into the 1st rebase that comes after them
f4a75b8 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
create the full/combined rewritten-list
dbfd890 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
turn reduce-path's logic into "combineRewrittenLists" function
9af948f 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
rename reduce-path.js to .ts
b950722 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
typescript-ify reduce-path
31dc640 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
use reduce-path (combineRewrittenLists) to make git-stacked-rebase wo…
8848704 
…rk again! 🚀

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
move rewrittenList file into the "done" state after an "apply" to avo…
6b9409d 
…id instructions duplicating

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix "doesNeedToApply" - if there's no rewritten-list, then there's no…
3959f4a 
…thing to apply (?)

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix the "no-longer-there" rewritten-list by reading the .applied file…
bfe9938 
… in "parseNewGoodCommands"

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
rename the "applied" filename to "rewritten-list.applied" because mak…
3ec733c 
…es more sense

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
refactor: extract rewritten-list reading logic into apply.ts
10c9be6 
...because completely related to the logic of "doesNeedToApply",
"markThatNeedsToApply", "markThatApplied", etc.

thought about extracting the above utils into a separate, "rewrittenList.ts" file,
but it doesn't make sense to separate the utils out from "apply" itself,

because if we have the "rewrittenList.ts" file, then it'd sound
reasonable to move the "reduce-path"'s "combineRewrittenLists" there as well,
but it doesnt, because the apply logic is not related to the
parsing/combinning logic.

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
refactor: move applyIfNeedsToApply up into a more related context
fabc87e 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: only move rewrittenList to applied if it exists
6fc4fdd 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
remove .git/stacked-rebase dir from existance after apply'ing (need t…
904b8ab 
…o make work for push & others)

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
mkdir -p "$STACKED_REBASE_DIR" in post-rewrite script
e35f1d5 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
explain where i'm going with this
41e6971 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
strongly refactor branchSequencer to work with simple boundaries (bra…
e68cf6f 
…nch & commit)

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
feat: implement custom getBoundariesInclInitial for forcePush, us…
205b841 
…ing only existing commits 🔥🔥🔥

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: create the .git/stacked-rebase/ dir only right before starting o…
2b712d8 
…ur rebase

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
misc: fix the main entrypoint in package.json
15ba720 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
extend merging logic in combineRewrittenLists after doing a big rebase
09a278d 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
reducePath extras
3275f25 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
remove docs for --continue since not really needed anymore
b511d2f 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: handle leftover prev amends if no further rebase happened
8e1439c 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: use the *last* rebase list, instead of the first
7ae0629 
a) if the was only 1 rebase, nothing changes
b) in other cases i've encountered,
   using the last rebase always proved better
   than the 1st one:
     1st one would error oftenly; succeeded rarily
     last one would work just fine

but, there's still a lot of testing to do.
especially for >2 rebases, since i've only encountered 2.

it's a bit dangerous because if we pick the wrong rebase,
then we could lose commits / their content.

now, picking just 1 rebase is still incomplete --
this fix is just a (seemingly) better heuristic,

(!) but eventually we'll need to
take into account all of the rebases.

there might be ways to eliminate this need,
e.g. auto-calling `git-stacked-rebase --apply`
in the `post-rewrite` script in the background,
but at least for now, don't want to mess with it
and would prefer to avoid, until i have done
more dog-fooding & encounter more edge-cases
& maybe potential solutions/invariants as well.

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel kiprasmel force-pushed the feat/custom-post-rewrite-game-changer branch from e6b366a to 7ae0629 Compare June 7, 2022 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@kiprasmel