Commit Briefs

Mark Jamsek

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@


Stefan Sperling

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


Stefan Sperling

fix recent regression in tog where split view was not restored after resize

ok jamesk


Stefan Sperling

make it possible to show just one tag with 'got tag -l'

suggested by jrick ok jrick jamsek


Stefan Sperling

move got_opentempfd() out of lib/diff.c again

ok tracey



Stefan Sperling

pass the correct file to fdopen(); ok tracey


Tracey Emery

fix missed dup in open_blob per stsp@



Stefan Sperling

implement support for commit coloring in got-read-pack for speed

ok op, tracey


Mark Jamsek

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@


Omar Polo

got patch: handle git-style diffs for the 3-way merge too

tweak and ok stsp@


Omar Polo

handle blob ids without corresponding blob ids

ok stsp@


Omar Polo

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@



Stefan Sperling

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@


Omar Polo

build with -Wmissing-prototypes

ok stsp@


Mark Jamsek

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@


Omar Polo

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@


Omar Polo

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@


Omar Polo

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


Christian Weisgerber

tog: make SPACE page down in all views

ok op@, Mark Jamsek


Mark Jamsek

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@


Mark Jamsek

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@


Omar Polo

use the commitid in the patch diff3 conflict header

suggested by and ok stsp@