I'm updating meld to run under python3. While running under cProfile, I noticed that many empty filter ranges were being added and this made opening a file take ~ 15 seconds. This PR reduces that to < 1s. I don't see any difference in functionality.

This pull request is coming a bit late since my initial announcement on the mailing list, but I guess it's better late than never.

There are some hacks related to the build/packaging process that can be improved, but the python code changes are clean. I'm hoping that getting into the official repo would allow people to help with the hacks in the packaging process.

Thank you for meld.

Problem: When meld is launched from console, usecase is git difftool, After closing App using Alt+F4 console displays multiple error messages Error Messages look like (meld:18521): Gtk-CRITICAL **: gtk_container_foreach: assertion 'GTK_IS_CONTAINER (container)' failed https://bugzilla.gnome.org/show_bug.cgi?id=755407

Cause: closing window triggers do_window_removed Unlike when Quit is choosen from Menu, self.quit() is never called Gtk complains and adds error messages on STDERR

Solution: When do_window_removed is called check if there are any active windows If there is no active window, call self.quit()

Correctly save and retrieve files state and meta in a Git tree. With the old code, path names with Unicode characters in them, were saved incorrectly in the tree dict, because git outputs these names in a different format. Also, when retrieving them, we need to convert the key to utf8, since it is the encoding python uses to store the dict key string. Before this update, all filenames with international characters showed up as _vc.STATE_NORMAL, since their path never matched the tree dict keys. This update should have zero effect on filename with no international characters.

In Python3 max does not accept None elements in the iterable. Fix this by filtering them out.

Signed-off-by: Nikolay Nikolaev [email protected]

The remove_blank_lines will generate a "TypeError: sequence item 0: expected str instance, bytes found" exception, while the type cast is missing.

Don't know if I do this right. I get "po" and "pot" files by command "intltool-update ru" and translate "po" file by Gtranslator. I do this first time and don't know if you need the "pot" file (attached).

Hi,

I just added draft implementation of displaying full paths, something similar to meld 1.8. In current version of meld, full paths are not displayed and user doesn't really know what is being compared with what.

Best regards, Ko Cho

• Shift replace (blue one) and inline colors by #101326.

• Shift insert (green one) by #003800.

• Change current-chunk-highlight's alpha 0.1 -> 0.06.

https://bugzilla.gnome.org/show_bug.cgi?id=790495

Before the patch:

After the patch:

I would strongly recommend re-enabling the Issues tab. OSS development has been moving to GitHub, with Google Code and Codeplex shutting down in its favor. The vast majority of OSS developers already have a GitHub account and are familiar with the contribution process.

I broadened the try/catch block here to overcome a bug on my Kubuntu 16.10 system where I get a bunch of AttributeErrors... of the form:

Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/meld/sourceview.py", line 155, in init self.on_setting_changed(meldsettings, 'style-scheme') File "/usr/lib/python2.7/dist-packages/meld/sourceview.py", line 181, in on_setting_changed "meld:current-line-highlight", "background") File "/usr/lib/python2.7/dist-packages/meld/misc.py", line 190, in colour_lookup_with_fallback style = source_style.get_style(name)

This is probably caused by a config problem on my machine, but no harm in making things a bit more robust right?