No "Exit diff mode" after using Diff -> Expression

[ijuma]

Hi,

Since this is my first issue, I'll start by saying that I really like git-cola. :)

Steps to reproduce the problem:

1. Select Diff -> Expression
2. Type origin/master or something appropriate for the repository
3. Look for "Exit Diff Mode" to dismiss diff mode

Expected: See "Exit Diff Mode" below "Stash" (like what happens if I use Diff -> SHA-1)

Actual: "Exit Diff Mode" is not there for some reason.

Workaround: Use Diff-SHA-1 to make it appear.

[davvid]

views.main: Show 'Exit Diff Mode' when using Diff->Expression

We weren't showing the 'Exit Diff Mode' button when going into
the 'Diff->Expression' mode.

Closed by ee17ea1

Signed-off-by: David Aguilar davvid@gmail.com

[davvid]

This is in the v1.4.0.2 release. The distros should start picking up that release pretty soon hopefully. =)

[ijuma]

Thanks. :) I'll build my own package meanwhile.

[ijuma]

Hmm, when I click on "Exit Diff Mode", it exits git-cola instead of exiting diff mode. This still works correctly if I use Diff -> SHA-1 instead.

[ijuma]

Ok, it seems like git-cola crashes in some cases and that's why it exits. It works fine when it doesn't crash. I saw the following when doing Diff -> Expression (easy to reproduce in that repository until I made some changes and not easy to reproduce anymore):

http://pastebin.com/m5c32426

Any suggestions on what information to collect before filing an issue?

[davvid]

Hmm your PyQt4 version would be helpful.
I've tested it on both Linux and Mac OSX with PyQt4 4.5.x and it works fine here. The stacktrace is weird; Python is not supposed to stacktrace.

Do you happen to be on PyQt4 4.6.0?

[ijuma]

I'm using PyQt4 4.5.4 from Fedora. The repository state seems to be important to be able to reproduce. If it happens again with a repository that I can share, I'll file a bug with steps to reproduce.