Scrollable diff about icdiff

[jeffkaufman]

Does piping the output into less -R do what you want?

[FloWi]

More or less ;-)

Works great for an overview.

But for larger diff's, it is necessary to let icdiff finish its streaming to less - otherwise I get a lot of exceptions from icdiff due to its broken pipe when I quit less.

close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
#--------------------------------------------
# multiple times
#--------------------------------------------
Traceback (most recent call last):
  File "/home/flwi/bin/icdiff/icdiff", line 531, in <module>
    lines_a, lines_b, headers[0], headers[1], context=(not options.whole_file), numlines=int(options.numlines)))
IOError: [Errno 32] Broken pipe
#--------------------------------------------
# multiple times
#--------------------------------------------
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
#--------------------------------------------
# multiple times
#--------------------------------------------
Traceback (most recent call last):
  File "/home/flwi/bin/icdiff/icdiff", line 531, in <module>
    lines_a, lines_b, headers[0], headers[1], context=(not options.whole_file), numlines=int(options.numlines)))
IOError: [Errno 32] Broken pipe

[yamalight]

yes, this please!
broken pipe errors with less are a bit annoying.

[jeffkaufman]

4228d6c fixes the broken pipe errors.

Is that enough or do we still want an integrated pager?

[yamalight]

still get following errors if I run icdiff as git difftool, pipe it to less and quit less before git passes all the files (so git difftool --no-prompt --extcmd icdiff | less for repo that has 4 relatively large changed files then q right away):

close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr

[jeffkaufman]

@yamalight I haven't been able to reproduce the error you're seeing. It looks like http://stackoverflow.com/questions/12790328/how-to-silence-sys-excepthook-is-missing-error though, which isn't promising?

[yamalight]

@jeffkaufman yep, that's it. tried the solution provided in last reply, added sys.stdout.flush() to icdiff on line 532 - and it actually worked OK for me.

[jeffkaufman]

Flushing stdout doesn't seem like it would break anything; committed 94ba182.

[yamalight]

awesome, works perfectly now!

[FloWi]

Cool, thx for fixing!