lp:~jfb-tempo-consulting/qbrz/1939011

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qbrz at revision 1643

Robert Ladyman: Approve on 2021-08-08

Diff: 12 lines (+1/-1)

1 file modified

lib/commands.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1642. By jftempo on 2021-08-05

[FIX] #1939011 launch brz qannotate on a file from a subfolder

1641. By Jelmer Vernooij on 2021-05-26

Improve Breezy 3.2 compatibility.

1640. By Robert Ladyman on 2021-01-08

Tried to fix add... works in pyqt4 but not pyqt5, who knows why? Not me. Left it for now.

1639. By Robert Ladyman on 2021-01-08

Corrected _triggered / triggered calls for PyQt5 in browse.py. Stand-alone qbrowse still has problems but works reasonably well when called from (say) qlog. Removed @runs_in_loading_queue.

Note that TreeWidget::restore_state has a note from 2009 that restore_state does not work for sub-items. Seems to still not do so.

1638. By Robert Ladyman on 2021-01-08

Reverted singleShot to 0 (removal of decorator for backgrounding fixed this). Call super().show() instead of QBzrWindow.show(self).

1637. By Robert Ladyman on 2021-01-08

Removed @runs_in_loading_queue from log.py load() - now runs like the clappers and works correctly. Corrected elided_text in logwidget.

1636. By Robert Ladyman on 2021-01-08

Changed QTimer.singleShot(0... to 1 - behaviour of Qt5 seems to differ. The docs state (for Qt5):-

As a special case, a QTimer with a timeout of 0 will time out as soon as possible, though the ordering between zero timers and other sources of events is unspecified. Zero timers can be used to do some work while still providing a snappy user interface...

However, what actually happens (with QBrz) is that the shot only occurs when something else actually happens (a mouse-click, moving a window, a click outside QBrz, etc.)

1635. By Robert Ladyman on 2021-01-08

Reverted to 1632 as 1633 and 1634 cause major issues with test suite. Incorporated jelmers setup.py change

1634. By Robert Ladyman on 2021-01-08

qbrowse still has problems - deferred for now: added comments with note of problem.
Fixed hexdump in lib/cat.py to handle bytes (well... force them to string, heh!).
Tidied up some spacing issues / line-breaks and spurious semicolons. Noted problem with diff.triggered sometimes receiving bools instead of strings / None (although not sure it should NOT receive bools - impossible to tell).
Noted issue with TreeWidget and ChangeDesc: I suspect changes in Breezy have not been properly transferred to QBrz (naughty me - needs full review when I get time).
uifactory.py @current_widget raises a TypeError if there are no parameters for the passed method: the change to r = f(args[0]) did not help, however.

1633. By Robert Ladyman on 2021-01-06

Log widget now displaying correctly: display tree still buggy