ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

Update pip install commands to workaround new pip resolver

Browse source 
- lscolors dependency is now a package containing the LSCOLORS
  database and the path_colored function.
- The new pip dependency resolver finds a conflict with fill3 and
  lscolors both depending on termstr, eventhough its the same
  version of termstr??
This commit is contained in:
Andrew Hamilton 2022-05-11 23:04:41 +10:00
parent 41120f7e81
commit 8ed82c768b
6 changed files with 14 additions and 828 deletions
Download patch file Download diff file Expand all files Collapse all files

8
diff_edit/__init__.py
View file

@ -83,10 +83,10 @@ def replace_part(a_str, start, end, part):
@functools.lru_cache(maxsize=500)
def highlight_modification(a_lines, b_lines, show_sub_highlights):
blue = termstr.Color.blue
left_line = fill3.join("\n", tuple(colored_line[:len(line)]
for line, colored_line in zip(*a_lines)))
right_line = fill3.join("\n", tuple(colored_line[:len(line)]
for line, colored_line in zip(*b_lines)))
left_line = termstr.join("\n", tuple(colored_line[:len(line)]
for line, colored_line in zip(*a_lines)))
right_line = termstr.join("\n", tuple(colored_line[:len(line)]
for line, colored_line in zip(*b_lines)))
if show_sub_highlights:
diff = line_diff(left_line.data, right_line.data)
for opcode, left_start, left_end, right_start, right_end in diff: