New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Selecting toplevel items in StatusTreeWidget invokes external diff if set #163

Closed
jeff-dagenais opened this Issue Mar 8, 2013 · 2 comments

Comments

Projects
None yet
2 participants
@jeff-dagenais

jeff-dagenais commented Mar 8, 2013

Setting diff.external in git config causes the external diff tool to be invoked when an item like "Staged" or "Modified" is selected in the Status view.

If a graphical tool (such as beyond compare) is set as the external diff, clicking on the sections has the effect of grinding the git-cola gui to a halt, while the external tool is successively invoked for each file under the section. If there are numerous files under the selected section, git-cola is as good as dead, and killing the app then restarting it is just faster than having to wait for each window to open and close.

Un-setting diff.external works around the issue and the Diff view shows a diffstat followed by a full text diff of all files under the selected section.

Presumably, a "--no-ext-diff" is missing somewhere. I am a C++ Qt developer but completely unfamiliar with Python. I've mined the code in vain looking for how to fix this. Any clues, I'd be more than happy to test any fixes.

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Mar 8, 2013

Member

Thanks for the heads up. Yes, we need to pass no_ext_diff=True in the Diffstat command.

Member

davvid commented Mar 8, 2013

Thanks for the heads up. Yes, we need to pass no_ext_diff=True in the Diffstat command.

@davvid davvid closed this in a547400 Mar 8, 2013

@jeff-dagenais

This comment has been minimized.

Show comment
Hide comment
@jeff-dagenais

jeff-dagenais Mar 8, 2013

tested ok. Thanks! So glad that this project is alive and well!

jeff-dagenais commented Mar 8, 2013

tested ok. Thanks! So glad that this project is alive and well!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment