Commits
- Commit:
a05fb46091635af3b96b8f49a21517bbbb38fa84
- From:
- Omar Polo <op@omarpolo.com>
- Date:
don't pass relative paths to get_file_status
- Commit:
41a37a441444194d85c82d2046e402b55b159286
- From:
- Omar Polo <op@omarpolo.com>
- Date:
fix wrong path in error message
- Commit:
d7b5a0e827bb38e5c8502f0ba8d7838fedaba19b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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@
- Commit:
cbc287dcbb29ad321dca5cd14c31998279205243
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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@
- Commit:
3313bcd840cd85a1b349abf664992608a42bbbde
- From:
- Omar Polo <op@omarpolo.com>
- Date:
delete trailing whitespaces
- Commit:
728ed14252dde2c08f3ceee67554ee397ac7921d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
simplify apply_unveil in cmd_patch: the worktree is not optional
- Commit:
c036d108ac767e1676aa3482997c193e0056c7e0
- From:
- Omar Polo <op@omarpolo.com>
- Date:
redirect jot(1) output instead of looping over it; ok tb@
- Commit:
70f8f24dc5b689abd6265a71e787dfef79ba40cf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
a7472cb3288c2323830462f53706b013f33c444e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
check return value of RB_INSERT; ok + memleak fix by op@
- Commit:
bb6672b6aba1cb45a10d52bec828e68379e9ad61
- From:
- Theo Buehler <tb@openbsd.org>
- Date:
make sure callers of got_object_idset_add() free data.
- Commit:
3d1a1e4cbc91e39df83eb35eb3df3cc87719a0b5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a double-free in an error case of cmd_checkout()
- Commit:
7e4f461f98ca8599ac26846e9ca24d621574f33b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sort references by date for packing; newer commits should be processed first
- Commit:
20e420c8b1505de5032e4c2672147483bd15d616
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a -q (quiet) option to 'gotadmin pack'
- Commit:
fbafdecfb2616668a85d20ef641764749a229f7a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
14dbbf48885998b6db226d20b27b77b094ceea23
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
for clarity, move the coloring loop from findtwixt() into a separate function
- Commit:
1d765da334af12ddd26b666c0294e0d39f45cbdf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove a pointless object-id dup/free dance in findtwixt()
- Commit:
57bc7b6dd5c57ab4bde2a20937e5a5c8e7c3a624
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
don't forget to call the cancel callback while coloring commits in findtwixt()
- Commit:
03c03172348b5f515b9ce884313118428a8674b5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in findtwixt(), drop a commit right away if it matches an excluded commit
- Commit:
912a163eb6901d0a797d05fb21b34bc30031eb39
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
the obj_types array in pack_create.c is no longer useful, remove it
- Commit:
ffd9dda732b61657f28e1182458b60d3b27b65bf
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got tag' unlock the work tree earlier when creating tags
The work tree was only held open in order to find its got.conf file since
this file could contain a tagger name to use. Read the tagger name earlier.
Once the tagger name is known we can close the work tree already.
- Commit:
2a261ce7acac13008537e137fb0bdb08352c9321
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got tag -l' unlock the work tree earlier to allow other parallel commands
- Commit:
a091f71abcb1f9a1860ae417667215c2a6d00edc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got cat' not search for a work tree if the -r option is used
Fixes failures in our test suite if 'got tag -l | less' is used in
the work tree while cmdline tests are running.
- Commit:
29e0594f3da103f1ece51fe40ba09faa1c691972
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make gotadmin pack -x option work with tag arguments
- Commit:
67ba61612157092fbe0f8c4a02b60faf31967061
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
leave work tree in a usable state after 'got rebase' fails path-prefix checks
reported by naddy
- Commit:
9d34261edbfb3574a41b29233fdc722b526ea226
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
in load_object_ids(), process "their" commits and tags in the same loop
No functional change, the end result is the same.