Patchable (#1003)

* Add authorship information to Druid 26.0.0 patches

* Add patchable checkout script

* Add patchable export script, convert Druid 26.0.0 patches to patchable

* Scrub commit IDs

* Remove patch count from header

* Add test patches

* Rebase in test patch

* Add docs

* fix: patchable worktree initialization (#977)

* Start rewriting patchable in Rust

* Logging

* Fix broken initial checkout

* Fetch commits individually from upstream instead of cloning

* Make commit IDs deterministic

* Reimplement git-am for better determinism

* Mailsplit each patch file separately

* Simplify worktree checkout logic a bit

* Forward logging from libgit2

* Normalize commits before exporting

* Factor out implementation details from main()

* Modularize

* Start handling errors

* Factor out patch mail parsing

* More error handling

* Snafuize the remaining errors

* Shrink the error types a bit

* Move patchable to rust/patchable for consistency

* Docs

* Remove obsolete patchable.nu

* Add patchable init

* Enforce that base must be a commit ID in patchable.toml

* Ensure that init always fetches base from upstream

* Print worktree directory on checkout

Also move logs to stderr to avoid confusion

* Document how to rebase patch series

* Remove dummy patches

* Documentation and cleanup

* Remove git version suffix from patches

* Skip comments in series file

* Document how to import invalid patch series into patchable

* More documentation

* Add openssl to shell.nix

* Reword docs following @soenkeliebau's comments

#1003 (comment)

* Then begone

* Changelog

* Fix gitignore EOLs

* Update README.md

Co-authored-by: Nick <[email protected]>

* Update README.md

Co-authored-by: Nick <[email protected]>

* Fix FMPP update patch metadata

---------

Co-authored-by: Lukas Krug <[email protected]>
Co-authored-by: Nick <[email protected]>

Author: 3 people

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+patchable = ["run", "--bin", "patchable", "--"]

.gitignore

@@ -1,5 +1,7 @@
-# Byte-compiled / optimized / DLL files
+# compiled / optimized files
 __pycache__/
 *.py[cod]
+target/
 
+# Patchable working files
 patchable-work/

CHANGELOG.md

@@ -27,12 +27,14 @@ All notable changes to this project will be documented in this file.
 - trino-cli: Add version 470 ([#999]).
 - trino-storage-connector: Add version 470 ([#999]).
 - superset: Add version `4.1.1` ([#991]).
+- Added Patchable patch management tool ([#1003]).
 
 ### Changed
 
 - kafka: Bump 3.8.0 to 3.8.1 ([#995]).
 - Update registry references to oci ([#989]).
 - trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
+- druid 26.0.0: Migrate to patchable ([#1003]).
 
 ### Removed
 
@@ -71,6 +73,7 @@ All notable changes to this project will be documented in this file.
 [#997]: https://github.com/stackabletech/docker-images/pull/997
 [#999]: https://github.com/stackabletech/docker-images/pull/999
 [#1000]: https://github.com/stackabletech/docker-images/pull/1000
+[#1003]: https://github.com/stackabletech/docker-images/pull/1003
 
 ## [24.11.1] - 2025-01-14