Commit Briefs

Thomas Adam

portable: CHANGELOG for 0.71 (tags/0.71)

This updates the CHANGELOG for the 0.71 commit.


Thomas Adam

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@


Thomas Adam

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@


Thomas Adam

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@


Thomas Adam

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


Thomas Adam

tog: make SPACE page down in all views

ok op@, Mark Jamsek


Thomas Adam

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@


Thomas Adam

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@


Thomas Adam

use the commitid in the patch diff3 conflict header

suggested by and ok stsp@


Thomas Adam

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@


Thomas Adam

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@


Thomas Adam

patch_file: move file ownership to parent

ok stsp@


Thomas Adam

bump version number


Thomas Adam

CHANGES for 0.72




Thomas Adam

take tog selection cursor position into account when searching for next match

Patch by Mikhail ok op@ jamsek



Thomas Adam

fix unexpected imsg error after incomplete enumeration in got-read-pack

reported by jrick and op@ ok op@


Thomas Adam

tog: reset matched and search data after C-l

otherwise they point to free'd data. ok stsp@



Thomas Adam

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@


Thomas Adam

bump version number


Thomas Adam

CHANGES for 0.71


Thomas Adam

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 <)