Commit Briefs

adf4c9e089 Thomas Adam

make the diff algorithm used by 'tog diff' and 'tog blame' configurable

ok jamsek


0ab5c5dd8a Thomas Adam

portable: sync CFLAGS with upstream

Due to the way the Makefiles are structured, there is no direct mapping between upstream and how -portable provides the same functionality. Therefore, add -Wunused-variable and -Wwrite-strings as per previous commits.


25ec70067d Thomas Adam

switch 'tog diff' and 'tog blame' to Myers diff for speed

Make the choice of diff algorithm configurable by diff API users. The got and gotweb programs keep using Patience diffs which are prettier than Myers. But tog should be as fast as possible since it is being used interactively. If performance of Patience diff gets improved later we can consider switching tog back over to it. ok tracey jamsek


068ab281f5 Thomas Adam

tog: fix C-d and G log view keymaps in horizontal split

Account for the border so we don't scroll offscreen, and don't unset the load_all flag till all commits have been loaded so we take the correct path in log_move_cursor_down(). ok stsp@


e44940c3e5 Thomas Adam

fix fullscreen / split-screen toggle in tog

ok jamsek


dd2e2f52c1 Thomas Adam

move more opentemp out of diffreg.c

ok tracey


9117a7b739 Thomas Adam

move remaining got_opentemp's out of blame. ok op@


a5d43cac4c Thomas Adam

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@


b31f89ff09 Thomas Adam

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@


1827fdb750 Thomas Adam

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


4918811ff2 Thomas Adam

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

ok jamesk


68e8cedbff Thomas Adam

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

suggested by jrick ok jrick jamsek


19a6a6b5ee Thomas Adam

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

ok tracey



acb9e3ea2e Thomas Adam

pass the correct file to fdopen(); ok tracey


f9bba04a89 Thomas Adam

fix missed dup in open_blob per stsp@


f4ae6ddb59 Thomas Adam

move got_opentempfd out of open_blob. ok stsp@


ec2b23c5d2 Thomas Adam

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

ok op, tracey


4d27f68044 Thomas Adam

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@


19dd85cbe2 Thomas Adam

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

tweak and ok stsp@


8afec5d538 Thomas Adam

handle blob ids without corresponding blob ids

ok stsp@


0c6f49baf2 Thomas Adam

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@



9b4458b410 Thomas Adam

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@


ef20f54204 Thomas Adam

build with -Wmissing-prototypes

ok stsp@