commit 0585ddfda1b9020371ee6b5bb3ac62739806d031 from: Omar Polo via: Thomas Adam date: Tue Sep 10 14:11:00 2024 UTC fix some typos with codespell(1); ok/tweaks tb@ and stsp@ commit - 4763b4d4b196601437e37e5ccc71c0190334e55d commit + 0585ddfda1b9020371ee6b5bb3ac62739806d031 blob - 449e7f731351a6e2fc269a37374878eb3f8af5d4 blob + d68c7b013cac6e2a4d5031b65725e3e58fa7c507 --- CHANGES +++ CHANGES @@ -543,7 +543,7 @@ - tog: add 'L' key to blame view; opens log view for the annotated line (jamsek) - don't chug along if repo format version is unsupported (florian) - fix dead stores to variables, found with LLVM's scan-build (florian) -- fix unitialized error return (florian) +- fix uninitialized error return (florian) - make sure got_repo_pack_fds_close() frees a malloc'ed pointer (florian) - prevent memory leak when asprintf fails (florian) - prevent use-after-free of packed_refs_path in error path (florian) @@ -655,7 +655,7 @@ - fix bug in findwixt() which caused pack files with missing parent commits - avoid looping over deltas twice in dump_delta_chain_to_{file,mem}() - open tempfiles needed for delta application upfront, for future gotwebd -- reduce GOT_PACK_CACHE_SIZE to 32 to accomodate for previous tempfile change +- reduce GOT_PACK_CACHE_SIZE to 32 to accommodate for previous tempfile change - tog: override SIGTERM and SIGINT handlers to avoid ncurses cleanup() handler - move creation of tempfiles outside of lib/diff.c - tests: don't pass $ret to test_done on failure when it's known to be zero (op) @@ -902,7 +902,7 @@ * got 0.55; 2021-07-26 - display recovery steps in the lonely pack index error message -- fix double-free that ocurred upon exit from 'tog tree'; found by naddy +- fix double-free that occurred upon exit from 'tog tree'; found by naddy - don't scan pack index offsets for large values if pack file is < 2GB - new -X option for removing backups created by got rebase and got histedit - add 'got fetch -X' option for deleting references created by 'got fetch' @@ -949,7 +949,7 @@ - fix error checking in dial_ssh() - increase pack index cache size from 16 to 64 to improve performance - fix off-by-one in got_repo_cache_pack() causing the wrong pack to be evicted -- cap pack file cache size at 1/8 of the current open file desciptor limit +- cap pack file cache size at 1/8 of the current open file descriptor limit - when reading a pack index byte-swap fields at compile-time where possible - diff: reduce duplicate code (kn) - fix "mandoc -T lint" WARNINGS and ERRORS, add missing word (kn) blob - 7d5a96f1e25c03524fa8a665ef333fcf3a43fa8f blob + eac737a98b375d017185d50d231d069f03b358a2 --- TODO +++ TODO @@ -1,7 +1,7 @@ got: - Teach 'got merge' to merge changes into an arbitrary subdirectory of the work tree. This would be nice for merging vendor branches. - Say you have a branch 'llvm-12' which intially contains a 12.0 + Say you have a branch 'llvm-12' which initially contains a 12.0 release tree as published by the LLVM project, added to the repository with a command such as 'got import -b llvm-12'. On the main branch we would want to merge files from the llvm-12 branch into /usr/src/gnu/llvm blob - 37f4fd2b2aee68b24c607b90680c2cd1fd58ba6e blob + 129aa088ad0967feb9a472ddbce9d7fffcb1eda7 --- cvg/cvg.c +++ cvg/cvg.c @@ -8253,7 +8253,7 @@ logmsg_ref(struct got_object_id *id, const char *prefi int rebase_in_progress, merge_in_progress; /* - * Silenty refuse to create merge reference if any histedit, merge, + * Silently refuse to create merge reference if any histedit, merge, * or rebase operation is in progress. */ err = got_worktree_histedit_in_progress(&histedit_in_progress, blob - bc519a2de8b98e7d5837b3ad4f2223319188ae87 blob + 3aca3e0b5f7a8d30881ea65469302f533306ea60 --- got/got.c +++ got/got.c @@ -10423,7 +10423,7 @@ logmsg_ref(struct got_object_id *id, const char *prefi int rebase_in_progress, merge_in_progress; /* - * Silenty refuse to create merge reference if any histedit, merge, + * Silently refuse to create merge reference if any histedit, merge, * or rebase operation is in progress. */ err = got_worktree_histedit_in_progress(&histedit_in_progress, blob - 5d5572b92f4df628e76278a4cb7aa64b56f631c7 blob + c0e169b02c8fe6943adf8240cec97c1a03a69576 --- gotd/gotd.h +++ gotd/gotd.h @@ -178,7 +178,7 @@ struct gotd { }; enum gotd_imsg_type { - /* An error occured while processing a request. */ + /* An error occurred while processing a request. */ GOTD_IMSG_ERROR, /* Commands used by gotctl(8). */ @@ -225,7 +225,7 @@ enum gotd_imsg_type { GOTD_IMSG_REF_UPDATES_START, /* Ref updates starting. */ GOTD_IMSG_REF_UPDATE_OK, /* Update went OK. */ GOTD_IMSG_REF_UPDATE_NG, /* Update was not good. */ - GOTD_IMSG_REFS_UPDATED, /* The server proccessed all ref updates. */ + GOTD_IMSG_REFS_UPDATED, /* The server processed all ref updates. */ /* Client connections. */ GOTD_IMSG_DISCONNECT, blob - e96c864b1063d14085e71cf29b14566c0f446574 blob + ca2fac365b6767656572e723c415c12ecbde3976 --- gotd/libexec/got-notify-http/got-notify-http.c +++ gotd/libexec/got-notify-http/got-notify-http.c @@ -356,7 +356,7 @@ jsonify_commit(FILE *fp, const char *repo, const char break; } phase = P_PARENT; - /* fallthough */ + /* fallthrough */ case P_PARENT: /* optional - more than one */ @@ -625,7 +625,7 @@ jsonify_tag(FILE *fp, const char *repo, const char *us break; } phase = P_OBJECT; - /* fallthough */ + /* fallthrough */ case P_OBJECT: /* optional */ blob - c285befbcf4f7f53adfe4fe70ef636a4dd1b7671 blob + 419f61bc2cb721f471255c3298511ff707055250 --- include/got_dial.h +++ include/got_dial.h @@ -18,7 +18,7 @@ * Apply any unveil(2) operations required to support the given protocol, * as obtained from the 'proto' output parameter of got_dial_parse_uri(). * This function must be called during initialization of the main program - * if got_fetch.h or got_send.h funcionality will be used. + * if got_fetch.h or got_send.h functionality will be used. */ const struct got_error *got_dial_apply_unveil(const char *proto); blob - 49498058010672bb63ea9d190a831fc8226fe241 blob + 3cdd01eba87b65a91beea485fcc804669fa807f3 --- include/got_diff.h +++ include/got_diff.h @@ -120,7 +120,7 @@ struct got_diff_blob_output_unidiff_arg { * offsets and types, with nlines > 0 indicating the length of the * pre-populated array. This is useful if the output file already * contains some lines of text. The array will be grown as needed to - * accomodate additional offsets and types, and the last offset found + * accommodate additional offsets and types, and the last offset found * in a pre-populated array will be added to all subsequent offsets. */ size_t nlines; blob - b3626e6cc55a8ad4c5d1b2e62293dafc283a1c05 blob + 0e987a302c6c21819424c0bbf8c957b06744abd8 --- include/got_reference.h +++ include/got_reference.h @@ -59,7 +59,7 @@ void got_ref_close(struct got_reference *); /* Get the name of the reference. */ const char *got_ref_get_name(struct got_reference *); -/* Get the name of the reference which a symoblic reference points at. */ +/* Get the name of the reference which a symbolic reference points at. */ const char *got_ref_get_symref_target(struct got_reference *); /* Get the last modification timestamp of the reference. */ @@ -130,7 +130,7 @@ void got_ref_list_free(struct got_reflist_head *); /* * Insert a reference into a reference list. * Return a pointer to the newly allocated list entry in *newp. - * If *newp is NULL and no error occured then the specified reference was + * If *newp is NULL and no error occurred then the specified reference was * already an element of the list. If *newp is not NULL then the reference * was shallow-copied onto the list and should no longer be closed with * got_ref_close(). Instead it will be closed along with other list @@ -147,7 +147,7 @@ got_reflist_sort(struct got_reflist_head *refs, got_re void *cmp_arg); /* Indicate whether the provided reference is symbolic (points at another - * refernce) or not (points at an object ID). */ + * reference) or not (points at an object ID). */ int got_ref_is_symbolic(struct got_reference *); /* Change the object ID a reference points to. */ blob - 91bfba2775bd8f47a9c55f66b6815495fbc53d7b blob + c3fa46bbe00087fcbd8a9b114bedd1cabed012d6 --- include/got_worktree.h +++ include/got_worktree.h @@ -49,7 +49,7 @@ struct got_fileindex; * will be created. The path itself must not yet exist, but the dirname(3) * of the path must already exist. * The reference provided will be used to determine the new worktree's - * base commit. The third argument speficies the work tree's path prefix. + * base commit. The third argument specifies the work tree's path prefix. * The fourth argument specifies the meta data directory to use, which * should be either GOT_WORKTREE_GOT_DIR or GOT_WORKTREE_CVG_DIR. */ @@ -289,10 +289,10 @@ const struct got_error *got_worktree_commit(struct got const char *, int, int, int, got_worktree_commit_msg_cb, void *, got_worktree_status_cb, void *, struct got_repository *); -/* Get the path of a commitable worktree item. */ +/* Get the path of a committable worktree item. */ const char *got_commitable_get_path(struct got_commitable *); -/* Get the status of a commitable worktree item. */ +/* Get the status of a committable worktree item. */ unsigned int got_commitable_get_status(struct got_commitable *); /* @@ -585,7 +585,7 @@ const struct got_error *got_worktree_unstage(struct go /* * Prepare for getting meta data for paths in the work tree. This - * function also returns a poniter to a fileindex wihch must be passed + * function also returns a pointer to a fileindex which must be passed * back to other path_info-related functions and *_version() functions. */ const struct got_error * blob - ddb4cb1f773cfe8dfcf75af7cffc902778dfd752 blob + 60efeb40a733bd35260116a14fdd4ccf586dea6c --- lib/blame.c +++ lib/blame.c @@ -433,7 +433,7 @@ blame_atomize_file(void *arg, struct diff_data *d) blame->nlines1, blame->line_offsets1); } else if (d->f == blame->f2) { if (d->atoms.len > 0) { - /* Re-use data from previous commit. */ + /* Reuse data from previous commit. */ return DIFF_RC_OK; } if (blame->map2) blob - cb91e27f4d5c2c10d9e0bf5fe16e63a697213aad blob + f8f7313be699328a8e3d97439f3493fde319cc12 --- lib/deltify.c +++ lib/deltify.c @@ -38,7 +38,7 @@ #endif /* - * The algorihm used here is FastCDC (Fast Content-Defined Chunking) + * The algorithm used here is FastCDC (Fast Content-Defined Chunking) * https://www.usenix.org/conference/atc16/technical-sessions/presentation/xia */ blob - 79dfc108d2b9483c7652f580feb250394c5a1bba blob + b56f9b724076ad4803430e3397a2f3875f4c0446 --- lib/got_lib_privsep.h +++ lib/got_lib_privsep.h @@ -82,7 +82,7 @@ GOT_STRINGVAL(GOT_LIBEXECDIR) "/" GOT_STRINGVAL(GOT_PROG_FETCH_HTTP) enum got_imsg_type { - /* An error occured while processing a request. */ + /* An error occurred while processing a request. */ GOT_IMSG_ERROR, /* Stop the child process. */ @@ -190,7 +190,7 @@ enum got_imsg_type { GOT_IMSG_RAW_DELTA_REQUEST, GOT_IMSG_RAW_DELTA, - /* Re-use deltas found in a pack file. */ + /* Reuse deltas found in a pack file. */ GOT_IMSG_DELTA_REUSE_REQUEST, GOT_IMSG_REUSED_DELTAS, GOT_IMSG_DELTA_REUSE_DONE, @@ -515,7 +515,7 @@ struct got_imsg_packidx { size_t len; off_t packfile_size; int algo; - /* Additionally, a file desciptor is passed via imsg. */ + /* Additionally, a file descriptor is passed via imsg. */ }; /* Structure for GOT_IMSG_PACK. */ @@ -523,7 +523,7 @@ struct got_imsg_pack { char path_packfile[PATH_MAX]; off_t filesize; int algo; - /* Additionally, a file desciptor is passed via imsg. */ + /* Additionally, a file descriptor is passed via imsg. */ } __attribute__((__packed__)); /* blob - 1e3fa30aaad109ccf4c3139a2192ca76590d85de blob + ca3e9f600a8d030f7d096bb5d5a4e6f33841dacd --- lib/path.c +++ lib/path.c @@ -189,7 +189,7 @@ got_path_cmp(const char *path1, const char *path2, siz if (len1 == len2 && i >= min_len) return 0; - /* Skip over redundant trailing path seperators. */ + /* Skip over redundant trailing path separators. */ while (path1[i] == '/' && path1[i + 1] == '/') path1++; while (path2[i] == '/' && path2[i + 1] == '/') blob - e266e50151bd8f35ac2827c0c48bdc16561fa339 blob + b46b5f401336f2782c1a13df6a37821f31affb95 --- lib/reference.c +++ lib/reference.c @@ -1310,7 +1310,7 @@ delete_packed_ref(struct got_reference *delref, struct struct got_reflist_head refs; int found_delref = 0; - /* The packed-refs file does not cotain symbolic references. */ + /* The packed-refs file does not contain symbolic references. */ if (delref->flags & GOT_REF_IS_SYMBOLIC) return got_error(GOT_ERR_BAD_REF_DATA); blob - 55a49c904e9d8a41678453f55fcedc15a081516f blob + ebba1caf39b7ef4c28dcefcc7bb43a6ec5597c76 --- regress/cmdline/add.sh +++ regress/cmdline/add.sh @@ -383,7 +383,7 @@ test_add_clashes_with_submodule() { got checkout $testroot/repo $testroot/wt > /dev/null - # Atttempt to add a file clashes with a submodule + # Attempt to add a file clashes with a submodule echo "This is a file called repo2" > $testroot/wt/repo2 (cd $testroot/wt && got add repo2 > /dev/null) blob - c03acc526e5de0ab93d6adddd739a9d62026408c blob + 8ccd872d89efa4e676629a263300d659c3dd6ceb --- regress/cmdline/checkout.sh +++ regress/cmdline/checkout.sh @@ -394,7 +394,7 @@ test_checkout_read_only() { local testroot=`test_init checkout_read_only` local commit_id=`git_show_head $testroot/repo` - # Make the repostiory read-only + # Make the repository read-only chmod -R a-w $testroot/repo echo "A $testroot/wt/alpha" > $testroot/stdout.expected blob - 89bd2dc5bdf5fc0bcee4f1c7c6190dd876910c33 blob + a7d601688bc432e340e74c2195d3001bde575ef4 --- regress/cmdline/common.sh +++ regress/cmdline/common.sh @@ -214,7 +214,7 @@ make_single_file_repo() git_init $repo echo "this is file $file" > $repo/$file git -C $repo add . - git_commit $repo -m "intialize $repo with file $file" + git_commit $repo -m "initialize $repo with file $file" } get_loose_object_path() blob - 43c4a8b4c2b0d6b7faedd25e5cc9f3cb3bfed8fa blob + 884ba874302b4e95327b6a03d633122a2757442a --- regress/cmdline/patch.sh +++ regress/cmdline/patch.sh @@ -860,7 +860,7 @@ EOF 2> $testroot/stderr ret=$? if [ $ret -eq 0 ]; then - echo "got patch suceeded unexpectedly" >&2 + echo "got patch succeeded unexpectedly" >&2 test_done $testroot $ret return 1 fi @@ -888,7 +888,7 @@ EOF 2> $testroot/stderr ret=$? if [ $ret -eq 0 ]; then - echo "got patch suceeded unexpectedly" >&2 + echo "got patch succeeded unexpectedly" >&2 test_done $testroot $ret return 1 fi blob - c824aaf0100a26fa4d112f62f5136272c5c82bbc blob + 84c24828bea9475f7b0841d4f7fe0ffec5264646 --- regress/cmdline/rebase.sh +++ regress/cmdline/rebase.sh @@ -2012,7 +2012,7 @@ test_rebase_one_commit() { 2> $testroot/stderr) ret=$? if [ $ret -ne 0 ]; then - echo "rebase comand failed unexpectedly" >&2 + echo "rebase command failed unexpectedly" >&2 diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 @@ -2073,7 +2073,7 @@ test_rebase_merge_commit() { 2> $testroot/stderr) ret=$? if [ $ret -ne 0 ]; then - echo "merge comand failed unexpectedly" >&2 + echo "merge command failed unexpectedly" >&2 diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 @@ -2171,7 +2171,7 @@ test_rebase_across_merge_commit() { 2> $testroot/stderr) ret=$? if [ $ret -ne 0 ]; then - echo "merge comand failed unexpectedly" >&2 + echo "merge command failed unexpectedly" >&2 diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "1" return 1 blob - a2518bf858a18dbc66fcb6ad278ee0cfc54f9a8c blob + 0709a766c3b43610a20290c1e889d0ba50846d4c --- regress/gotd/README +++ regress/gotd/README @@ -59,6 +59,6 @@ The test suite switches to non-root users as appropria The test suite uses netcat on port 2525 to test SMTP notifications. If this port is already in use then affected tests might fail. -If needed the port can be overriden on the make command line: +If needed the port can be overridden on the make command line: $ doas make server-regress GOTD_TEST_SMTP_PORT=12345