|
49d4a017
|
2022-06-30T10:43:37
|
|
move more opentemp out of diffreg.c
ok tracey
|
|
e6e73e55
|
2022-06-30T08:41:14
|
|
move remaining got_opentemp's out of blame. ok op@
|
|
b880cc75
|
2022-06-30T05:02:23
|
|
tog: refactor log cursor movement in prep for hsplit
Simplify the log input handler by moving (page)up/down and home/end logic
into helper routines as we need to perform some checks on these cases when
navigating the log view in horizontal splits.
ok op@ and stsp@
|
|
|
9b058f45
|
2022-06-30T05:02:23
|
|
tog: implement support for horizontal splitscreens
Enable all main views to open primary child views in a horizontal split:
log -> diff
tree -> blame
blame -> diff
ref -> log
Support is yet to be expanded to nested child views and key maps for
manipulating split type and size.
ok op@ and stsp@
|
|
|
c71ed39a
|
2022-06-29T20:57:36
|
|
fix split-screen issue in tog when moving focus from child view to parent view
Reported by jamsek:
$ tog # term wide enough to vsplit
return # open commit
f # fullscreen commit
tab # should go to fullscreen log, but it splits the screen
fix ok jamsek
|
|
|
4dd27a72
|
2022-06-29T15:41:58
|
|
fix recent regression in tog where split view was not restored after resize
ok jamesk
|
|
|
8c4a6db8
|
2022-06-29T14:58:58
|
|
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
|
|
|
f9d37699
|
2022-06-28T20:33:41
|
|
move got_opentempfd() out of lib/diff.c again
ok tracey
|
|
|
1b484788
|
2022-06-28T18:34:57
|
|
move got_opentempfd out of blame_open ok stsp@ jrick@
|
|
|
7a13e6e5
|
2022-06-28T18:19:03
|
|
pass the correct file to fdopen(); ok tracey
|
|
|
ce7556f2
|
2022-06-28T18:04:05
|
|
fix missed dup in open_blob per stsp@
|
|
|
eb81bc23
|
2022-06-28T13:27:12
|
|
move got_opentempfd out of open_blob. ok stsp@
|
|
|
61af9b21
|
2022-06-28T11:31:11
|
|
implement support for commit coloring in got-read-pack for speed
ok op, tracey
|
|
|
c301e4ed
|
2022-06-28T06:28:10
|
|
tog: echo count prefix when entering compound key maps
like less(1), echo the digits as they're typed.
suggested by and ok op@ stsp@
|
|
497a5915
|
2022-06-27T18:47:02
|
|
handle blob ids without corresponding blob ids
ok stsp@
|
|
|
58e31a80
|
2022-06-27T18:47:02
|
|
build with -Wwrite-strings
Throwing this into the mix for a while, we can always get rid of it
again if it becomes annoying. No objections from stsp@
|
|
|
db0dfdd7
|
2022-06-27T18:47:02
|
|
got patch: handle git-style diffs for the 3-way merge too
tweak and ok stsp@
|
|
|
3d589bee
|
2022-06-25T14:54:41
|
|
allow start_pack_privsep_child() to be called from outside lib/object.c
|
|
|
8469d821
|
2022-06-25T09:25:07
|
|
always show commit or tree IDs in diff header, in order to help 'got patch'
The idea is that got patch can simply look for a line such as:
commit - abcde1234567...
to find the merge base commit ID to show in diff3 conflict markers.
got log -p now displays commit IDs in its diff header, instead ofl
tree or blob IDs.
ok op@
|
|
|
336075a4
|
2022-06-25T09:22:02
|
|
build with -Wmissing-prototypes
ok stsp@
|
|
|
640cd7ff
|
2022-06-22T15:06:48
|
|
tog: prefix mvmt keymaps with count modifier like vi(1)
Enable compound commands for all movement keymaps (e.g., hjkl, bfdu). The
optional prefixed count determines how many times the movement is performed;
for example, '123j' (move 123 lines down) or '4f' (scroll 4 pages down).
Counts are ignored if preceding non-movement and some singular movement
operations (e.g., 't', 'r', 'ret', '/', '$', 'G', 'g').
ok stsp@
|
|
|
9802c41c
|
2022-06-21T16:52:34
|
|
got patch: use status G for merged files (and document it)
Suggested by stsp@. This makes possible to tell if 'got patch' used a
merge-base from the repository for the 3-way merge or did a simple
search/replace operation.
While here update the tests to look for the 'G' status and the manpage,
which was also missing the documentation for the 'C' status in got
patch.
ok stsp@
|
|
|
dbc68eed
|
2022-06-21T16:52:34
|
|
got patch: ignore blobs not found
since diffs are often enclosed in other formats (e.g. emails) we might
parse something and think it's a blob id when it's not. This should
already happens, but apply_patch is looking for the wrong error due to a
leftover from previous attempts. Reported by stsp@
while here tweak the test_patch_merge_unknown_blob to also try with a
dummy commit id, as now got-read-patch requires it in order to consider
a blob id.
ok stsp@
|
|
|
63ba1a3a
|
2022-06-21T16:52:34
|
|
fix `limit' accounting in draw_commit
if the child view is fullscreen we don't need to subtract one, because
no vborder is drawn.
ok Mark Jamsek
|
|
48bb96f0
|
2022-06-20T20:53:20
|
|
tog: make SPACE page down in all views
ok op@, Mark Jamsek
|
|
|
6131ff18
|
2022-06-20T15:54:31
|
|
fix fullscreen view regression introduced in 0dbbbe90fd
When cycling from a child view in fullscreen, the parent view is opened in
a splitscreen with no border instead of fullscreen. Check the view mode when
cycling between views and resize parent dimensions accordingly.
ok op@
|
|
|
61417565
|
2022-06-20T05:05:43
|
|
alias C-b/C-f to scroll page back/forward with b/f
Suggested by naddy. Remap 'f'ullscreen to 'F', and blame view key maps 'b' and
'B' to 'c' and 'C', respectively, per stsp's and naddy's suggestion. While
here, remove trailing whitespace.
ok naddy@
|
|
|
d8b5af43
|
2022-06-19T11:51:33
|
|
use the commitid in the patch diff3 conflict header
suggested by and ok stsp@
|
|
|
55e9459f
|
2022-06-19T11:51:32
|
|
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@
|
|
|
05737d49
|
2022-06-19T11:51:32
|
|
patch_file: fill tmp with the patched file even in nop mode
future work with diff3 merge will need the fully patched file even in
the nop mode
ok stsp@
|
|
|
827bcd6c
|
2022-06-19T11:51:32
|
|
patch_file: move file ownership to parent
ok stsp@
|
|
|
c6621528
|
2022-06-18T17:06:40
|
|
bump version number
|
|
|
c57e65c9
|
2022-06-18T17:02:58
|
|
CHANGES for 0.72
|
|
|
f704b35c
|
2022-06-18T16:52:41
|
|
small grammar and accuracy fixes in a comment
|
|
|
4bfe9f0a
|
2022-06-18T16:48:54
|
|
add missing braces around multi-line if-statement body; pointed out by op@
|
|
|
364ac6fd
|
2022-06-18T16:47:03
|
|
take tog selection cursor position into account when searching for next match
Patch by Mikhail
ok op@ jamsek
|
|
|
89a34d6e
|
2022-06-18T16:32:12
|
|
wrap an overlong line in enumeration_request()
|
|
|
80f51a9e
|
2022-06-18T16:32:12
|
|
fix unexpected imsg error after incomplete enumeration in got-read-pack
reported by jrick and op@
ok op@
|
|
|
dfee752e
|
2022-06-18T16:18:11
|
|
tog: reset matched and search data after C-l
otherwise they point to free'd data. ok stsp@
|
|
|
031611fc
|
2022-06-18T16:17:45
|
|
memset all stack-allocated structs used to send messages; ok stsp@
|
|
|
1a69d37f
|
2022-06-18T16:17:45
|
|
zero the whole struct got_imsg_object before sending it
otherwise some fields may be unitialized and fail the validation done on
the receiving side.
ok stsp@
|
|
|
b4998ee2
|
2022-06-17T13:00:45
|
|
bump version number
|
|
|
6de537c0
|
2022-06-17T11:01:51
|
|
CHANGES for 0.71
|
|
|
a00719e9
|
2022-06-17T11:01:26
|
|
fix a segfault in tog diff
The f1 tempfile must always be created. Even if the initial diff has no
objects on the left side, the view can be switched to a different diff
which does have objects on both sides. When that happened, tog crashed.
(To reproduce: open tog in got.git, hit G, hit Enter, hit <)
|
|
|
dd6e31d7
|
2022-06-17T10:29:12
|
|
fix build of tog on sparc64 with -Werror
error was tog/tog.c:636: warning: function declaration isn't a prototype
|
|
|
4d1f6af3
|
2022-06-17T08:51:16
|
|
account for the vborder in draw_commit
the vborder is drawn on top of the window and that can cause issues with
double-width characters. Instead, account for it when computing the
space available for the log message.
ok stsp@
|
|
|
0dbbbe90
|
2022-06-17T08:49:32
|
|
tog: resize main view
drawing the child view on top of the main view when the layout is
split-screen can produce some ugly glitches when double-width
characters are involved. (issue found by stsp)
ok stsp@
|
|
|
4e4a9ac8
|
2022-06-17T08:49:32
|
|
simplify scroll_wline (now span_wline) and format_line
generalize scroll_wline to start at a specified offset so that we can
reuse it to simplify format_line. While here, simplify scroll_wline
(now called span_wline) too.
ok and improvements by stsp@
|
|
|
95d136ac
|
2022-06-16T21:26:24
|
|
fix wrong pointer in NULL check; found by tracey
|
|
|
44a87665
|
2022-06-16T21:22:49
|
|
fix highlighting issues in tog diff/blame search on lines with tabs
|
|
|
cb713507
|
2022-06-16T20:55:21
|
|
tog: fix crash in expand_tab while searching in diff/blame views
found by op@
ok op@ tracey@
|
|
|
1853e0f4
|
2022-06-16T20:48:35
|
|
fix diff and blame view search for horizontal scrolling with unicode
ok op@
|
|
|
87411fa9
|
2022-06-16T18:24:53
|
|
wrap overlong lines in tog.c
|
|
|
4cb9d869
|
2022-06-16T17:17:40
|
|
fix horizontal scrolling of unicode in the blame view
ok op@
|
|
|
969c159c
|
2022-06-16T17:17:19
|
|
fix horizontal scrolling of unicode in tog diff view
ok op@
|
|
|
f7443f66
|
2022-06-16T15:13:39
|
|
add missing linebreaks to demarcate sentences in tog.1
ok op@
|
|
|
367ddf28
|
2022-06-16T14:49:57
|
|
missed style(9) fixes in previous commit
ok tb@
|
|
|
20282b02
|
2022-06-16T14:45:29
|
|
fix build with -DGOT_NO_OBJ_CACHE
ok stsp
|
|
|
6e1c41ad
|
2022-06-16T14:41:49
|
|
plug realloc memleak and style(9) fixes in expand_tab()
fixes and ok from tb@
|
|
|
ccda2f4d
|
2022-06-16T13:37:55
|
|
move horizontal line scrolling logic into format_line() for easier reuse
ok op@
|
|
|
0ce35b66
|
2022-06-16T13:36:46
|
|
fix an off-by-one in tog's draw_file() causing wrong diff output
This issue caused empty lines added in diffs to be displayed without
leading + in the diff view.
Problem found by op@
ok op jamsek
|
|
|
b0dd8d27
|
2022-06-16T11:40:20
|
|
fix a recent regression where tog segfaults if Ctrl+l is used in the log view
|
|
|
29688b02
|
2022-06-16T11:33:48
|
|
fix horizontal scrolling of unicode in tog log view
ok jamsek
|
|
|
a75b3e2d
|
2022-06-16T08:10:33
|
|
fix horizontal scrolling bug in the blame view
ok op@, jamsek
|
|
|
b4996bee
|
2022-06-16T07:04:07
|
|
show last-modified date in the "tog ref" view if the 'm' key is pressed
Patch by Mark Jamsek
|
|
|
145b6838
|
2022-06-16T07:00:28
|
|
implement horizontal scrolling for tog diff, blame, and log views
Patch by Mark Jamsek
|
|
|
1b1b91ab
|
2022-06-15T21:21:27
|
|
style: remove double semicolon
|
|
|
61bce19e
|
2022-06-15T19:19:28
|
|
revert "clear the rest of the pack_fds pointers"
There is no need to clear local variables before returning from a function.
ok tracey
|
|
|
75c1763d
|
2022-06-15T18:06:48
|
|
fix D_GOTWWW default path; gotweb can now run without a config file again
ok tracey
|
|
|
bb1c2cf3
|
2022-06-15T15:37:20
|
|
clear the rest of the pack_fds pointers
|
|
|
e17984a0
|
2022-06-15T15:33:46
|
|
clear gw_trans->pack_fds pointer in gotweb
|
|
|
b0c3aa90
|
2022-06-15T15:28:07
|
|
fix recent regression in gotweb for pack_fds
|
|
|
5a950d09
|
2022-06-15T14:27:20
|
|
using a local packfd variable in open_worktree() is sufficient
|
|
|
d188eb19
|
2022-06-15T14:26:34
|
|
remove pointless assignment at the end of got_repo_pack_fds_close()
|
|
|
bb711527
|
2022-06-15T14:25:37
|
|
don't look for close() errors if opentemp() failed in got_repo_pack_fds_open()
|
|
|
8b195234
|
2022-06-15T14:02:55
|
|
clear pack_fds pointer in tog's stop_blame() after closing
|
|
|
74467cc8
|
2022-06-15T13:53:50
|
|
fix handling of pack_fds used by tog's log thread
|
|
|
0ae84acc
|
2022-06-15T13:52:20
|
|
move got_opentempfd out of got_repo_open. ok stsp@
thanks for all the help massaging this diff
|
|
|
06c44edc
|
2022-06-15T13:10:50
|
|
check for errors from fclose() in patch_file()
|
|
|
11ce22a1
|
2022-06-15T12:50:10
|
|
plug memory and fd leak in got patch
|
|
|
33c3719a
|
2022-06-15T08:50:55
|
|
re-add u/d keybindings as aliases for Ctrl-u/d, matching more(1) and less(1)
patch by Mikhail
|
|
|
afd31498
|
2022-06-14T22:35:34
|
|
fix a harmless off-by-one from previous commit
|
|
|
a5e587e0
|
2022-06-14T22:32:11
|
|
fix a bug in got_privsep_send_object_idlist() exposed by recent changes
The old code did not work correctly if only a single object Id was to
be sent to got-read-pack. Make got-read-pack error out if the list
of commits for object enumeration is empty to catch this problem if
it occurs again.
Found by the send_basic test, which was failing with GOT_TEST_PACK=1
ok tracey
|
|
|
db9b9b1c
|
2022-06-14T20:26:15
|
|
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@
|
|
|
ffe3518f
|
2022-06-14T18:50:43
|
|
fix wrong arguments to calloc(3) in enumeration_request()
|
|
|
b4b1b9c0
|
2022-06-14T13:16:15
|
|
remove trailing whitespaces
|
|
|
0fca100c
|
2022-06-14T13:16:15
|
|
compute object size, not pointer size
in this case they're luckily the same; got_imsg_object_idlist and
got_imsg_reused_delta only have one size_t long field.
ok stsp@
|
|
|
c98b0f0b
|
2022-06-14T13:16:15
|
|
strictier validation for data received from libexec helpers
use correct error code and ok stsp@
|
|
|
3e6054c4
|
2022-06-14T13:16:14
|
|
drop unused variable
|
|
|
bf31a716
|
2022-06-14T13:16:14
|
|
use strndup instead of malloc+memcpy
Simplifies the reading of the author/committer string and makes also the
code shorter.
ok stsp@
|
|
|
71fee5a3
|
2022-06-14T13:16:14
|
|
don't check datalen when calling recv_imsg_error
recv_imsg_error already checks the size of the message, and it does so
more precisely than the removed code.
ok stsp@
|
|
|
35095610
|
2022-06-14T10:35:07
|
|
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@
|
|
|
5b7126c5
|
2022-06-14T08:31:16
|
|
actually guarding against negative line offsets
previous commit looked at some pretty zeroes returned from calloc
instead of the actual numbers received.
|
|
|
2399b53d
|
2022-06-14T08:26:27
|
|
style; set datalen only once
|
|
|
71393b5c
|
2022-06-14T08:10:55
|
|
got patch: guard against invalid (negative) line offsets
under normal circumstances got-read-patch can't send negative line
offsets; that's not an excuse not to guard the main process from those
as well.
This makes sure we bail out early instead of trying to apply the diff.
|
|
|
0e07a2a1
|
2022-06-13T20:57:43
|
|
free patch on error
|
|
|
99b94ad7
|
2022-06-13T20:30:09
|
|
got patch: ensure new and old paths are NUL-terminated
|
|
|
eb7b30a1
|
2022-06-13T17:13:59
|
|
fix error handling in find_pack_for_enumeration(); pointed out by op@
|
|
|
0ab4c957
|
2022-06-13T17:13:59
|
|
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@
|
|
|
85c34e74
|
2022-06-13T09:37:38
|
|
fix error case handling in print_commit_oneline(); pointed out by op@
|