Skip to content

Commit

Permalink
Merge branch 'stable' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
anjakefala committed Oct 24, 2023
2 parents 0e9d0c9 + db3b299 commit 6f11296
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 2 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,35 @@
- [vdx] runvdx() to execute vdx strings
- [tests] add vd.resetVisiData


# v2.11.1 (2023-07-16)

- [tests] fix tests for Python >=3.11
- [path] update for Python 3.12 API (reported by @QuLogic #1934)

## Improvements and bugfixes

- [chooser] choose only exactly matching strings in chooser (PR by @daviewales #1902)
- [columns] speed up `getMaxWidth()` for wide columns, and correct some edge cases (PR by @midichef #1747)
- [freqtbl] Default `disp_histogram` to U+25A0 BLACK SQUARE (■)) (PR by @daviewales #1949)
- [loaders fixed] do not truncate wide columns with fixed-width saver (PR by @daviewales #1890)

- add missing import `copy`
- [graph] fix graph ranges for xmax, ymax < 1 (PR by @midichef #1752)
- [graph] fix data on edges being drawn offscreen (PR by @midichef #1850)
- [input] fix `Ctrl+T` swap on empty input (reported by @gfrmin #1684)
- [inputsingle] loop until keystroke (do not timeout)
- [fill] allow filling with values that are logically false (PR by @midichef #1794)
- [macos] do not bind empty string to any keybinding
- [paste] add new rows to sheet if insufficient rows
- [path Dirsheet] set name to '.' for givenpath of '.' (reported by @geekscrapy #1768)
- [path] fix progress for compressed files (reported by @bitwisecook #1255 #1175)
- [replay] clearCaches before moving cursor (reported by @mokalan #1773)
- [save] handle saving 0 sheets (reported by @reagle #1266 #1720)
- [settings] clear cache correctly before set
- [undo] fix so that undo is Sheet-specific on copied sheets (reported by @geekscrapy #1780)
- [undo] undoing `zd` now removes `[M]` (modification mark) (reported by @Freed-Wu #1800)

# v2.11 (2023-01-15)

- [ci] drop support for Python 3.6 (related to https://github.com/actions/setup-python/issues/543)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# VisiData v2.11
# VisiData v2.11.1

[![Tests](https://github.com/saulpw/visidata/workflows/visidata-ci-build/badge.svg)](https://github.com/saulpw/visidata/actions/workflows/main.yml)
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/saulpw/visidata)
Expand Down
2 changes: 2 additions & 0 deletions dev/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Usage: test.sh [testname]

set -e
set -x
shopt -s failglob

trap "echo aborted; exit;" SIGINT SIGTERM
Expand Down Expand Up @@ -35,6 +36,7 @@ for i in $TESTS ; do
fi
if $TEST == true;
then
echo $TEST
for goldfn in tests/golden/${outbase%.vd*}.*; do
PYTHONPATH=. bin/vd --confirm-overwrite=False --play "$i" --batch --output "$goldfn" --config tests/.visidatarc --visidata-dir tests/.visidata
echo "save: $goldfn"
Expand Down
16 changes: 16 additions & 0 deletions docs/man.md
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,22 @@ vd(1)
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">replay</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">pause</span> ‖ status indicator for paused replay
<span style="font-weight:bold;">color</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">status</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">replay</span> green color of replay status indicator
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">histogram</span> * histogram element character
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">formatter</span> generic formatter to use for display and saving
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span> True show menu on top line when not active
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">keys</span> True show keystrokes inline in submenus
<span style="font-weight:bold;">color</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span> black on 110 cyan color of menu items in general
<span style="font-weight:bold;">color</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">active</span> 223 yellow on black
color of active menu items
<span style="font-weight:bold;">color</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">spec</span> black on 34 green color of sheet-specific menu items
<span style="font-weight:bold;">color</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">help</span> black italic on 110 cyan
color of helpbox
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">boxchars</span> ││──┌┐└┘├┤ box characters to use for menus
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">more</span> » command submenu indicator
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">push</span> ⎘ indicator if command pushes sheet onto sheet stack
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">input</span> … indicator if input required for command
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">menu</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">fmt</span> Ctrl+H for help menu
right-side menu format string
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">histogram</span> ■ histogram element character
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">histolen</span> 50 width of histogram column
<span style="font-weight:bold;">disp</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">canvas</span><span style="text-decoration:underline;">_</span><span style="font-weight:bold;">charset</span> ⠀⠁⠂⠃⠄⠅⠆⠇⠈⠉⠊⠋⠌⠍⠎⠏⠐⠑⠒⠓⠔⠕⠖⠗⠘⠙⠚⠛⠜⠝⠞⠟⠠⠡⠢⠣⠤⠥⠦⠧⠨⠩⠪⠫⠬⠭⠮⠯⠰⠱⠲⠳⠴⠵⠶⠷⠸⠹⠺⠻⠼⠽⠾⠿⡀⡁⡂⡃⡄⡅⡆⡇⡈⡉⡊⡋⡌⡍⡎⡏⡐⡑⡒⡓⡔⡕⡖⡗⡘⡙⡚⡛⡜⡝⡞⡟⡠⡡⡢⡣⡤⡥⡦⡧⡨⡩⡪⡫⡬⡭⡮⡯⡰⡱⡲⡳⡴⡵⡶⡷⡸⡹⡺⡻⡼⡽⡾⡿⢀⢁⢂⢃⢄⢅⢆⢇⢈⢉⢊⢋⢌⢍⢎⢏⢐⢑⢒⢓⢔⢕⢖⢗⢘⢙⢚⢛⢜⢝⢞⢟⢠⢡⢢⢣⢤⢥⢦⢧⢨⢩⢪⢫⢬⢭⢮⢯⢰⢱⢲⢳⢴⢵⢶⢷⢸⢹⢺⢻⢼⢽⢾⢿⣀⣁⣂⣃⣄⣅⣆⣇⣈⣉⣊⣋⣌⣍⣎⣏⣐⣑⣒⣓⣔⣕⣖⣗⣘⣙⣚⣛⣜⣝⣞⣟⣠⣡⣢⣣⣤⣥⣦⣧⣨⣩⣪⣫⣬⣭⣮⣯⣰⣱⣲⣳⣴⣵⣶⣷⣸⣹⣺⣻⣼⣽⣾⣿
charset to render 2x4 blocks on canvas
Expand Down
2 changes: 1 addition & 1 deletion visidata/loaders/fixed_width.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def save_fixed(vd, p, *vsheets):
widths = {} # Column -> width:int
# headers
for col in Progress(sheet.visibleCols, gerund='sizing'):
widths[col] = col.getMaxWidth(sheet.rows) #1849
widths[col] = col.getMaxWidth(sheet.rows) #1849
fp.write(('{0:%s} ' % widths[col]).format(col.name))
fp.write('\n')

Expand Down
25 changes: 25 additions & 0 deletions visidata/man/vd.1
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,31 @@ status indicator for paused replay
.It Sy "color_status_replay" No "green"
color of replay status indicator
.It Sy "disp_histogram " No "*"
.It Sy "disp_formatter " No "generic"
formatter to use for display and saving
.It Sy "disp_menu " No "True"
show menu on top line when not active
.It Sy "disp_menu_keys " No "True"
show keystrokes inline in submenus
.It Sy "color_menu " No "black on 110 cyan"
color of menu items in general
.It Sy "color_menu_active " No "223 yellow on black"
color of active menu items
.It Sy "color_menu_spec " No "black on 34 green"
color of sheet-specific menu items
.It Sy "color_menu_help " No "black italic on 110 cyan"
color of helpbox
.It Sy "disp_menu_boxchars " No "\[u2502]\[u2502]\[u2500]\[u2500]\[u250C]\[u2510]\[u2514]\[u2518]\[u251C]\[u2524]"
box characters to use for menus
.It Sy "disp_menu_more " No "\[u00BB]"
command submenu indicator
.It Sy "disp_menu_push " No "\[u2398]"
indicator if command pushes sheet onto sheet stack
.It Sy "disp_menu_input " No "\[u2026]"
indicator if input required for command
.It Sy "disp_menu_fmt " No "Ctrl+H for help menu"
right-side menu format string
.It Sy "disp_histogram " No "\[u25A0]"
histogram element character
.It Sy "disp_histolen " No "50"
width of histogram column
Expand Down
22 changes: 22 additions & 0 deletions visidata/man/vd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,28 @@ COMMANDLINE OPTIONS
play
color_status_replay green color of replay status indicator
disp_histogram * histogram element character
disp_formatter generic formatter to use for display and
saving
disp_menu True show menu on top line when not
active
disp_menu_keys True show keystrokes inline in sub‐
menus
color_menu black on 110 cyan color of menu items in general
color_menu_active 223 yellow on black
color of active menu items
color_menu_spec black on 34 green color of sheet-specific menu
items
color_menu_help black italic on 110 cyan
color of helpbox
disp_menu_boxchars ││──┌┐└┘├┤ box characters to use for menus
disp_menu_more » command submenu indicator
disp_menu_push ⎘ indicator if command pushes sheet
onto sheet stack
disp_menu_input … indicator if input required for
command
disp_menu_fmt Ctrl+H for help menu
right-side menu format string
disp_histogram ■ histogram element character
disp_histolen 50 width of histogram column
disp_canvas_charset
⠀⠁⠂⠃⠄⠅⠆⠇⠈⠉⠊⠋⠌⠍⠎⠏⠐⠑⠒⠓⠔⠕⠖⠗⠘⠙⠚⠛⠜⠝⠞⠟⠠⠡⠢⠣⠤⠥⠦⠧⠨⠩⠪⠫⠬⠭⠮⠯⠰⠱⠲⠳⠴⠵⠶⠷⠸⠹⠺⠻⠼⠽⠾⠿⡀⡁⡂⡃⡄⡅⡆⡇⡈⡉⡊⡋⡌⡍⡎⡏⡐⡑⡒⡓⡔⡕⡖⡗⡘⡙⡚⡛⡜⡝⡞⡟⡠⡡⡢⡣⡤⡥⡦⡧⡨⡩⡪⡫⡬⡭⡮⡯⡰⡱⡲⡳⡴⡵⡶⡷⡸⡹⡺⡻⡼⡽⡾⡿⢀⢁⢂⢃⢄⢅⢆⢇⢈⢉⢊⢋⢌⢍⢎⢏⢐⢑⢒⢓⢔⢕⢖⢗⢘⢙⢚⢛⢜⢝⢞⢟⢠⢡⢢⢣⢤⢥⢦⢧⢨⢩⢪⢫⢬⢭⢮⢯⢰⢱⢲⢳⢴⢵⢶⢷⢸⢹⢺⢻⢼⢽⢾⢿⣀⣁⣂⣃⣄⣅⣆⣇⣈⣉⣊⣋⣌⣍⣎⣏⣐⣑⣒⣓⣔⣕⣖⣗⣘⣙⣚⣛⣜⣝⣞⣟⣠⣡⣢⣣⣤⣥⣦⣧⣨⣩⣪⣫⣬⣭⣮⣯⣰⣱⣲⣳⣴⣵⣶⣷⣸⣹⣺⣻⣼⣽⣾⣿
Expand Down
25 changes: 25 additions & 0 deletions visidata/man/visidata.1
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,31 @@ status indicator for paused replay
.It Sy "color_status_replay" No "green"
color of replay status indicator
.It Sy "disp_histogram " No "*"
.It Sy "disp_formatter " No "generic"
formatter to use for display and saving
.It Sy "disp_menu " No "True"
show menu on top line when not active
.It Sy "disp_menu_keys " No "True"
show keystrokes inline in submenus
.It Sy "color_menu " No "black on 110 cyan"
color of menu items in general
.It Sy "color_menu_active " No "223 yellow on black"
color of active menu items
.It Sy "color_menu_spec " No "black on 34 green"
color of sheet-specific menu items
.It Sy "color_menu_help " No "black italic on 110 cyan"
color of helpbox
.It Sy "disp_menu_boxchars " No "\[u2502]\[u2502]\[u2500]\[u2500]\[u250C]\[u2510]\[u2514]\[u2518]\[u251C]\[u2524]"
box characters to use for menus
.It Sy "disp_menu_more " No "\[u00BB]"
command submenu indicator
.It Sy "disp_menu_push " No "\[u2398]"
indicator if command pushes sheet onto sheet stack
.It Sy "disp_menu_input " No "\[u2026]"
indicator if input required for command
.It Sy "disp_menu_fmt " No "Ctrl+H for help menu"
right-side menu format string
.It Sy "disp_histogram " No "\[u25A0]"
histogram element character
.It Sy "disp_histolen " No "50"
width of histogram column
Expand Down

0 comments on commit 6f11296

Please sign in to comment.