qshelve: no changes are shown

[Stephen Beitzel]

Steps to reproduce:

1. modify a local file
2. `bzr explore`
3. open the project containing the modified file
4. choose the menu option: Bazaar->Work->Shelve Changes...
5. observe the window that comes up. It lists the changed file with a count of changed "hunks". There's a panel that looks like it *ought* to be displaying the file, with highlighted sections and checkboxes next to them. However, no text appears in this panel.

This is different from the view in the "Unshelve Changes" tab of the "Shelve Manager" window. When looking at shelved changes we do get to see the text of the files.

[Alexander Belchenko (bialix)]

Please, provide more info: what is your OS, version information about bzr and explorer, and qt from Help -> About Bazaar Explorer menu.
Also, try to open shelve dialog again, click on modified file and then check .bzr.log for error messages.

[Stephen Beitzel (sbeitzel)]

Mac OS X version 10.7.3

Bazaar Explorer — Version Control for Human Beings
Version 1.2.2 "Leif Ericson"

QBzr 0.22.0dev, bzrlib 2.4.2, PyQt 4.8.5, Qt 4.7.1, Python 2.6.7

I looked in .bzr.log and this is what the 'shelve' command seems to have generated (no error messages, really):

Thu 2012-03-15 12:31:57 -0700
0.029 bazaar version: 2.4.2
0.029 bzr arguments: [u'qshelve', u'--ui-mode']
0.050 looking for plugins in /Users/swbeitze/.bazaar/plugins
0.051 looking for plugins in /Library/Python/2.6/site-packages/bzrlib/plugins
0.051 Plugin name bzrtools already loaded
0.051 Plugin name explorer already loaded
0.096 encoding stdout as osutils.get_user_encoding() 'UTF-8'
0.592 opening working tree '/Users/swbeitze/src/trunk'

[Alexander Belchenko (bialix)]

Why are you using QBzr 0.22.0 dev? For bzr 2.4.2 you'd better use QBzr 0.21.2. This is companion release for bzr 2.4.2. QBzr 0.22 should work with bzr 2.4.2 but this is not guaranteed.

[Stephen Beitzel (sbeitzel)]

I didn't manually install QBzr, so it must have come as part of a bundle (whether of Bazaar itself or with Bazaar Explorer I don't know). I do know that it's installed at /Library/Python/2.6/site-packages/bzrlib/plugins/qbzr rather than anywhere under my user directory.

[Alexander Belchenko (bialix)]

Stephen Beitzel пишет:
> I didn't manually install QBzr, so it must have come as part of a bundle
> (whether of Bazaar itself or with Bazaar Explorer I don't know). I do
> know that it's installed at /Library/Python/2.6/site-
> packages/bzrlib/plugins/qbzr rather than anywhere under my user
> directory.

Is it possible for you to upgrade your computer to bzr 2.5?

--
All the dude wanted was his rug back

[Stephen Beitzel (sbeitzel)]

I've just downloaded and run the 2.5.0 installer for Mac OS X. The info window now displays:

Bazaar Explorer — Version Control for Human Beings
Version 1.2.2 "Leif Ericson"

QBzr 0.22.1, bzrlib 2.5.0, PyQt 4.8.6, Qt 4.7.1, Python 2.6.7

This behavior still exhibits - the "Shelve" pane doesn't show the contents of the files, but the "Unshelve" pane does.

[Alexander Belchenko (bialix)]

Thank you for testing it. That's really weird, and seems to be specific to Mac/Qt or your system.

[IWATA Hidetaka (hid-iwata)]

Thank you for your report.

Could you try attached files?

Attached zip contains 4 files -- shelve.py.1, shelve.py.2, shelve.py.3, shelve.py.4.
Please, replace qbzr/lib/widgets/shelve.py by each of them, and tell me each results.

[Stephen Beitzel (sbeitzel)]

shelve.py.1 - no difference, the hunks still show no text
shelve.py.2 - the hunks in modified files show text as I would have expected. Added and deleted files do not display any content.
shelve.py.3 - as with 2, however the highlighted background (for the selected hunk) only shows in the column with the checkbox and does not show behind the text
shelve.py.4 - this looks the same as 3

Of these, I think 2 is probably the best fix.

[Alexander Belchenko (bialix)]

Stephen Beitzel пишет:
> shelve.py.2 - the hunks in modified files show text as I would have expected. Added and deleted files do not display any content.

I can confirm that on Windows (where I don't have your problem) added
and deleted files don't show any content either. I think this is
intended behavior.

[IWATA Hidetaka (hid-iwata)]

Thank you for the test.

> Added and deleted files do not display any content.

Yes. This is intended behavior. But this should be improved bofore long, maybe.