weshouman / meld

Read-only mirror of https://gitlab.gnome.org/GNOME/meld

About Meld

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and supports many version control systems including Git, Mercurial, Bazaar, CVS and Subversion.

Meld helps you review code changes, understand patches, and makes enormous merge conflicts slightly less painful.

Meld is licensed under the GPL v2 or later.

Requirements

• Python 3.6
• pycairo (Python3 bindings for cairo without GObject layer)
• PyGObject 3.30 (Python3 bindings for GObject introspection)
• gsettings-desktop-schemas

And following packages with GObject introspection:

• GLib 2.36
• Pango
• PangoCairo
• GTK+ 3.22
• GtkSourceView 4.0

Build requirements

• Python 3.6
• Meson 0.48
• Ninja
• gettext
• GLib 2.36 and its development utilities such as glib-compile-schemas

For Windows build requirements, see mingw-common section .gitlab-ci.yml

Running

You do not need to build Meld in order to run it. Meld can be run directly from this source directory by running:

$ bin/meld

Unix users should get Meld from their distribution package manager, or from Flathub.

Windows users should download the provided MSIs on the Meld home page.

OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there are unofficial native builds available from the Meld for OSX project.

Building

Meld uses meson build system. Use the following commands to build Meld from the source directory:

$ meson _build
$ cd _build
$ ninja

You can then install Meld system-wide by running:

$ ninja install

A Windows installer can be built with command

C:\Python34\python.exe setup_win32.py bdist_msi

which will create the file dist/Meld-VERSION-ARCH.msi.

Developing

It's easy to get started developing Meld. From a git checkout, just run bin/meld.

We also support development using Flatpak via GNOME Builder. At the Builder "Clone..." dialog, enter https://gitlab.gnome.org/GNOME/meld.git, and the default build + run development flow using Flatpak should work.

Contributing

Meld uses GNOME's GitLab to track bugs, and user questions and development discussions happen on the Meld mailing list. The development team is small, and new contributors are always welcome!

List of issues: https://gitlab.gnome.org/GNOME/meld/issues

Support forum: https://discourse.gnome.org/tag/meld

Links

Home page: https://meld.app/

Documentation: https://meld.app/help/

Wiki: https://wiki.gnome.org/Apps/Meld

meld's Issues

Sweep: Further support for side to side comparison and copying

Following are 3 scenarios for further support for side to side comparison and copying/

Scenario 1 [selected line copy]

(not supported, copying between 2 file panes could be by minimum based on a block, selected line copying shall be also supported)

• User compares text panes.
• User wants to copy only a subset of differing block, so he makes a selection to span multiple lines
• Then, User sees a change in the UI for comparison that indicates that only those lines will be copied out of the block
• Then, Clicking copy to left or copy to right now would apply only for the selected lines

Scenario 2 [UI arrow to copy files/folders]

(partial support exists by right clicking on the file/folder and selecting copy to left/right)

• While comparing 2 folder panes
• User clicks on a file that's missing in the other pane
• Then an arrow to copy to the other side is available.
• User should be able to configure an app setting that could enable each differing line in either of the directions to have an arrow next to it, pointing to the pane that misses this file

Scenario 3 [map files with different names]

(not supported. When comparing 2 folders we should be able to set a mapping temporarily according to the following scenario)

• While comparing 2 folder panes
• User selects a file/folder
• User clicks ctrl+K
• User selects a file/folder (should match first ones type)
• Then, the 2 files would be comparable for this session, however if the user clicked ctrl+shift+K after selecting a file, the mapping of this file would be removed. All mappings could be reset using ctrl+L

scenario_1_original_report.txt

Checklist

• meld/filediff.py ✅ Commit 28c7f9c
• meld/dirdiff.py ✅ Commit 7652e57
• meld/filemapping.py ✅ Commit 4b37642

Sweep: Allow comparing a file on the left with another on the right with a different name, while comparing directories

Brief

While comparing 2 directories we would like to have the option to compare 2 file names that may have different names.

Expected behavior

Right click on a file on the left and select "Select left file/dir to compare" then right click on the right file (or dir) and select "Compare to 'filename'". Note we should be able to do that also starting from the right file

Checklist

• meld/dirdiff.py ✅ Commit 3447ab7