Commit Briefs


Thomas Adam

don't pass $ret to test_done on failure when it's known to be zero

Otherwise the test directory it's not left in place; ok tracey@


Thomas Adam

properly swap cached struct pack array elements in got_repo_cache_pack()

Avoids clobbering open files for delta base/accumulation, leaking file descriptors, and triggering errors from close(2) during got_repo_close() as we try to close the same file descriptor more than once.


Thomas Adam

move creation of tempfiles outside of lib/diff.c

ok tracey


Thomas Adam

map delta cache file into memory if possible while writing a pack file

with a fix from + ok op@


Thomas Adam

portable: fix-up sha1.h include

-portable doesn't need this directly.



Thomas Adam

reduce GOT_PACK_CACHE_SIZE to 32, otherwise it uses too many open files

found by tracey


Thomas Adam

ensure that all open basefd/accumfd get closed in got_repo_close()

found by tracey


Thomas Adam

open temporary files needed for delta application in got_repo_open()

This prepares for callers of got_repo_open() that cannot afford to open files in /tmp, such as gotwebd. In a follow-up change, we could ask such callers to pass in the required amount of open temporary files. One consequence is that got_repo_open() now requires the "cpath" pledge promise. Add the "cpath" promise to affected callers and remove it once the repository has been opened. ok tracey




Thomas Adam

fix a bug in findwixt() which caused pack files with missing parent commits

The 'nskip' variable is supposed to reflect commits which are waiting on the queue and have the 'skip' color. Only increment 'nskip' when adding such commits to the queue. Problem observed with got send -T and a tag pointing to a deleted branch. Test to reproduce the bug written by op@.


Thomas Adam

use random seeds for murmurhash2

change the three hardcoded seeds to fresh ones generated on demand via arc4random. Suggested/fixed by and ok stsp@


Thomas Adam

include header


Thomas Adam

shrink struct got_pack_meta a bit by removing the have_reused_delta flag

This flag can be expressed as m->reused_delta_offset != 0 because all deltas in valid pack files will be written at a non-zero offset. We allocate a huge number of these structs during packing, so every little bit helps.


Thomas Adam

reduce the amount of memory used for caching deltas during deltification

With files sorted properly for deltification we produce better deltas but end up consuming more memory and risk running into OpenBSD ulimits during packing. To compensate, reduce the threshold for the amount of delta data we store in memory, spooling more deltas into the cache file. ok op@


Thomas Adam

store a path hash instead of a verbatim path in pack meta data

This reduces memory use by gotadmin pack. The goal is to sort files which share a path next to each other for deltification. A hash of the path is good enough for this purpose and consumes less memory than a verbatim copy of the path. Git does something similar. ok op@


Thomas Adam

fix paths stored in pack meta data, improving file deltification

The old code was broken and stored an empty path or filenames, instead of a repository-relative path. Which means we didn't sort files for deltification as was intended. Fixing this provides much better deltas in large pack files written by gotadmin pack -a. In my test case, pack size changed from 2GB to 1.5GB. ok op@


Thomas Adam

refactor got_patch / got_worktree_patch_complete

let got_patch own fileindex_path and call got_worktree_patch_complete only if got_wokrtree_patch_prepare hasn't failed. suggested by stsp@


Thomas Adam

got patch: avoid open/sync/close the fileindex over and over again

Instead of flushing the fileindex after every patch in the patchfile just reuse the same fileindex and sync it only at the end of the patch operation. This speeds up 'got patch' on large repositories by quite a lot.


Thomas Adam

inline struct got_object_id in struct got_object_qid

Saves us from doing a malloc/free call for every item on the list. ok op@



Thomas Adam

avoid malloc/free for duplicate check in got_pathlists_insert()

ok op@


Thomas Adam

revert "Skip poll(2) if an imsgbuf has a non-empty read buffer"

imsg_read() will call recvmsg() on the file descriptor regardless of the read buffer's state, so we should ensure that data is ready. The read buffer is used by imsg_get(), not imsg_read(). We already call imsg_get() before imsg_read(), and call the latter only if imsg_get() returns zero.