From 67c0942e0140c35dd72faf531e2adc64b678501d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 May 2018 22:51:02 +0530 Subject: [PATCH] Fix error reporting in the diff kitten --- kittens/diff/main.py | 1 + kittens/diff/patch.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kittens/diff/main.py b/kittens/diff/main.py index 38641be1b..909d0147a 100644 --- a/kittens/diff/main.py +++ b/kittens/diff/main.py @@ -406,6 +406,7 @@ def main(args): if loop.return_code != 0: if handler.report_traceback_on_exit: print(handler.report_traceback_on_exit, file=sys.stderr) + input('Press Enter to quit.') raise SystemExit(loop.return_code) diff --git a/kittens/diff/patch.py b/kittens/diff/patch.py index 3f7a89b38..4825a5241 100644 --- a/kittens/diff/patch.py +++ b/kittens/diff/patch.py @@ -225,7 +225,7 @@ class Differ: patch = parse_patch(output) except Exception: 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: ans[key] = patch return ans