Attachment 937626 Details for Bug 1138357 – patch

[patch] patch

0001-use-auto_merge-with-args-only-not-with-options.diff.patch (text/plain), 2.01 KB, created by Jiri Popelka on 2014-09-15 14:03:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2014-09-15 14:03:48 UTC

Size: 2.01 KB

patch

obsolete

>From a4eb1331abbb178373bbc74e077489e6d438260e Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Mon, 15 Sep 2014 15:51:36 +0200
>Subject: [PATCH] use auto_merge with args only, not with options.diff
>
>meld --auto-merge --output m l b r --diff b l --diff b r
>previously ended with:
>Traceback (most recent call last):
>  File /usr/lib/python2.7/site-packages/meld/meldapp.py, line 70, in do_command_line
>    tab = self.parse_args(command_line)
>  File /usr/lib/python2.7/site-packages/meld/meldapp.py, line 275, in parse_args
>    focus=i == 0)
>  File /usr/lib/python2.7/site-packages/meld/meldapp.py, line 142, in open_paths
>    return window.open_paths(paths, **kwargs)
>  File /usr/lib/python2.7/site-packages/meld/meldwindow.py, line 687, in open_paths
>    paths, auto_compare=auto_compare, auto_merge=auto_merge)
>  File /usr/lib/python2.7/site-packages/meld/meldwindow.py, line 633, in append_diff
>    return self.append_filemerge(paths, merge_output=merge_output)
>  File /usr/lib/python2.7/site-packages/meld/meldwindow.py, line 615, in append_filemerge
>    assert len(files) == 3
>AssertionError
>
>In 1.8 the code looks like:
>  for files in options.diff:
>      open_paths(files)
>  ...
>  if args:
>      tab = open_paths(args, options.auto_compare, options.auto_merge)
>
>Signed-off-by: Jiri Popelka <jpopelka@redhat.com>
>---
> meld/meldapp.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/meld/meldapp.py b/meld/meldapp.py
>index dc79084..02e1430 100644
>--- a/meld/meldapp.py
>+++ b/meld/meldapp.py
>@@ -310,8 +310,8 @@ class MeldApp(Gtk.Application):
>             try:
>                 tab = self.open_files(
>                     files, auto_compare=options.auto_compare,
>-                    auto_merge=options.auto_merge, new_tab=options.newtab,
>-                    focus=i == 0)
>+                    auto_merge=options.auto_merge if paths == args else False,
>+                    new_tab=options.newtab, focus=i == 0)
>             except ValueError as err:
>                 error = err
>             else:
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1138357: 937626