Merge branch 'altkeys' into 'master'

kaiw · kaiw · commit 726a9aa0cf8f · 2020-08-15T00:03:25.000Z
Unconditional Alt+Right and Alt+Left for two-pane merges (#25)

See merge request GNOME/meld!2
diff --git a/meld/filediff.py b/meld/filediff.py
@@ -657,6 +657,8 @@ def on_current_diff_changed(self, *args):
             # conditions for push are met, *and* there is some content in the
             # target pane.
             editable = self.textview[pane].get_editable()
+            # editable_left is relative to current pane and it is False for the
+            # leftmost frame. The same logic applies to editable_right.
             editable_left = pane > 0 and self.textview[pane - 1].get_editable()
             editable_right = (
                 pane < self.num_panes - 1 and
@@ -691,6 +693,13 @@ def on_current_diff_changed(self, *args):
                 copy_right = (
                     editable_right and right_mid_exists and right_exists)
 
+            # If there is chunk and there are only two panes (#25)
+            if self.num_panes == 2:
+                pane0_editable = self.textview[0].get_editable()
+                pane1_editable = self.textview[1].get_editable()
+                push_left = pane0_editable
+                push_right = pane1_editable
+
         self.set_action_enabled('file-push-left', push_left)
         self.set_action_enabled('file-push-right', push_right)
         self.set_action_enabled('file-pull-left', pull_left)
@@ -815,9 +824,10 @@ def action_next_diff(self, *args):
 
     def get_action_chunk(self, src, dst):
         valid_panes = list(range(0, self.num_panes))
-        if (src not in valid_panes or dst not in valid_panes or
-                self.cursor.chunk is None):
+        if src not in valid_panes or dst not in valid_panes:
             raise ValueError("Action was taken on invalid panes")
+        if self.cursor.chunk is None:
+            raise ValueError("Action was taken without chunk")
 
         chunk = self.linediffer.get_chunk(self.cursor.chunk, src, dst)
         if chunk is None:
@@ -853,11 +863,17 @@ def on_chunk_action_activated(
             self.copy_chunk(from_pane, to_pane, chunk, copy_up=False)
 
     def action_push_change_left(self, *args):
-        src, dst = self.get_action_panes(PANE_LEFT)
+        if self.num_panes == 2:
+            src, dst = 1, 0
+        else:
+            src, dst = self.get_action_panes(PANE_LEFT)
         self.replace_chunk(src, dst, self.get_action_chunk(src, dst))
 
     def action_push_change_right(self, *args):
-        src, dst = self.get_action_panes(PANE_RIGHT)
+        if self.num_panes == 2:
+            src, dst = 0, 1
+        else:
+            src, dst = self.get_action_panes(PANE_RIGHT)
         self.replace_chunk(src, dst, self.get_action_chunk(src, dst))
 
     def action_pull_change_left(self, *args):
