Log

Author Commit Date CI Message
Stefan Sperling 08d50867 2022-03-22T13:51:13 bump version number
Stefan Sperling ce15c8e2 2022-03-22T13:43:21 CHANGES for 0.68
Stefan Sperling e260f8ae 2022-03-22T11:55:38 fgetc() returns int, not char; fixes -Werror build on armv7
Stefan Sperling f2e1007b 2022-03-22T11:32:07 sync dist file list
Stefan Sperling 1a4ff8fa 2022-03-22T11:28:47 fix free() on uninitialized variable upon error in gw_output_file_blame() ok op@
Stefan Sperling 1a7a534e 2022-03-22T11:22:12 tweak wording to make it clearer where the mentioned -u option applies
Omar Polo 4027dbc2 2022-03-22T11:20:46 reuse apply_hunk in patch_file when creating a file
Omar Polo b3c57ab2 2022-03-22T11:20:46 got patch: handle "\ No newline at end of file"
Stefan Sperling 3b01d641 2022-03-22T11:19:46 mention that 'got patch' is compatible with 'cvs diff -u' output
Stefan Sperling 3f3a6472 2022-03-22T11:17:41 mention that 'got patch' can read diffs produced by Git, to avoid any doubt
Stefan Sperling 6863cbf9 2022-03-21T19:59:03 fix pack progress object counter for loose objects Move pack progres object accounting to a single place. This makes it easier to account for the case were only loose objects are packed. A wrong amount of objects was reported before when packing loose ones.
Stefan Sperling c4e796b2 2022-03-21T16:08:41 in pack progress output, remove excluded objects from 'found' objects counter
Stefan Sperling cdeb891a 2022-03-21T15:52:15 fix a bug where 'gotadmin pack' packed too many objects unless -a was used
Christian Weisgerber e38d4cde 2022-03-21T13:14:13 subordinate clauses preceding the main clause are offset by a comma
Stefan Sperling 0ae61b79 2022-03-21T10:17:40 fix potential NULL deref in error path of got_object_idset_remove()
Omar Polo 7a30b5cb 2022-03-20T08:54:45 got patch: prefer new name if not /dev/null and not a git-style diff This fixes a common issue when for e.g. generating patches with $ diff -u foo.orig foo where 'got patch' failed because 'foo.orig' has an 'unexpected status'. prodded by naddy, ok stsp
Christian Weisgerber f134ecfd 2022-03-19T21:25:59 const-ify string table
Omar Polo 78f5ac24 2022-03-19T15:06:37 move got_patch file status checking in worktree.c check_file_status used got_worktree_status to check if the file was in an allowed state, but it's wrong since the callback is not invoked on unchanged files. While here also fix a relate bug: unlink(newpath) is in the wrong spot and ends up removing files even when it shouldn't, so move it early in the got_worktree_schedule_* error handling. Finally, update the appropriate test case. It was passing before because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not because check_file_status failed. ok stsp@
Christian Weisgerber bfc73a47 2022-03-19T14:53:07 explicitly include <unistd.h> for close(2)
Christian Weisgerber 70cc9832 2022-03-19T14:19:19 move got_errors[] table into a single compilation unit (error.c) ok stsp
Tracey Emery 39d5d1d2 2022-03-17T20:20:08 rm unused vars
Christian Weisgerber d58ddaf3 2022-03-17T20:02:40 const-ify tables ok thomas_adam millert
Omar Polo 46ebad13 2022-03-17T16:38:43 style
Omar Polo 60aa1fa0 2022-03-17T16:38:43 augment patch progress callback with hunks info; recover from errors Augment got_patch_progress_cb by providing the hunks that were applied with offset (or that failed) and the recoverable error encountered during the operation (bad status, missing file, ...) got_patch now proceeds when a file fails to be patched and exits with GOT_ERR_PATCH_FAILED if no other errors are encountered. While here, also add a test for the 'hunk applied with offset' case and shrink test_patch_dont_apply and illegal_status by taking advantage that 'got patch' doesn't stop at the first error. (And add some other cases to illegal_status too.) discussed with and ok stsp@
Omar Polo 95d68340 2022-03-16T18:23:03 got patch: create missing directories when adding files ok stsp@
Omar Polo 2be5e1a2 2022-03-16T18:23:03 got patch: keep permissions after patching a file ok stsp@
Omar Polo b22138f5 2022-03-16T15:41:10 introduce got_patch_progress_cb This introduce a proper got_patch specific progress callback that is invoked after processing a patch. It also drops the hackish printf in the modified case and takes `nop' out of the struct got_patch. ok stsp
Stefan Sperling b8af7c06 2022-03-15T10:45:02 print additional progress information while packing ok op@
Omar Polo c560c1f5 2022-03-14T13:50:31 don't `goto done' if calloc fails otherwise we call got_repo_close with repo being NULL and segfault there. ok stsp
Stefan Sperling 9b576444 2022-03-14T13:22:20 cache a list of known pack index files when the repository is opened Avoids overhead due to readdir calls while searching a pack index. ok op@
Omar Polo 899fcfdf 2022-03-13T20:31:44 add a dry-run/nop mode for got patch with lots of help from stsp for the manpage bits!
Stefan Sperling 986288a6 2022-03-13T19:51:12 fix weird paragraph breaks in 'got patch' man page section
Stefan Sperling 3e72b288 2022-03-13T19:46:23 more 'got patch' man page tweaks
Stefan Sperling 750a3093 2022-03-13T18:32:04 some man page tweaks for 'got patch' ok op@
Omar Polo 5b67f96e 2022-03-13T15:36:59 got patch: require exact match when removing files
Omar Polo dd6c3779 2022-03-13T15:36:56 improve `got patch' section of the manpage Simplify some phrasing, explain what preconditions `got patch' has and what happens to the work tree when an error occurs.
Omar Polo dbda770b 2022-03-13T15:36:56 check file status before applying the patch Don't allow `got patch' to delete files that are not known, or add files that are already known and to edit files that are known, not obstructed and without conflicts.
Stefan Sperling a84c0d30 2022-03-12T21:30:23 fix 'got status' with an obstructed file given as argument; found by Omar
Stefan Sperling f7fce2e2 2022-03-12T19:29:39 make got log, diff, blame, tree, and cat unlock the work tree earlier These commands perform potentially long-running operations on the repository after reading information from the work tree. There is no need for them to keep the work tree locked until the end. Doing so blocks other commands the user may want to run concurrently. For example, the user may want to be able to run 'got diff' in the work tree while browsing 'got log' output in less(1). Pointed out by Misha on gameoftrees IRC.
Omar Polo 6e96b326 2022-03-12T16:02:51 refactor apply_patch to support renaming files add two helper functions (schedule_add, schedule_del) and move the guts of apply_patch into a new function `patch_file'. This simplifies apply_patch and makes easier to figure out what happens. Then, drop GOT_ERR_PATCH_PATHS_DIFFER since we allow the to rename files.
Omar Polo 423faaa6 2022-03-12T16:01:09 got-read-patch: plug memory leak
Omar Polo b95c53df 2022-03-12T16:01:09 apply_patch: move sanity check early in recv_patch
Omar Polo ca6444c5 2022-03-11T17:25:33 got patch: re-add forgotten lseek otherwise got-read-patch can't parse any patch because the position indicator is at the end of file. While here fix the return too and set patchfd to -1 on error (stsp suggestion.) ok thomas, stsp
Omar Polo 33df9995 2022-03-11T17:25:33 save `pos' in locate_hunk instead of calling ftello again ok thomas, stsp
Christian Weisgerber 39479dae 2022-03-10T22:29:28 make "got cherrypick/backout" match argument against refs before object IDs Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp
Stefan Sperling 4be911ed 2022-03-10T22:17:13 fix got_repo_match_object_id() docstring, it is not specific to commits This was a leftover from got_repo_resolve_commit_arg() which was superseded in commit 71a276322e39e17baf5697b5daac8e8fe6ad2ae1
Christian Weisgerber d8247bfd 2022-03-10T21:23:31 make "got ref" match argument against references before object IDs Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp
Stefan Sperling 8e26059c 2022-03-10T21:09:39 document that 'gotadmin listpack' requires a pack index
Christian Weisgerber 81a19701 2022-03-10T20:28:20 ref.sh: fix pastos and report the actual command that was run
Stefan Sperling 0e6ab4b2 2022-03-10T09:23:19 make got_repo_match_object_id_prefix() reject overlong input strings suggested by + ok naddy
Stefan Sperling 0ed2285b 2022-03-09T08:55:42 handle reference arguments which look like short object IDs Match command line arguments against references before matching object IDs. This makes it possible to use reference names that happen to match a short object ID. For example, a branch called "11ac" could not be diffed in OpenBSD src.git which happens to contain commit IDs that begin with hex digits 0x11ac. A bogus error would be reported in this situation: $ got diff master 11ac got: ambiguous object ID ok naddy
Omar Polo d955343d 2022-03-08T16:01:03 pass the callback data instead of hardcoding NULL, ok stsp
Stefan Sperling 36751b1b 2022-03-08T15:11:37 remove needless header inclusion; lib/pack.c does not need got_opentemp.h
Omar Polo 6f5cb1bd 2022-03-08T12:22:36 fix path to the temp file used to accumulate the patch edits ok stsp
Omar Polo bfbccd0a 2022-03-08T12:22:36 use test(1) -eq and -ne to compare integers; ok tb
Omar Polo fd79e2e0 2022-03-08T12:22:36 typos
Omar Polo e9ce266e 2022-03-07T22:26:08 add `got patch' command for applying unified diffs
Christian Weisgerber 805253d5 2022-03-07T20:19:35 fix level of indirection ok stsp
Stefan Sperling 3a12860c 2022-03-07T19:25:46 make the URI parser tolerate trailing slashes at the end of the input URI ok naddy
Stefan Sperling bed00385 2022-02-23T12:29:32 apply time-based rate-limiting to got-send-pack upload progress output
Stefan Sperling dcb64fea 2022-02-23T12:24:25 apply time-based rate-limiting to got-fetch-pack download progress output
Stefan Sperling d0f1e2f1 2022-02-23T12:13:03 apply time-based rate-limiting to got-index-pack progress output
Christian Weisgerber e3f86256 2022-02-18T20:23:32 explicitly include <endian.h> for be32toh()
Stefan Sperling 931651ba 2022-02-18T19:57:12 bump version number
Stefan Sperling 4c91cf3d 2022-02-18T19:24:24 CHANGES for 0.67
Christian Weisgerber 3e166534 2022-02-16T18:32:17 const-ify command and option tables ok stsp
Josh Rickmar e546352c 2022-02-16T17:03:02 remove stray tab that snuck in
Josh Rickmar bdc78ba6 2022-02-16T16:32:54 display GMT offset in cat command ok stsp
Omar Polo 8934ea8b 2022-02-14T13:14:36 factorize imsg_clear calls after imsg_flush failures imsg_clear frees and closes resources allocated as part of enqueueing imsgs so it's a no-op after reads. discussed with and ok stsp@
Omar Polo 688fe08b 2022-02-14T13:14:36 fix fd leak in got_fetch_pack, ok stsp@
Stefan Sperling 28526235 2022-02-13T00:12:04 fix pack.sh test failure from reuse-deltas patch by tweaking progress output
Stefan Sperling 67fd6849 2022-02-13T00:10:25 reuse existing deltas when creating pack files tested by thomas, naddy, and myself
Christian Weisgerber b5934965 2022-02-12T21:48:46 shrink the width of formatted output fields to their expected size Replace FMT_SCALED_STRSIZE with (FMT_SCALED_STRSIZE - 2) as field width when formatting output for printing. FMT_SCALED_STRSIZE includes space for a nul byte and a minus sign. Output values are expected to be always positive here. ok stsp
Christian Weisgerber f6027426 2022-02-12T21:48:46 consistently match size of hash variables to that returned by murmurhash ok millert stsp
Omar Polo 32b5305f 2022-02-12T09:34:03 new test: `got diff' on files matched by an ignore pattern
Stefan Sperling 2b474c25 2022-02-11T22:45:00 use murmurhash instead of sha1 for deltification blocks; suggested by ori
Stefan Sperling 1ac8bad9 2022-02-11T22:44:35 reduce minimum deltification chunk size to 32; suggested by ori
Stefan Sperling 916237f3 2022-02-11T22:42:50 fix 'got diff' on files which match an ignore pattern; found by Omar Polo
Omar Polo 5a20d08d 2022-02-09T14:59:46 tweak error reporting due to invalid numbers Use the same idiom as in the strtonum(3) manpage which produces a more readable error message. OK kn, stsp
Stefan Sperling d75b4088 2022-02-08T10:52:17 set zlib output buffer length properly after resizing the output buffer ok millert naddy
Stefan Sperling a9bd296d 2022-02-08T10:48:04 fix infinite loop in got-index-pack for pack files >= 4GB in size Because of a missing range check our zlib wrapper would end up calling zlib over and over with zero bytes of input. Problem reported by semarie and naddy. Fixed with help from millert@. ok millert naddy
Omar Polo 1d918cf9 2022-02-06T14:56:36 improve error message due to malformed `author' in got.conf tweak and ok stsp@
Stefan Sperling 9b4603c0 2022-01-31T16:27:14 improve 'got add' error message if file does not exist; reported by Timo Myyrä ok tracey
Stefan Sperling c7b17232 2022-01-28T18:07:47 fix loose object file header parser for zero-length headers ok millert tracey
Stefan Sperling a47330a2 2022-01-27T22:32:09 fix 'got status' reporting all directories on NFS mounts as unversioned Problem found and fix tested by Ted Bullock. ok millert, naddy
Stefan Sperling 8264d9ee 2022-01-27T12:05:24 fix wrong imsg name in errors raised by got_privsep_send_tree_req()
Stefan Sperling 9296b03b 2022-01-26T10:33:52 remove unnecessary local variable from got_privsep_get_imsg_obj()
Stefan Sperling d1b988e3 2022-01-26T10:33:52 add missing initialization of delta list in got_privsep_get_imsg_obj()
Stefan Sperling 0ee7a4dc 2022-01-26T10:33:21 fix double-free and double-close issues in error paths of got_packidx_open()
Stefan Sperling 692bdcc4 2022-01-25T22:48:26 make 'got rm' report an "unexpected status" error for unversioned files ok millert@
Stefan Sperling 4e12cd97 2022-01-25T22:48:26 make 'got rm' behave like rm(1) for paths found missing on disk ok millert@
Tracey Emery 4362cf9c 2022-01-24T16:44:19 style
Tracey Emery b3f4d550 2022-01-24T16:36:16 unbreak gotweb index when pack files are missing
Stefan Sperling 969ea98d 2022-01-24T08:04:11 remove non-reachable 'return NULL' statement from report_single_file_status()
Stefan Sperling cc488aa7 2022-01-23T15:35:19 show rebase and histedit backups in tog ref view ok naddy
Stefan Sperling 72840534 2022-01-19T12:04:58 compress delta data from delta_cache directly into pack file
Stefan Sperling 30ee8dc8 2022-01-18T20:51:19 add missing error check in got_inflate_to_mem_mmap()
Stefan Sperling ef2f551e 2022-01-12T09:32:40 add -t option to 'got branch' synopsis in got.1 man page
Stefan Sperling 15a578da 2022-01-11T15:41:20 bump version number
Stefan Sperling 21ecd399 2022-01-11T15:37:58 CHANGES for 0.66