mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error reporting in the diff kitten

Browse Source
This commit is contained in:
Kovid Goyal
2018-05-19 22:51:02 +05:30
parent fb57653665
commit 67c0942e01
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kittens/diff/main.py
View File

@@ -406,6 +406,7 @@ def main(args):
if loop.return_code != 0: if loop.return_code != 0:
if handler.report_traceback_on_exit: if handler.report_traceback_on_exit:
print(handler.report_traceback_on_exit, file=sys.stderr) print(handler.report_traceback_on_exit, file=sys.stderr)
input('Press Enter to quit.')
raise SystemExit(loop.return_code) raise SystemExit(loop.return_code)

2
kittens/diff/patch.py
View File

@@ -225,7 +225,7 @@ class Differ:
patch = parse_patch(output) patch = parse_patch(output)
except Exception: except Exception:
import traceback import traceback
return traceback.format_exc() + '\nParsing diff for {} vs. {} failed'.format(key[0], key[1]) return traceback.format_exc() + '\nParsing diff for {} vs. {} failed'.format(left_path, right_path)
else: else:
ans[key] = patch ans[key] = patch
return ans return ans