|
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.
|
|
a84c0d30
|
2022-03-12T21:30:23
|
|
fix 'got status' with an obstructed file given as argument; found by Omar
|
|
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.
|
|
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.
|
|
423faaa6
|
2022-03-12T16:01:09
|
|
got-read-patch: plug memory leak
|
|
b95c53df
|
2022-03-12T16:01:09
|
|
apply_patch: move sanity check early in recv_patch
|
|
33df9995
|
2022-03-11T17:25:33
|
|
save `pos' in locate_hunk instead of calling ftello again
ok thomas, stsp
|
|
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
|
|
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
|
|
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
|
|
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
|
|
8e26059c
|
2022-03-10T21:09:39
|
|
document that 'gotadmin listpack' requires a pack index
|
|
81a19701
|
2022-03-10T20:28:20
|
|
ref.sh: fix pastos and report the actual command that was run
|
|
0e6ab4b2
|
2022-03-10T09:23:19
|
|
make got_repo_match_object_id_prefix() reject overlong input strings
suggested by + ok naddy
|
|
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
|
|
d955343d
|
2022-03-08T16:01:03
|
|
pass the callback data instead of hardcoding NULL, ok stsp
|
|
36751b1b
|
2022-03-08T15:11:37
|
|
remove needless header inclusion; lib/pack.c does not need got_opentemp.h
|
|
6f5cb1bd
|
2022-03-08T12:22:36
|
|
fix path to the temp file used to accumulate the patch edits
ok stsp
|
|
bfbccd0a
|
2022-03-08T12:22:36
|
|
use test(1) -eq and -ne to compare integers; ok tb
|
|
fd79e2e0
|
2022-03-08T12:22:36
|
|
typos
|
|
e9ce266e
|
2022-03-07T22:26:08
|
|
add `got patch' command for applying unified diffs
|
|
805253d5
|
2022-03-07T20:19:35
|
|
fix level of indirection
ok stsp
|
|
3a12860c
|
2022-03-07T19:25:46
|
|
make the URI parser tolerate trailing slashes at the end of the input URI
ok naddy
|
|
bed00385
|
2022-02-23T12:29:32
|
|
apply time-based rate-limiting to got-send-pack upload progress output
|
|
dcb64fea
|
2022-02-23T12:24:25
|
|
apply time-based rate-limiting to got-fetch-pack download progress output
|
|
d0f1e2f1
|
2022-02-23T12:13:03
|
|
apply time-based rate-limiting to got-index-pack progress output
|
|
e3f86256
|
2022-02-18T20:23:32
|
|
explicitly include <endian.h> for be32toh()
|
|
931651ba
|
2022-02-18T19:57:12
|
|
bump version number
|
|
4c91cf3d
|
2022-02-18T19:24:24
|
|
CHANGES for 0.67
|
|
3e166534
|
2022-02-16T18:32:17
|
|
const-ify command and option tables
ok stsp
|
|
e546352c
|
2022-02-16T17:03:02
|
|
remove stray tab that snuck in
|
|
bdc78ba6
|
2022-02-16T16:32:54
|
|
display GMT offset in cat command
ok stsp
|
|
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@
|
|
688fe08b
|
2022-02-14T13:14:36
|
|
fix fd leak in got_fetch_pack, ok stsp@
|
|
28526235
|
2022-02-13T00:12:04
|
|
fix pack.sh test failure from reuse-deltas patch by tweaking progress output
|
|
67fd6849
|
2022-02-13T00:10:25
|
|
reuse existing deltas when creating pack files
tested by thomas, naddy, and myself
|
|
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
|
|
f6027426
|
2022-02-12T21:48:46
|
|
consistently match size of hash variables to that returned by murmurhash
ok millert stsp
|
|
32b5305f
|
2022-02-12T09:34:03
|
|
new test: `got diff' on files matched by an ignore pattern
|
|
2b474c25
|
2022-02-11T22:45:00
|
|
use murmurhash instead of sha1 for deltification blocks; suggested by ori
|
|
1ac8bad9
|
2022-02-11T22:44:35
|
|
reduce minimum deltification chunk size to 32; suggested by ori
|
|
916237f3
|
2022-02-11T22:42:50
|
|
fix 'got diff' on files which match an ignore pattern; found by 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
|
|
d75b4088
|
2022-02-08T10:52:17
|
|
set zlib output buffer length properly after resizing the output buffer
ok millert naddy
|
|
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
|
|
1d918cf9
|
2022-02-06T14:56:36
|
|
improve error message due to malformed `author' in got.conf
tweak and ok stsp@
|
|
9b4603c0
|
2022-01-31T16:27:14
|
|
improve 'got add' error message if file does not exist; reported by Timo Myyrä
ok tracey
|
|
c7b17232
|
2022-01-28T18:07:47
|
|
fix loose object file header parser for zero-length headers
ok millert tracey
|
|
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
|
|
8264d9ee
|
2022-01-27T12:05:24
|
|
fix wrong imsg name in errors raised by got_privsep_send_tree_req()
|
|
9296b03b
|
2022-01-26T10:33:52
|
|
remove unnecessary local variable from got_privsep_get_imsg_obj()
|
|
d1b988e3
|
2022-01-26T10:33:52
|
|
add missing initialization of delta list in got_privsep_get_imsg_obj()
|
|
0ee7a4dc
|
2022-01-26T10:33:21
|
|
fix double-free and double-close issues in error paths of got_packidx_open()
|
|
692bdcc4
|
2022-01-25T22:48:26
|
|
make 'got rm' report an "unexpected status" error for unversioned files
ok millert@
|
|
4e12cd97
|
2022-01-25T22:48:26
|
|
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
|
|
4362cf9c
|
2022-01-24T16:44:19
|
|
style
|
|
b3f4d550
|
2022-01-24T16:36:16
|
|
unbreak gotweb index when pack files are missing
|
|
969ea98d
|
2022-01-24T08:04:11
|
|
remove non-reachable 'return NULL' statement from report_single_file_status()
|
|
cc488aa7
|
2022-01-23T15:35:19
|
|
show rebase and histedit backups in tog ref view
ok naddy
|
|
72840534
|
2022-01-19T12:04:58
|
|
compress delta data from delta_cache directly into pack file
|
|
30ee8dc8
|
2022-01-18T20:51:19
|
|
add missing error check in got_inflate_to_mem_mmap()
|
|
ef2f551e
|
2022-01-12T09:32:40
|
|
add -t option to 'got branch' synopsis in got.1 man page
|
|
15a578da
|
2022-01-11T15:41:20
|
|
bump version number
|
|
21ecd399
|
2022-01-11T15:37:58
|
|
CHANGES for 0.66
|
|
3bfc2334
|
2022-01-11T15:37:06
|
|
fix file corruption regression in 'got checkout' caused by commit db696021
got-read-pack must rewind its files temporary files before reusing them.
Problem reported by naddy
ok tracey naddy
|
|
3976db15
|
2022-01-10T14:46:30
|
|
add missing checks for reads beyond the mapped memory area of a pack file
|
|
402a5ec1
|
2022-01-10T13:13:16
|
|
set a cap on the amount of memory we use to store encoded deltas
|
|
5060d5a1
|
2022-01-10T11:09:25
|
|
encode short deltas in memory instead of writing them to a temporary file
|
|
64a8571e
|
2022-01-07T23:32:27
|
|
map raw object files into memory while packing if possible
|
|
59b21794
|
2022-01-07T14:33:52
|
|
only open raw objects if necessary while writing out pack file data
significantly speeds up the "writing pack: " step of gotadmin pack
|
|
0f71f619
|
2022-01-06T22:30:35
|
|
fix wrong path in a comment
|
|
a4a4db77
|
2022-01-06T22:25:21
|
|
mention that additional copyright holders and licencing statements exist
|
|
f209666c
|
2022-01-06T22:16:34
|
|
happy new year
|
|
e3cbec1a
|
2022-01-06T22:03:18
|
|
bump version number
|
|
81c0cc1e
|
2022-01-06T21:38:18
|
|
CHANGES for 0.65
|
|
2471f5c4
|
2022-01-06T19:20:52
|
|
sync files from diff.git b72f51ffc39028023059fc994542565691b669fa
This fixes a scrolling problem in tog's diff view for diffs which
contain lines of the form "Binary files %s and %s differ".
|
|
dbe266a4
|
2022-01-05T20:24:13
|
|
print status output even if 'gotadmin cleanup' finds no objects to remove
|
|
9cd5f067
|
2022-01-05T20:14:59
|
|
fix amount of purged objects shown in gotadmin cleanup's final progress report
|
|
a075bd5b
|
2022-01-05T19:59:29
|
|
sync dist file list
|
|
211cfef0
|
2022-01-05T19:57:10
|
|
use time-based rate-limiting for gotadmin progress output
Suggested by naddy some time ago.
ok tracey
|
|
db696021
|
2022-01-04T16:11:52
|
|
avoid the creation of new temporary files whenever a packed object is read
This speeds up the creation of pack files by about 30%.
|
|
404bde06
|
2022-01-03T21:51:02
|
|
fix bogus "object not found" errors when object ID begins with 00
ok thomas_adam
|
|
a8a244dd
|
2022-01-03T11:50:14
|
|
simpler fix equivalent to the previous commit
|
|
5988bab1
|
2022-01-03T11:48:22
|
|
make test_cherrypick_root_commit pass with GOT_TEST_PACK=1
|
|
c861864b
|
2022-01-03T11:34:34
|
|
'got stage' tests rely on unreferenced loose objects; disable GOT_TEST_PACK=1
|
|
6fa5c67c
|
2022-01-03T11:16:56
|
|
remove loose objects if running tests with GOT_TEST_PACK
|
|
0a26275f
|
2022-01-03T11:11:06
|
|
use 'gotadmin pack' instead of 'git repack' if testing with GOT_TEST_PACK
|
|
c0df5966
|
2021-12-31T09:33:01
|
|
wrap overlong lines
|
|
e7ae0baf
|
2021-12-31T09:11:22
|
|
add O_CLOEXEC (close-on-exec) to openat(2) calls
suggested by millert
ok thomas_adam
|
|
8bd0cdad
|
2021-12-31T09:11:21
|
|
add O_CLOEXEC (close-on-exec) flag to open(2) calls
suggested by millert
ok thomas_adam
|
|
00fe21f2
|
2021-12-31T09:11:21
|
|
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
|
|
ed7cc4a8
|
2021-12-29T12:03:33
|
|
remove outdated comment
|
|
67b5eae1
|
2021-12-27T19:01:57
|
|
tog: clear search highlighting when reloading view
Clear the search highlighting when replacing the content of a diff
view ('<', '>', '[', ']', 'a', 'w') or a blame view ('b', 'p', 'B').
Previously the position would remain highlighted even if the text
there had changed.
ok stsp@
or a blame view
|
|
197088a4
|
2021-12-27T05:20:04
|
|
whitespace
|
|
8a4f8535
|
2021-12-27T05:19:52
|
|
fix NULL dereference in 'got clone' if server sends an empty pack file
|
|
46ea77db
|
2021-12-20T16:18:41
|
|
sort paths in got log -Pp and tog's diff view the same way as in the diff
reported by and fix confirmed by naddy
|
|
487cd7d2
|
2021-12-17T22:38:55
|
|
make tog searches start from the current position in all views
ok naddy@
|
|
4a55b231
|
2021-12-09T16:10:25
|
|
ignore the return value of closefrom(2); patch by Anna a.k.a. CyberTailor
millert@ suggests that this check is not needed, and that ideally we
should be using close-on-exec instead. I will look into this, but in the
meantime this change will help -portable: https://bugs.gentoo.org/828003
|
|
5a5ede53
|
2021-12-09T15:03:48
|
|
let new 'tog log' searches start out from the currently selected commit
ok naddy tracey
|
|
f6f4c787
|
2021-11-23T19:12:49
|
|
sync files from diff.git f1dbec24f9a9553e22659f6c592c91e96221f6b9
|