Commits
- Commit:
adf4c9e089b963236c92bf14647ac21c0f29883b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make the diff algorithm used by 'tog diff' and 'tog blame' configurable
ok jamsek
- Commit:
0ab5c5dd8a9b0c5e87e8eda800b5c9930d197a42
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
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.
- Commit:
25ec70067dea51a3c3ffd3c5f989853d80b847f7
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
068ab281f5df14cf0424c2640219bab16fd43a15
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
e44940c3e5135c640a6eccb2a5ebe054b4759909
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix fullscreen / split-screen toggle in tog
ok jamsek
- Commit:
dd2e2f52c1fb7a85d2d76afc68cec1175bbd52bd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move more opentemp out of diffreg.c
ok tracey
- Commit:
9117a7b739232ec6280c90ef3366a0578a9a5b68
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move remaining got_opentemp's out of blame. ok op@
- Commit:
a5d43cac4cfa1a87141f03a15f8da1c09b856e74
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
b31f89ff09817fe6439db5702c1ebf726ad50869
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
1827fdb750b03cedf74f34268984167fceebe4eb
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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
- Commit:
4918811ff2fbe4e837b99e036523fd438b21e6aa
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix recent regression in tog where split view was not restored after resize
ok jamesk
- Commit:
68e8cedbff75686437a3d71b0c265fb66cbbbd75
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
- Commit:
19a6a6b5eea7ed2df9eaaba2364d18ee05678ddd
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- Commit:
00a8878e94dced1dd4053bf9b61e8b8c16f59629
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of blame_open ok stsp@ jrick@
- Commit:
acb9e3ea2ed831226f75eb7606ecd06a0711b131
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
pass the correct file to fdopen(); ok tracey
- Commit:
f9bba04a89d0b706fe1b4d95cfe16b75b70097e1
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix missed dup in open_blob per stsp@
- Commit:
f4ae6ddb59a1edbd016ad7f0e27c2599f8966e19
- From:
- Tracey Emery <tracey@traceyemery.net>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
ec2b23c5d2570888a1d83ce2e8eee5a90eeff695
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement support for commit coloring in got-read-pack for speed
ok op, tracey
- Commit:
4d27f680443116b3694af5348801dd446b091cff
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
19dd85cbe25c418975d46e00cc13b48e26488715
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: handle git-style diffs for the 3-way merge too
tweak and ok stsp@
- Commit:
8afec5d5388b965430c12e3405765ceb552faefa
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
0c6f49baf2b43adf1cd027050d27fc32ef8454da
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
68036464ea72a92fd21d72135814faed6abad71a
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
allow start_pack_privsep_child() to be called from outside lib/object.c
- Commit:
9b4458b41088db703d890881c32dfd242efce4df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
ef20f542049f5928fa256eb470801089d0b1048b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
build with -Wmissing-prototypes
ok stsp@