encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

diff.py: show .o names in column headers (#70)

Browse Source 
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Erin Moon
2021-01-06 20:42:06 -05:00
committed by GitHub
co-authored by Pheenoh
parent 6d946e8330
commit 6f2c187418
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diff.py
+17 -5
View File
@@ -2,6 +2,7 @@
# PYTHON_ARGCOMPLETE_OK # PYTHON_ARGCOMPLETE_OK
import argparse import argparse
import sys import sys
from pathlib import Path, PurePath
from typing import ( from typing import (
Any, Any,
Dict, Dict,
@@ -1316,9 +1317,12 @@ def chunk_diff(diff: List[OutputLine]) -> List[Union[List[OutputLine], OutputLin
chunks.append(cur_right) chunks.append(cur_right)
return chunks return chunks
def elide_path(p: Path) -> PurePath:
return PurePath(p.parts[0]) / '...' / PurePath(p.parts[-1])
def format_diff( def format_diff(
old_diff: List[OutputLine], new_diff: List[OutputLine] old_diff: List[OutputLine], new_diff: List[OutputLine],
base_obj_path: Optional[Path] = None, ref_obj_path: Optional[Path] = None
) -> Tuple[str, List[str]]: ) -> Tuple[str, List[str]]:
old_chunks = chunk_diff(old_diff) old_chunks = chunk_diff(old_diff)
new_chunks = chunk_diff(new_diff) new_chunks = chunk_diff(new_diff)
@@ -1362,7 +1366,7 @@ def format_diff(
for (base, old, new) in output for (base, old, new) in output
] ]
else: else:
header_line = "" header_line = f'{elide_path(base_obj_path)}'.ljust(width) + f' {elide_path(ref_obj_path)}'.ljust(width)
diff_lines = [ diff_lines = [
ansi_ljust(base, width) + new.fmt2 ansi_ljust(base, width) + new.fmt2
for (base, old, new) in output for (base, old, new) in output
@@ -1454,12 +1458,18 @@ class Display:
ready_queue: "queue.Queue[None]" ready_queue: "queue.Queue[None]"
watch_queue: "queue.Queue[Optional[float]]" watch_queue: "queue.Queue[Optional[float]]"
less_proc: "Optional[subprocess.Popen[bytes]]" less_proc: "Optional[subprocess.Popen[bytes]]"
base_obj_path: Optional[Path]
ref_obj_path: Optional[Path]
def __init__(self, basedump: str, mydump: str) -> None: def __init__(self, basedump: str, mydump: str,
base_obj_path: Optional[Path] = None,
ref_obj_path: Optional[Path] = None) -> None:
self.basedump = basedump self.basedump = basedump
self.mydump = mydump self.mydump = mydump
self.emsg = None self.emsg = None
self.last_diff_output = None self.last_diff_output = None
self.base_obj_path = base_obj_path
self.ref_obj_path = ref_obj_path
def run_less(self) -> "Tuple[subprocess.Popen[bytes], subprocess.Popen[bytes]]": def run_less(self) -> "Tuple[subprocess.Popen[bytes], subprocess.Popen[bytes]]":
if self.emsg is not None: if self.emsg is not None:
@@ -1469,7 +1479,7 @@ class Display:
last_diff_output = self.last_diff_output or diff_output last_diff_output = self.last_diff_output or diff_output
if args.threeway != "base" or not self.last_diff_output: if args.threeway != "base" or not self.last_diff_output:
self.last_diff_output = diff_output self.last_diff_output = diff_output
header, diff_lines = format_diff(last_diff_output, diff_output) header, diff_lines = format_diff(last_diff_output, diff_output, self.base_obj_path, self.ref_obj_path)
header_lines = [header] if header else [] header_lines = [header] if header else []
output = "\n".join(header_lines + diff_lines[args.skip_lines :]) output = "\n".join(header_lines + diff_lines[args.skip_lines :])
@@ -1575,7 +1585,9 @@ def main() -> None:
mydump = run_objdump(mycmd) mydump = run_objdump(mycmd)
display = Display(basedump, mydump) base_obj_path = Path(basecmd[1])
ref_obj_path = Path(mycmd[1])
display = Display(basedump, mydump, base_obj_path, ref_obj_path)
if not args.watch: if not args.watch:
display.run_sync() display.run_sync()