diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/gpu_snake.py | 103 | ||||
| -rw-r--r-- | test/gpu_snake_interaction.py | 119 | ||||
| -rw-r--r-- | test/gpu_upgrade.py | 109 | ||||
| -rw-r--r-- | test/real_zls.py | 168 | ||||
| -rw-r--r-- | test/snapshots/pagercolor.golden | 4 |
5 files changed, 501 insertions, 2 deletions
diff --git a/test/gpu_snake.py b/test/gpu_snake.py new file mode 100644 index 00000000..430cabe9 --- /dev/null +++ b/test/gpu_snake.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python3 +"""GPU snake pixels and frame timings in a private GUI session. + +python3 test/gpu_snake.py BINARY ADDON OUTPUT [--text] [--crt] +The output keeps pixels, timings, and logs; no installed session is touched. +""" +import argparse +import json +import os +from pathlib import Path +import statistics +import subprocess +import time +from ninep import Client + +def wait(check, timeout=15): + until = time.monotonic() + timeout + while time.monotonic() < until: + value = check() + if value: + return value + time.sleep(0.02) + raise TimeoutError('GUI did not reach the expected state') + +def run(binary, addon, root, text=False, crt=False): + root.mkdir(parents=True, exist_ok=True, mode=0o700) + root.chmod(0o700) + config = root / 'config/pardes' + config.mkdir(parents=True, exist_ok=True) + (config / 'init').write_text('Shell /bin/sh\nTheme orchard\n') + fixture = root / 'fixture.txt' + fixture.write_text(''.join((f'line {i:05d}: a reproducible scrolling fixture\n' for i in range(10000)))) + demo = root / 'demo.txt' + if text: + demo.write_text('500 phase scroll\n500 120x16 wheel 1\n2600 120x16 wheel -1\n4800 end\n') + else: + demo.write_text(f'100 exec Addon load {addon}\n200 exec SnakeShader\n500 phase snake\n500 180x16 key r\n3600 end\n') + env = {k: v for k, v in os.environ.items() if not k.startswith('PARDES_')} + env.update(HOME=str(root), XDG_RUNTIME_DIR=str(root), XDG_CONFIG_HOME=str(root / 'config'), PARDES_TEST='1', PARDES_TEST_CAPTURE_DIR=str(root), PARDES_TEST_COLS='100', PARDES_TEST_ROWS='30', SDL_VIDEO_DRIVER='offscreen', PARDES_FRAMES=str(root / 'frames.tsv'), PARDES_FRAMES_DEMO=str(demo)) + with (root / 'stderr.log').open('w') as log: + child = subprocess.Popen([str(binary), '--9p=gpu', str(fixture)], env=env, cwd=root, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=log, start_new_session=True) + try: + socket = root / '9p/pardes/gpu' + wait(lambda: socket.exists() or child.poll() is not None) + if child.poll() is not None: + raise AssertionError((child.returncode, (root / 'stderr.log').read_text())) + with Client(socket) as client: + wait(lambda: (root / 'latest.ppm').exists()) + if not text: + wait(lambda: b'snake_shader' in client.read('/index')) + time.sleep(0.4) + (root / 'snake.ppm').write_bytes((root / 'latest.ppm').read_bytes()) + (root / 'index.txt').write_bytes(client.read('/index')) + child.wait(timeout=20) + assert child.returncode == 0, (child.returncode, (root / 'stderr.log').read_text()) + finally: + if child.poll() is None: + child.terminate() + child.wait(timeout=10) + child.stdin.close() + rows = [] + for line in (root / 'frames.tsv').read_text().splitlines(): + if not line or line.startswith('#'): + continue + values = list(map(float, line.split())) + if values[0] >= 500: + rows.append(values) + assert len(rows) >= 20, len(rows) + work = sorted((sum(row[1:4]) for row in rows)) + result = {'frames': len(rows), 'median_work_us': statistics.median(work), 'p95_work_us': work[int(len(work) * 0.95)], 'max_work_us': max(work), 'over_16ms': sum((v > 16667 for v in work))} + if not text: + from PIL import Image + im = Image.open(root / 'snake.ppm').convert('RGB') + green = sum((g > 90 and g > r * 1.7 and (g > b * 1.2) for r, g, b in im.get_flattened_data())) + orange = sum((r > 110 and r > g * 1.5 and (g > b * 1.5) for r, g, b in im.get_flattened_data())) + assert green > 300 and orange > 50, (green, orange) + result.update(green_pixels=green, orange_pixels=orange) + if crt: + pixels = list(im.get_flattened_data()) + triads = scanlines = 0 + for y in range(im.height // 2, im.height - 4): + for x in range(im.width - 3): + at = y * im.width + x + r, g, b = pixels[at:at + 3] + if min(r + g + b) < 8: + continue + if r[0] > g[0] * 1.8 and g[1] > r[1] * 1.8 and b[2] > g[2] * 1.8: + triads += 1 + rows = [pixels[at + 1 + dy * im.width][1] for dy in range(4)] + scanlines += max(rows) > min(rows) * 1.3 + assert triads > 100 and scanlines > 100, (triads, scanlines) + result.update(rgb_triads=triads, scanline_patches=scanlines) + (root / 'result.json').write_text(json.dumps(result, indent=2) + '\n') + print(json.dumps(result), flush=True) +if __name__ == '__main__': + p = argparse.ArgumentParser(description=__doc__) + p.add_argument('binary', type=Path) + p.add_argument('addon', type=Path) + p.add_argument('output', type=Path) + p.add_argument('--text', action='store_true') + p.add_argument('--crt', action='store_true', help='also require the RGB triads and scanline modulation') + a = p.parse_args() + run(a.binary.resolve(), a.addon.resolve(), a.output.resolve(), a.text, a.crt) diff --git a/test/gpu_snake_interaction.py b/test/gpu_snake_interaction.py new file mode 100644 index 00000000..a3e5b2b4 --- /dev/null +++ b/test/gpu_snake_interaction.py @@ -0,0 +1,119 @@ +#!/usr/bin/env python3 +"""Check snake v1 migration, resize, hover and idle animation in a private GUI.""" +import argparse +import io +import json +import os +from pathlib import Path +import subprocess +import time +from PIL import Image, ImageChops, ImageStat +from ninep import Client +from gpu_snake import wait +from daemon import install, processes + +parser = argparse.ArgumentParser(description=__doc__) +for name in ['binary', 'old_addon', 'new_addon', 'output']: + parser.add_argument(name, type=Path) +args = parser.parse_args() +root = args.output.resolve() +root.mkdir(parents=True, mode=0o700) +(root / 'config/pardes').mkdir(parents=True) +(root / 'config/pardes/init').write_text('Shell /bin/bash\nMessageLinger 0\n') +addon = root / 'snake.so' +install(args.old_addon.resolve(), addon) +env = {k: v for k, v in os.environ.items() if not k.startswith('PARDES_')} +env.pop('XDG_DATA_HOME', None) +env.update(HOME=str(root), XDG_RUNTIME_DIR=str(root), XDG_CONFIG_HOME=str(root / 'config'), + PARDES_TEST='1', PARDES_TEST_CAPTURE_DIR=str(root), PARDES_TEST_COLS='100', + PARDES_TEST_ROWS='30', SDL_VIDEO_DRIVER='offscreen', PARDES_DAEMON='on') +log = (root / 'stderr.log').open('w') +p = subprocess.Popen([str(args.binary.resolve()), '--9p=snake'], cwd=root, env=env, + stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=log, start_new_session=True) +client = None +try: + sock = root / '9p/pardes/snake' + wait(sock.exists) + client = Client(sock) + text = int(client.read('/pane/new')) + client.write(f'/pane/{text}/body', b'unsaved text preserved\n') + shells = wait(lambda: [line for line in client.read('/sessions').splitlines() if line.startswith(b'shell ')]) + + def execute(word): + client.write(f'/pane/{text}/exec', (word + '\n').encode()) + + execute(f'Addon load {addon}') + execute('SnakeShader') + client.write('/focus', str(text).encode()) + snake = int(next(line.split()[0] for line in client.read('/index').splitlines() + if line.split()[1] == b'snake_shader')) + + def body(): + return client.read(f'/pane/{snake}/body').splitlines() + + state = body()[:4] + install(args.new_addon.resolve(), addon) + execute('Addon reload snake_shader') + wait(lambda: len(body()) == 6) + assert body()[:4] == state, body() + time.sleep(.2) + board = body()[4] + execute('Addon reload snake_shader') + time.sleep(.2) + assert body()[:4] == state and body()[4] == board, body() + + screen = json.loads(client.read('/screen')) + rows = [''.join(cell[0] for cell in screen['cells'][i:i + screen['cols']]) + for i in range(0, len(screen['cells']), screen['cols'])] + tag = next(i for i, row in enumerate(rows) if 'SnakeShader' in row) + bottom = next((i for i in range(tag + 1, len(rows)) if ' Collapse ' in rows[i]), len(rows)) + + def capture(name): + stamp = (root / 'latest.ppm').stat().st_mtime_ns + wait(lambda: (root / 'latest.ppm').stat().st_mtime_ns > stamp) + im = Image.open(io.BytesIO((root / 'latest.ppm').read_bytes())).convert('RGB') + im.save(root / (name + '.png')) + return im.crop((0, (tag + 1) * im.height // screen['rows'], im.width, bottom * im.height // screen['rows'])) + + a = capture('idle-a') + time.sleep(.25) + b = capture('idle-b') + idle_change = sum(ImageStat.Stat(ImageChops.difference(a, b)).mean) + assert 0 < idle_change < 2, idle_change + assert body()[:4] == state, body() + client.write('/mousein', f'm 10 {tag + 4} 0\n'.encode()) + wait(lambda: body()[5] != b'hover -1 -1') + hovered = capture('hover') + hover_change = sum(ImageStat.Stat(ImageChops.difference(b, hovered)).mean) + assert hover_change > idle_change, (hover_change, idle_change) + client.write('/mousein', b'm 0 0 0\n') + wait(lambda: body()[5] == b'hover -1 -1') + execute('Newcol') + wait(lambda: body()[4] != board) + assert body()[:4] == state, body() + assert client.read(f'/pane/{text}/body') == b'unsaved text preserved\n' + assert [line for line in client.read('/sessions').splitlines() if line.startswith(b'shell ')] == shells + result = {'state': [line.decode() for line in state], 'before': board.decode(), + 'after': body()[4].decode(), 'idle_pixel_change': idle_change, 'hover_pixel_change': hover_change} + (root / 'result.json').write_text(json.dumps(result, indent=2) + '\n') + print('PASS: migration, reload, resize, hover, idle animation, text and shells', result, flush=True) +except Exception: + if client: + for path in ['/addons', '/log', '/index']: + print(path, client.read(path).decode(), flush=True) + if 'snake' in globals(): + print('game', body(), flush=True) + raise +finally: + if client: + client.socket.close() + if p.poll() is None: + p.kill() + p.wait(timeout=10) + for pid in processes(root): + try: + os.kill(pid, 9) + except ProcessLookupError: + pass + p.stdin.close() + log.close() diff --git a/test/gpu_upgrade.py b/test/gpu_upgrade.py new file mode 100644 index 00000000..bb07e29b --- /dev/null +++ b/test/gpu_upgrade.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python3 +"""Check upgrade, reload, multiple GPU panes and a remote view in isolation.""" +import os +import time +import subprocess +from pathlib import Path +from ninep import Client +from gpu_snake import wait +from daemon import install, processes +import argparse +parser = argparse.ArgumentParser(description='Upgrade, addon reload and GPU replica checks in an isolated session') +for name in ['old', 'new', 'legacy', 'shader', 'output']: + parser.add_argument(name, type=Path) +args = parser.parse_args() +root = args.output.resolve() +root.mkdir(parents=True, exist_ok=True, mode=0o700) +root.chmod(0o700) +print(root, flush=True) +(root / 'config/pardes').mkdir(parents=True) +(root / 'bin').mkdir() +(root / 'config/pardes/init').write_text('Shell /bin/bash\nMessageLinger 0\n') +binary = root / 'bin/pardes-gui' +install(args.old.resolve(), binary) +env = {k: v for k, v in os.environ.items() if not k.startswith('PARDES_')} +env.pop('XDG_DATA_HOME', None) +env.update(HOME=str(root), XDG_RUNTIME_DIR=str(root), XDG_CONFIG_HOME=str(root / 'config'), PARDES_TEST='1', PARDES_TEST_CAPTURE_DIR=str(root), SDL_VIDEO_DRIVER='offscreen', PARDES_DAEMON='on') +log = (root / 'stderr.log').open('w') +p = subprocess.Popen([str(binary), '--9p=upgrade'], env=env, cwd=root, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=log, start_new_session=True) +c = None +replica = None +try: + sock = root / '9p/pardes/upgrade' + wait(sock.exists) + c = Client(sock) + print('started', p.pid, flush=True) + initial = c.read('/index').decode() + shell = int(next((l.split()[0] for l in initial.splitlines() if l.split()[1] == 'term'))) + term_before = wait(lambda: [l for l in c.read('/sessions').splitlines() if l.startswith(b'shell ')]) + print('shells', term_before, flush=True) + text = int(c.read('/pane/new')) + c.write(f'/pane/{text}/body', b'unsaved text preserved\n') + c.write(f'/pane/{text}/exec', ('Addon load ' + str(args.legacy.resolve()) + '\n').encode()) + c.write(f'/pane/{text}/exec', b'Snake\n') + c.write('/focus', str(text).encode()) + time.sleep(0.1) + snake = int(next((l.split()[0] for l in c.read('/index').decode().splitlines() if l.split()[1] == 'snake'))) + state = c.read(f'/pane/{snake}/body') + install(args.new.resolve(), binary) + mark = time.time() + c.write(f'/pane/{text}/exec', b'Upgrade\n') + c.socket.close() + c = None + + def connect(): + try: + q = Client(sock) + if q.read(f'/pane/{text}/body') == b'unsaved text preserved\n': + return q + q.socket.close() + except (OSError, EOFError): + return None + wait(lambda: os.stat(f'/proc/{p.pid}/exe').st_ino == binary.stat().st_ino, 30) + c = wait(connect, 30) + wait(lambda: (root / 'latest.ppm').stat().st_mtime > mark, 30) + assert c.read('/status').startswith(f'pid {p.pid}\n'.encode()) + assert [l for l in c.read('/sessions').splitlines() if l.startswith(b'shell ')] == term_before + c.write(f'/pane/{text}/exec', ('Addon load ' + str(args.legacy.resolve()) + '\n').encode()) + assert c.read(f'/pane/{snake}/body') == state + c.write(f'/pane/{text}/exec', ('Addon load ' + str(args.shader.resolve()) + '\n').encode()) + c.write(f'/pane/{text}/exec', b'SnakeShader\n') + c.write('/focus', str(text).encode()) + time.sleep(0.1) + shader = int(next((l.split()[0] for l in c.read('/index').decode().splitlines() if l.split()[1] == 'snake_shader'))) + state = c.read(f'/pane/{shader}/body') + c.write(f'/pane/{text}/exec', b'Addon reload snake_shader\n') + assert c.read(f'/pane/{shader}/body') == state + resized = time.time() + c.write(f'/pane/{text}/exec', b'Newcol\n') + c.write(f'/pane/{text}/exec', b'SnakeShader\n') + c.write('/focus', str(text).encode()) + assert sum(line.split()[1] == b'snake_shader' for line in c.read('/index').splitlines()) == 2 + wait(lambda: (root / 'latest.ppm').stat().st_mtime > resized) + c.remove(f'/pane/{shader}') + caps = root / 'replica' + caps.mkdir() + renv = dict(env, PARDES_TEST_CAPTURE_DIR=str(caps)) + rlog = (root / 'replica.log').open('w') + replica = subprocess.Popen([str(binary), '--attach=upgrade'], env=renv, cwd=root, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=rlog, start_new_session=True) + wait(lambda: (caps / 'latest.ppm').exists(), 20) + time.sleep(0.4) + from PIL import Image + im = Image.open(caps / 'latest.ppm').convert('RGB') + green = sum((g > 65 and g > r * 1.7 and (g > b * 1.2) for r, g, b in im.get_flattened_data())) + assert green > 300, green + print('PASS: same pid, shell, unsaved text and snake state; shader reload/resize/close; replica GPU pixels', green, flush=True) + (root / 'result.txt').write_text('PASS: upgrade preserves pid, shell, text and snake; shader reload/resize/close; replica GPU pixels=' + str(green) + '\n') +finally: + if c: + c.socket.close() + for child in [replica, p]: + if child and child.poll() is None: + child.kill() + child.wait(timeout=10) + for pid in processes(root): + try: + os.kill(pid, 9) + except ProcessLookupError: + pass + log.close() diff --git a/test/real_zls.py b/test/real_zls.py new file mode 100644 index 00000000..74f7cd04 --- /dev/null +++ b/test/real_zls.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python3 +"""Real ZLS through Pardes: desktop PATH, imports, hover, references and editing. + +python3 -B test/real_zls.py GUI_BINARY ZLS_BINARY OUTPUT_DIRECTORY +Uses a private HOME and a project with spaces in its path; needs Zig on PATH. +""" +import argparse +import json +import os +from pathlib import Path +import shutil +import struct +import subprocess +from ninep import Client +from gpu_snake import wait +from daemon import processes + +parser = argparse.ArgumentParser(description=__doc__) +for arg in ['binary', 'zls', 'output']: + parser.add_argument(arg, type=Path) +args = parser.parse_args() +root = args.output.resolve() +root.mkdir(parents=True, mode=0o700) +(root / '.local/bin').mkdir(parents=True) +(root / '.local/bin/zls').symlink_to(args.zls.resolve()) +(root / 'desktop-bin').mkdir() +zig = shutil.which('zig') +assert zig, 'Zig must be on PATH' +(root / 'desktop-bin/zig').symlink_to(Path(zig).resolve()) +(root / 'config/pardes').mkdir(parents=True) +(root / 'config/pardes/init').write_text('Shell /bin/bash\nMessageLinger 0\n') +project = root / 'project with spaces' +project.mkdir() +(project / 'build.zig').write_text('''const std = @import("std"); +pub fn build(b: *std.Build) void { + const target = b.standardTargetOptions(.{}); + const helper = b.addModule("helper", .{ .root_source_file = b.path("helper.zig"), .target = target }); + const exe = b.addExecutable(.{ .name = "fixture", .root_module = b.createModule(.{ + .root_source_file = b.path("main.zig"), .target = target, + .imports = &.{.{ .name = "helper", .module = helper }}, + }) }); + b.installArtifact(exe); +} +''') +(project / 'helper.zig').write_text('''/// Double a number. +pub fn double(x: u32) u32 { return x * 2; } +pub fn triple(x: u32) u32 { return x * 3; } +''') +(project / 'local file.zig').write_text('pub const answer: u32 = 42;\n') +source = '''const std = @import("std"); +const local = @import("local file.zig"); +const helper = @import("helper"); +pub fn main() void { + _ = std.mem.len("hello"); + _ = local.answer; + _ = helper.double(21); +} +pub fn broken() void { const unused_local: u32 = 7; } +pub fn broken_too() void { const unused_other: u32 = 8; } +''' +(project / 'main.zig').write_text(source) +env = {k: v for k, v in os.environ.items() if not k.startswith('PARDES_')} +env.pop('XDG_DATA_HOME', None) +env.update(HOME=str(root), PATH=str(root / 'desktop-bin') + ':/usr/bin:/bin', XDG_RUNTIME_DIR=str(root), + XDG_CONFIG_HOME=str(root / 'config'), XDG_CACHE_HOME=str(root / 'cache'), + PARDES_TEST='1', PARDES_TEST_ROWS='60', PARDES_TEST_CAPTURE_DIR=str(root), SDL_VIDEO_DRIVER='offscreen', PARDES_DAEMON='on') +log = (root / 'stderr.log').open('w') +p = subprocess.Popen([str(args.binary.resolve()), '--9p=zls', str(project / 'main.zig')], + env=env, cwd=project, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, + stderr=log, start_new_session=True) +c = None +passed = [] +try: + sock = root / '9p/pardes/zls' + wait(lambda: sock.exists() or p.poll() is not None) + assert p.poll() is None, (root / 'stderr.log').read_text() + c = Client(sock, timeout=40) + main = int(next(line.split()[0] for line in c.read('/index').splitlines() if b'/main.zig ' in line)) + + def execute(word): + fid = c.open(f'/pane/{main}/exec', 2) + try: + data = (word + '\n').encode() + c.rpc(118, struct.pack('<IQI', fid, 0, len(data)) + data) + answer = c.read_fid(fid).decode().strip() + return c.read('/pane/' + answer + '/body').decode() if answer.isdigit() else '' + finally: + c.close(fid) + + def at(needle, offset=0, text=source): + pos = text.index(needle) + offset + c.write('/focus', str(main).encode()) + c.write(f'/pane/{main}/addr', f'#{pos},#{pos}'.encode()) + c.write(f'/pane/{main}/ctl', b'dot=addr\n') + + def result(suffix, contains=''): + for line in reversed(c.read('/index').splitlines()): + if ('/' + suffix + ' ').encode() in line: + body = c.read('/pane/' + line.split()[0].decode() + '/body').decode() + if contains in body: + return body + return '' + + def definition(needle, offset, ending): + at(needle, offset) + execute('Def') + focus = c.read('/focus').decode().strip() + target = c.read('/pane/' + focus + '/name').decode().strip() + assert target.endswith(ending), (needle, target) + passed.append('definition: ' + needle) + + definition('@import("helper")', 11, '/helper.zig') + definition('@import("std")', 10, '/std/std.zig') + definition('@import("local file.zig")', 12, '/local file.zig') + definition('helper.double', 9, '/helper.zig') + definition('std.mem.len', 9, '/std/mem.zig') + at('helper.double', 9) + hover = execute('Hover') + assert 'Double a number' in hover, hover + passed.append('hover: imported function documentation') + refs = execute('Refs') + assert 'main.zig:' in refs and 'helper.zig:' in refs, refs + passed.append('references: across imported files') + at('local.answer', 8) + rename = execute('Rename renamed_answer') + assert 'renamed_answer' in rename and 'local file.zig:' in rename and 'main.zig:' in rename, rename + passed.append('rename: cross-file preview without changing disk files') + + def diagnostics(): + execute('Diagnostics') + rows = result('+Search', 'Diagnostics ') + return 'main.zig:9:' in rows and 'main.zig:10:' in rows + wait(diagnostics, 20) + passed.append('diagnostics: unused local constant') + partial = source.replace('helper.double(21)', 'helper.') + c.write(f'/pane/{main}/body', partial.encode(), truncate=True) + assert c.read(f'/pane/{main}/body').decode() == partial + at('helper.;', len('helper.'), partial) + c.write('/kbdin', b'i\t') + wait(lambda: 'triple' in result('+Search', 'double')) + passed.append('completion: imported module members in unsaved text') + c.write('/kbdin', b'\x1b') + c.write(f'/pane/{main}/body', source.encode(), truncate=True) + info = execute('Lspinfo') + assert 'zls ready' in info and str(project) in info, info + assert (project / 'main.zig').read_text() == source + assert (project / 'local file.zig').read_text() == 'pub const answer: u32 = 42;\n' + (root / 'lspinfo.txt').write_text(info) + (root / 'result.json').write_text(json.dumps(passed, indent=2) + '\n') + print('PASS:', '; '.join(passed), flush=True) +except Exception: + if c: + print(c.read('/log').decode()[-4000:], flush=True) + print('checks passed:', passed, '\nlast results:', result('+Search'), flush=True) + raise +finally: + if c: + c.socket.close() + if p.poll() is None: + p.kill() + p.wait(timeout=10) + for pid in processes(root): + try: + os.kill(pid, 9) + except ProcessLookupError: + pass + p.stdin.close() + log.close() diff --git a/test/snapshots/pagercolor.golden b/test/snapshots/pagercolor.golden index 9f7f0738..4db82eea 100644 --- a/test/snapshots/pagercolor.golden +++ b/test/snapshots/pagercolor.golden @@ -99,7 +99,7 @@ |6: 3[m\n\033[1m+++ b/x\033[m\n\033[36m@@ -1 +1 @@\033[m\n\033[31m-old\033[m\n\033[32m+new\033[m\n' | |7: $(readlink /proc/$PPID/exe) - |8: $ -|9: /tmp/pardes-snap/pagercolor/cwd/+Diff Save Term Diff Collapse LocationsConfig Del +|9: /tmp/pardes-snap/pagercolor/cwd/+Diff-0123abc Save Term Diff Collapse LocationsConfig Del |10: commit 0123abc |11: x:1 |12: -old @@ -116,7 +116,7 @@ |6: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410, |7: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410, |8: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410, -|9: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-39 #d3b0d9,#1d2824, 40-99 #b2c3b8,#1d2824, +|9: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-47 #d3b0d9,#1d2824, 48-99 #b2c3b8,#1d2824, |10: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410, |11: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #59675c,#0d1410, |12: 0-0 d,#608269, 1-1 d,#0d1410, 2-2 #f1a39b,#1a1d18,b 3-99 #f8c082,#1a1d18, |
