Commit Briefs

2cdcfdc6df Thomas Adam

add -q to "gotadmin pack" usage


eaef698f32 Thomas Adam

got patch: allow to reverse a patch

add a flag to got_patch to reverse a patch before applying and the -R flag for `got patch'. ok stsp@


656c2baa86 Thomas Adam

got-read-patch: preserve all \ lines

as a cheap optimization got-read-patch was sending only the "\ No newline at end of file" lines that follows an addition (a "+" line). To be able to reverse patches in the future got_patch needs to know about all of these lines instead. No functional changes intended. ok stsp@


cfbf55314d Thomas Adam

test `got patch' vs path-prefixes, relative paths and strip

reminded by and 'looks fine' to stsp@


9a49df7402 Thomas Adam

typos


fa0353ccb2 Thomas Adam

mention -p in usage_patch


72f468914d Thomas Adam

got patch: resolve paths from the current working directory

this allow to apply patches from subdirectories of the work tree root. Prodded by naddy@, ok stsp@.


b0e25f642d Thomas Adam

portable: freebsd: portably include sha1

The SHA implementation is found portably across systems, so don't include sha1.h directly.


1a1b9d49d2 Thomas Adam

portable: CI (linux): add libbsd-dev

This needs to be explicitly installed.


ef7d4e11a4 Thomas Adam

portable: portably #include siphash.h

Now that siphash is being looked for in a portable way, don't assume <siphash.h> as this is most likely not going to be the case on non-BSD systems.


ddd12270ff Thomas Adam

portable: add siphash implementation

Siphash is being used in place of murmurhash for object-id set as this is faster. However, this isn't really seen much in the non-BSD userspace, so provide an implementation for it portably, if one isn't found.


ec242592d3 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@


619de35f39 Thomas Adam

reimplement object-ID set data structure on top of a hash table

Siphash suggested by jrick as a better alternative to murmurhash for this use case. with small fixes from and ok op@


e1c219c8e6 Thomas Adam

delete trailing whitespaces



b4d06cd8d2 Thomas Adam

portable: alpine: install bsd-compat-headers

Apline doesn't like the use of cdefs.h


c38351549d Thomas Adam

CI: add alpine linux

Add Alpine Linux to the list of CI checks. Alpine builds against muscl rather than glibc by default, and there's been a few compilation differenes to warrant having this distribution as a separate CI check.



5fe7b5c123 Thomas Adam

speed up initial stage of packing by adding a "skip" commit color

The skip color marks boundary commits and their ancestors. Boundary commits are reachable both via references which we want to exclude from the pack, and via references which we want to include in the pack. We continue processing commit history up to the point we are left with only skip commits on the queue. This can speed up findtwixt() significantly and avoids wrong results produced by the old algorithm which made no distinction between "drop" and "skip". This idea was first implemented by Michael Forney for git9: https://git.9front.org/plan9front/plan9front/2e47badb88312c5c045a8042dc2ef80148e5ab47/commit.html Michael's log message for git9 is reproduced below: git/query: refactor graph painting algorithm (findtwixt, lca) We now keep track of 3 sets during traversal: - keep: commits we've reached from head commits - drop: commits we've reached from tail commits - skip: ancestors of commits in both 'keep' and 'drop' Commits in 'keep' and/or 'drop' may be added later to the 'skip' set if we discover later that they are part of a common subgraph of the head and tail commits. From these sets we can calculate the commits we are interested in: lca commits are those in 'keep' and 'drop', but not in 'skip'. findtwixt commits are those in 'keep', but not in 'drop' or 'skip'. The "LCA" commit returned is a common ancestor such that there are no other common ancestors that can reach that commit. Although there can be multiple commits that meet this criteria, where one is technically lower on the commit-graph than the other, these cases only happen in complex merge arrangements and any choice is likely a decent merge base. Repainting is now done in paint() directly. When we find a boundary commit, we switch our paint color to 'skip'. 'skip' painting does not stop when it hits another color; we continue until we are left with only 'skip' commits on the queue. This fixes several mishandled cases in the current algorithm: 1. If we hit the common subgraph from tail commits first (if the tail commit was newer than the head commit), we ended up traversing the entire commit graph. This is because we couldn't distinguish between 'drop' commits that were part of the common subgraph, and those that were still looking for it. 2. If we traversed through an initial part of the common subgraph from head commits before reaching it from tail commits, these commits were returned from findtwixt even though they were also reachable from tail commits. 3. In the same case as 2, we might end up choosing an incorrect commit as the LCA, which is an ancestor of the real LCA.




678cfb9b87 Thomas Adam

fix a double-free in an error case of cmd_checkout()



c8fc6d14c6 Thomas Adam

add a -q (quiet) option to 'gotadmin pack'


fc457d247e Thomas Adam

revert 03c03172 "drop a commit right away if it matches an excluded commit"

This change resulted in a full history walk even when no objects will be added to the pack file. Fix this regression by reverting the change.