Commits
- Commit:
9b058f456d15d60a89334ce3e7f0a7c22e182c55
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
b880cc75ed8a91d3ed8ddb051aa4ea4e2b7314c0
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
c71ed39a66ed8e3aeaa13e76fce179b7bf6efec6
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
4dd27a7290cd557f7db7d0b5d647d00157e7f82f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix recent regression in tog where split view was not restored after resize
ok jamesk
- Commit:
8c4a6db8547e314f29117f820ab5f99722b980fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to show just one tag with 'got tag -l'
suggested by jrick
ok jrick jamsek
- Commit:
f9d376997dd2e84bf84c3c9a4da842d1b5565e9d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
move got_opentempfd() out of lib/diff.c again
ok tracey
- Commit:
1b484788fec38ce9936267c176e77f653d749b8d
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of blame_open ok stsp@ jrick@
- Commit:
7a13e6e501f6808283b956b84746cc9e8d2f1b25
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
pass the correct file to fdopen(); ok tracey
- Commit:
ce7556f23f6b599e1f224216af82b0a097a13ca3
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
fix missed dup in open_blob per stsp@
- Commit:
eb81bc23c735e8aa9eaee796a230c7d7c76657ba
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
move got_opentempfd out of open_blob. ok stsp@
- Commit:
61af9b215c06bece11deb27d941b390b81e0f8c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement support for commit coloring in got-read-pack for speed
ok op, tracey
- Commit:
c301e4ed7f25d48be4d36d791f90cac50b0be419
- From:
- Mark Jamsek <mark@jamsek.dev>
- 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:
db0dfdd7e5c2c5a38ed7c3291a0615132bcb5945
- From:
- Omar Polo <op@omarpolo.com>
- Date:
got patch: handle git-style diffs for the 3-way merge too
tweak and ok stsp@
- Commit:
497a59156be73918988396d3f7378fb8c7b6da8d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
handle blob ids without corresponding blob ids
ok stsp@
- Commit:
58e31a80da4f4a9e10eaea148672190f35107a47
- From:
- Omar Polo <op@omarpolo.com>
- 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:
3d589bee0bbbe812bb91f3b0284fbf2596304132
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow start_pack_privsep_child() to be called from outside lib/object.c
- Commit:
8469d82143a591d423c000c47c63bababe6f5716
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
336075a42a5ae0fa322db734c481d21998e82bb8
- From:
- Omar Polo <op@omarpolo.com>
- Date:
build with -Wmissing-prototypes
ok stsp@
- Commit:
640cd7ff31ef05df4f6394c8792925b7dd0b8c7c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
9802c41ca727979975e9ee6fbd898dfec7f283c4
- From:
- Omar Polo <op@omarpolo.com>
- Date:
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@
- Commit:
dbc68eedb1de26bf5a444ecad5150b0a243d422b
- From:
- Omar Polo <op@omarpolo.com>
- Date:
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@
- Commit:
63ba1a3a6f40953d1636e718c0e0000a3d626159
- From:
- Omar Polo <op@omarpolo.com>
- Date:
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
- Commit:
48bb96f04b6f67bbc78ae9526830dbf20e84ef7d
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
tog: make SPACE page down in all views
ok op@, Mark Jamsek
- Commit:
6131ff18e81056001a823f913094a92c10580cba
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@
- Commit:
6141756554c6ee1a8a23728658279ef5e16262a0
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
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@