Commits
- Commit:
24b7de1c04072bf25db2df8acbf93a7ba7bbabfd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
avoid copying reused deltas to delta cache file; copy from pack file instead
ok op@
- Commit:
6242c45bf7571868b35d644cd0655d3b007d60c9
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got send: show server error
Print the error message reported by the remote server when failing to
update a branch (for e.g. because of a server-side check.) Reported by
gonzalo@, with help and ok stsp@.
- Commit:
ad4cc36168576274131539e87b9007ef9b3c3725
- From:
- Omar Polo <op@omarpolo.com>
- Date:
convert got_pack' filesize to off_t; ok stsp@
- Commit:
b9de8018be96c42d3421711a341c1fc8f6d7e0fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move declaration of got_privsep_child out of got_lib_privsep.h
This declaration is the only reason why got_lib_privsep.h must be
included in order to use got_lib_repository.h. Moving this declaration
will allow for cleaning up unnecessary includes of got_lib_privsep.h.
- Commit:
611e5fc2074d428e17f920dc595496af4dd0dc77
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
ensure got patch respects x-bit perms for new files
Reported by stsp on IRC: got patch failed to set the x-bit for a new file
despite got diff recording mode 755. Parse got and git diffs for this data
and set file modes accordingly. Tweaked with hint from op.
ok stsp@
- Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
d68f2c0e20f502d7bea2f0136527683f830b3d6c
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
add signer_id option to got.conf(5)
Setting this option will cause 'got tag' to sign all created tags using
the SSH key, unless overridden by the -s flag.
ok stsp@
- Commit:
4d5ee9564a9e46a1f634f619833c62f636cfbdc1
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
create and verify tags signed by SSH keys
This adds a new -s flag to 'got tag' that specifies the signer
identity (for example, a key file) of the tagger. The tag object will
include a signature that validates each of the tag object headers and
the tag message.
Verifying these signed tags requires maintaining an allowed signers
file which maps signer identities (i.e. the email address of the
tagger) to SSH public keys. See ssh-keygen(1) for more details of the
allowed signers file. After creating this file and providing the path
to it in got.conf(5) using the allowed_signers option, tags may be
verified using with 'got tag -V tag_name'. The return code will be
non-zero if a signature fails to verify.
ok stsp@
- Commit:
61af9b215c06bece11deb27d941b390b81e0f8c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement support for commit coloring in got-read-pack for speed
ok op, tracey
- Commit:
d8b5af438b16bcea5568b1d4bfc127567e35e2f6
- From:
- Omar Polo <op@omarpolo.com>
- Date:
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
- Commit:
55e9459f41acc72438ed2c9f75fdaeae8f5c41d8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use diff3 to merge the changes
Parse the "blob -" metadata in diffs produced by 'got diff' and use the
original file for patching. Then, use the diff3 with the current
version of the file to merge the differences.
This solves many failures automagically or at least turns them into a
conflict.
ok/improvements stsp@
- Commit:
db9b9b1c2b70d98419e70b05e7283b2284bedbec
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
let got-read-pack be explicit about whether it could enumerate all objects
This allows the main process to avoid looping over all object IDs again
in case the pack file used for enumeration is complete.
ok op@
- Commit:
35095610b1bb11a6c722f6d42f6609bd308531a8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: use ints for line offsets instead of longs
ints have the advantage that their size is more likely to be the same
across the various architecture supported by OpenBSD, thus introducing
less possible differences.
INT_MAX is still (at least) a few order of magnitudes higher than the
patches we dealt with (even abnormal ones.)
suggested by stsp@
- Commit:
0ab4c95723904e176687f5edc131bdf422dd261a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Bring back object enumeration inside got-read-pack as a fast path.
The problem that was found in the earlier version has been fixed.
ok op@
- Commit:
e44d939152693c16e95d2855b539ad6b30e81b15
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
revert object enumeration in got-read-pack for now; needs more work
This implementation marked commits and trees as enumerated before all trees
which they depend on were enumerated. This behaviour leads to incomplete
pack files when a tree is only partially packed and got-read-pack hits
a missing tree entry as a result. The algorithm must be reworked such
that packed leave nodes are marked enumerated first, then bubble-up.
Found by op@
- Commit:
cee6a7ea556f9f3ae0f50df959c2acd8cb59bf80
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement object enumeration support in got-read-pack
ok op@
- Commit:
33fd69c2e53ffe1f0a7e1184293f6918a377376d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
batch up tree entries in imsg instead of sending one imsg per tree entry
This speeds up loading of trees significantly.
ok op@
- Commit:
9985f404ff5dc911b6186e5fa6233fa36848a19a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
parse tree entries into an array instead of a pathlist
Avoids some extra malloc/free in a performance-critical path.
ok op@
- Commit:
fae7e03842e8618973f4d4910a86a52d881ab2ab
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
run the search for deltas to reuse in got-read-pack
This significantly speeds up the deltification step of packing by
avoiding imsg traffic. gotadmin no longer requests individual raw
deltas from got-read-pack to check whether it can reuse them.
Instead, got-read-pack obtains a list of objects we want to pack,
and hands back the list of all deltas in its pack file which can be
reused. Messages are now batched such that imsg buffers are filled
as much as possible.
Another advantage is that deltas we are not going to reuse will
no longer be written to the delta cache file, saving disk space.
Before this patch, any raw delta candidate was written to the
delta cache file by got-read-pack, and the decision whether to
reuse the delta happened afterwards in the gotadmin process.
Code for reading individual raw deltas is now unused and could be
removed at some point.
ok op@
- Commit:
2d9e6abf243a0a1895786fa9002b28d69a0f6fea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
store deltas in compressed form while packing, both in memory and cache file
This reduces memory and disk space consumption during packing.
with tweaks + memleak on error fix from op@
ok op@
- Commit:
9d6cabd51222f7506db617ee8a7b282823dde999
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: allow to strip path components
Move some bits from the libexec helper to the main process so we know if
the patch was generated by git or not and finally document the automatic
stripping of a/ and b/ prefixes added by git-diff(1).
ok stsp@
- Commit:
e9ce266e31923cc339954b331d273d9bba543f6f
- From:
- Omar Polo <op@omarpolo.com>
- Date:
add `got patch' command for applying unified diffs
- Commit:
67fd68496517d3103b130a1085efdd4591bd7416
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reuse existing deltas when creating pack files
tested by thomas, naddy, and myself
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
6480c871c8f9ffdce90c10e7a7313e1187de019a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
provide separate send {} and fetch {} configuration blocks in got.conf
Feature requested by naddy.
ok naddy, who also suggested some tweaks that will arrive shortly