Merge lp:~a1s/qbrz/fix-diff-button into lp:qbrz

[Aleksandr Smyshliaev]

Fix launching diff viewers

In the diff push button and pop-up menu there is some confusion between Qt built-in signal, widget method with the same name, and custom signal bound to the QBrz classes.

With this patch, I rename the signal hanlder method, and connect the handlers to the QBrz signal instead of non-existing variant of the overloaded base signal.

Also, the syntax for external diff command lines has changed in Breezy config: now it's {old_path} and {new_path} instead of @old_path and @new_path. I've changed the external diff command in QBrz to use the new syntax.

[Robert Ladyman (saccadic-masking)]

review: Approve

=== modified file 'lib/diff.py'
--- lib/diff.py	2021-01-08 13:56:34 +0000
+++ lib/diff.py	2022-01-08 13:14:01 +0000
@@ -131,11 +131,11 @@
                     self.setDefaultAction(action)
                 self.addAction(action)
 
-        self.triggered[QAction].connect(self.triggered)
+        self.triggered[QtWidgets.QAction].connect(self.do_trigger)
 
-    def triggered(self, action):
+    def do_trigger(self, action):
         ext_diff = str(action.data())
-        self.triggered.emit(ext_diff)
+        self._triggered.emit(ext_diff)
 
 
 class DiffButtons(QtWidgets.QWidget):
@@ -148,7 +148,7 @@
         self.default_button = QtWidgets.QPushButton(gettext('Diff'), self)
         layout.addWidget(self.default_button)
         layout.setSpacing(0)
-        self.default_button.clicked.connect(self.triggered)
+        self.default_button.clicked.connect(self.do_trigger)
 
         if has_ext_diff():
             self.menu = ExtDiffMenu(self)
@@ -162,10 +162,13 @@
                 self.menu_button.style().pixelMetric(
                     QtWidgets.QStyle.PM_ButtonMargin)
                 )
-            self.menu.triggered['QString'].connect(self._triggered)
+            self.menu._triggered.connect(self.do_trigger)
 
-    def triggered(self, ext_diff=None):
-        if ext_diff is None:
+    def do_trigger(self, ext_diff=None):
+        # Note: this is connected to default_button.clicked
+        # as well as the menu events.  The button passes it's
+        # checked state (always False here) in arguments.
+        if not ext_diff:
             ext_diff = default_diff
         self._triggered.emit(ext_diff)
 
@@ -438,8 +441,8 @@
 
     def set_command_string(self, command_string):
         command_template = cmdline.split(command_string)
-        if '@' not in command_string:
-            command_template.extend(['@old_path', '@new_path'])
+        if "{old_path}" not in command_string:
+            command_template.extend(["{old_path}", "{new_path}"])
         self.command_template = command_template
 
     def finish(self):
 
=== modified file 'lib/diffwindow.py'
--- lib/diffwindow.py	2021-05-26 19:10:36 +0000
+++ lib/diffwindow.py	2022-01-08 13:14:01 +0000
@@ -244,7 +244,7 @@
         action.setToolTip(gettext("Launch an external diff application"))
         ext_diff_menu = ExtDiffMenu(parent=self, include_builtin = False)
         action.setMenu(ext_diff_menu)
-        ext_diff_menu.triggered['QString'].connect(self.ext_diff_triggered)
+        ext_diff_menu._triggered.connect(self.ext_diff_triggered)
         return action
 
     def create_view_menu(self):
 
=== modified file 'lib/log.py'
--- lib/log.py	2021-01-08 13:56:34 +0000
+++ lib/log.py	2022-01-08 13:14:01 +0000
@@ -527,7 +527,7 @@
         if has_ext_diff():
             diff_menu = ExtDiffMenu(self)
             self.file_list_context_menu.addMenu(diff_menu)
-            diff_menu.triggered['QString'].connect(self.show_diff_files_ext)
+            diff_menu._triggered.connect(self.show_diff_files_ext)
         else:
             show_diff_action = self.file_list_context_menu.addAction(gettext("Show &differences..."), self.show_diff_files)
             self.file_list_context_menu.setDefaultAction(show_diff_action)
 
=== modified file 'lib/logwidget.py'
--- lib/logwidget.py	2021-01-08 11:30:55 +0000
+++ lib/logwidget.py	2022-01-08 13:14:01 +0000
@@ -140,7 +140,7 @@
                 if diff.has_ext_diff():
                     diff_menu = diff.ExtDiffMenu(self, set_default=diff_is_default_action)
                     self.context_menu.addMenu(diff_menu)
-                    diff_menu.triggered['QString'].connect(self.show_diff_ext)
+                    diff_menu._triggered.connect(self.show_diff_ext)
                 else:
                     show_diff_action = self.context_menu.addAction(gettext("Show &differences..."), self.show_diff)
                     if diff_is_default_action:
 
=== modified file 'lib/treewidget.py'
--- lib/treewidget.py	2021-05-26 19:10:36 +0000
+++ lib/treewidget.py	2022-01-08 13:14:01 +0000
@@ -1804,7 +1804,7 @@
         if has_ext_diff():
             diff_menu = ExtDiffMenu(self)
             self.action_show_diff = self.context_menu.addMenu(diff_menu)
-            diff_menu.triggered['QString'].connect(self.show_differences)
+            diff_menu._triggered.connect(self.show_differences)
         else:
             self.action_show_diff = self.context_menu.addAction(gettext("Show &differences"), self.show_differences)