KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2018-04-25 19:50:40 +05:30
parent 0be0963dc7
commit d54b58d2f3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kittens/diff/collect.py
View File

@ -103,6 +103,12 @@ def data_for_path(path):
return ans return ans
@lru_cache(maxsize=1024)
def lines_for_path(path):
data = data_for_path(path)
return data.splitlines()
@lru_cache(maxsize=1024) @lru_cache(maxsize=1024)
def hash_for_path(path): def hash_for_path(path):
md5(data_for_path(path)).digest() md5(data_for_path(path)).digest()

15
kittens/diff/render.py
View File

@ -7,7 +7,7 @@ from gettext import gettext as _
from kitty.fast_data_types import truncate_point_for_length from kitty.fast_data_types import truncate_point_for_length
from .collect import data_for_path, path_name_map from .collect import data_for_path, lines_for_path, path_name_map
from .config import formats from .config import formats
@ -111,10 +111,15 @@ def split_to_size(line, width):
def lines_for_diff(left_path, right_path, hunks, args, columns, margin_size): def lines_for_diff(left_path, right_path, hunks, args, columns, margin_size):
available_cols = columns // 2 - margin_size raise NotImplementedError('TODO')
for hunk_num, hunk in enumerate(hunks): lines_for_path()
for line_num, (left, right) in enumerate(zip(hunk.left_lines, hunk.right_lines)): # available_cols = columns // 2 - margin_size
pass #
# for hunk_num, hunk in enumerate(hunks):
# for line_num, (left, right) in enumerate(zip(hunk.left_lines, hunk.right_lines)):
# left_line_number, left_is_
# left_line = lines_for_path(left_path)[
# left_lines, right_lines = list(split_to_size(left_line, available_cols)), list(split_to_size(
def render_diff(collection, diff_map, args, columns): def render_diff(collection, diff_map, args, columns):