summaryrefslogtreecommitdiff
path: root/devel/meld
AgeCommit message (Collapse)AuthorFilesLines
2013-04-21Update to 1.7.2:wiz3-7/+10
2013-4-16 meld 1.7.2 ==================== Features: * In version control view, conflicts now open in a three-way merge mode for Bazaar and Git, with other VCs to follow (Louis des Landes) * Manual synchronisation of split points for comparisons (Piotr Piastucki, Kai Willadsen) * The "Ignore blank lines" setting is now used in folder comparisons, in same manner as text filters (Kai Willadsen) Fixes: * Many minor Windows compatibility fixes (Vincent Legoll, Robert Wahler, Kai Willadsen) * Version control compatibility updates and fixes (Manuel Siggen, Kai Willadsen) * Better handling of Unicode filenames (Kai Willadsen) * Better support for cross-platform newline behaviour, particularly on Windows (Kai Willadsen) * Sensitivity fixes for file and folder comparisons (Kai Willadsen) * Build and installation fixes (Kalev Lember, Kai Willadsen) Translations: * Daniel Mustieles (es) * Gabor Kelemen (hu) * Marek Černocký (cs) * Martin Srebotnjak (sl). * Matej Urbančič (sl) * Мирослав Николић (sr, sr@latin) * Piotr Drąg (pl) * Rafael Ferreira (pt_BR)
2013-03-15Update to 1.7.1:wiz3-11/+34
2012-2-28 meld 1.7.1 ==================== Features: * Folder comparisons can now show extra information, such as file size and modification times. Column visibility and ordering are properly configurable. (Philipp Müller, Kai Willadsen) * Shallow comparison (i.e., based on size and timestamp) are now supported for folder comparisons, including timestamp resolution preferences for cross-filesystem comparisons. (Cristian Dinu) * The UI for launching new comparisons has been reworked to have a clearer workflow, and is now shown on startup if no other comparisons have been opened (Kai Willadsen) * Recently-used comparisons are now supported, allowing you to re-open previous comparisons directly. (Kai Willadsen) * Read-only files are now not editable by default, making merge actions clearer and more consistent. Individual read-only files can easily be set as editable as desired. (Kai Willadsen) Fixes: * New version control API, currently used by Git and Subversion (Kai Willadsen) * Version control compatibility updates and fixes (Cedric Le Dillau, Louis des Landes, Kai Willadsen) * Command line labelling options now apply to folder tabs (Kai Willadsen) * Regressions from parallel inline highlighting calculations have been fixed (Kai Willadsen) * Diff algorithm cleanups (Piotr Piastucki) * Compatibility fixes for Python 3; this does *not* mean that Meld works on Python 3 yet, just that 2to3 issues have been addressed (Kai Willadsen) Translations: * Daniel Mustieles (es) * Dominique Leuenberger (pt) * Enrico Nicoletto (pt_BR) * Florencio Neves (pt_BR) * Fran Diéguez (gl) * Marek Černocký (cs) * Matej Urbančič (sl) * Мирослав Николић (sr, sr@latin) * Piotr Drąg (pl) 2012-11-07 meld 1.7.0 ===================== Features: * File comparisons are faster! Meld now has a smarter pre-processing step for inline highlighting of differences (Piotr Piastucki) and does its highlighting calculations asynchronously (Kai Willadsen), leading to better overall performance and interactivity. * Auto-merge mode is now available from the command-line (Piotr Piastucki) * Comparisons can be opened in new tabs (rather than in a new window) from the command line (Kacper Wysocki, Antoine, Kai Willadsen) * Custom colours can now be configured for all Meld drawing (Kai Willadsen) Fixes: * Improved behaviour when opening many tabs at once (Peter Tyser) * Notification of searches wrapping around the buffer (Philipp Müller) * Better compatibility with non-standard keyboard layouts (Stephan Hilb) * Better error reporting for failed VC comparisons (Kai Willadsen) * Version control compatibility updates and fixes (Jan Danielsson, Tim Babych, Kai Willadsen) * Other miscellaneous bug fixes (Jeff Oliver, Pacho Ramos, Rainer Suhm, Kai Willadsen) Translations: * Alexandre Franke (fr) * Daniel Mustieles (es) * Fran Diéguez (gl) * Gabor Kelemen (hu) * Matej Urbančič (sl) * Marek Černocký (cs) * Mario Blättermann (de) * Martin Srebotnjak (sl) * Мирослав Николић (sr, sr@latin) * Piotr Drąg (pl)
2012-10-31Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.asau1-3/+1
2012-10-21Update to 1.6.1:wiz2-6/+6
2012-10-21 meld 1.6.1 ===================== Fixes: * Fix traceback from invalid tree cursor paths (Kai Willadsen) (closes rhbz#832969 and rhbz#837133) * Fix traceback when popping up right-click menus in empty tree sections (Kai Willadsen) (closes rhbz#843879) * Fix Bazaar comparisons including exec bit changes (Kai Willadsen) (closes bgo#682852) * Avoid spurious listings in Bazaar with shelved items (Per Ångström) * Fix copying symlinks in directories (Rainer Suhm) (closes rhbz#836606) * Support newer Fossil VC (Jan Danielsson) (closes bgo#683969) * Fix compatibility with Python 2.5 (Gianni Trovisi)
2012-05-03Update to 1.6.0:wiz3-8/+9
2012-4-28 meld 1.6.0 ==================== Fixes: * Fix cursor location handling when our tree models change (Kai Willadsen) Translation updates: * Bruno Brouard (fr) * Daniel Mustieles (es) * Daniel Șerbănescu (ro) * Fran Diéguez (gl) * Marek Černocký (cs) * Matej Urbančič (sl) * Piotr Drąg (pl)
2012-04-15Update to 1.5.4:wiz3-8/+8
2012-4-3 meld 1.5.4 ==================== Fixes: * Slightly faster diff calculation (Piotr Piastucki) * Avoid too-tall commit dialogues (Nguyễn Hồng Quân) * Minor bug fixes and performance improvments (Kai Willadsen) Translation updates: * Alexander Shopov (bg) * Fran Diéguez (gl) * Kjartan Maraas (nb) * Kristjan SCHMIDT (eo) * Nguyễn Thái Ngọc Duy (vi) * Toshiharu Kudoh (ja) * Trương Ứng Minh (vi) * Мирослав Николић (sr) (sr@latin)
2012-04-08Remove python24 and all traces of it from pkgsrc.wiz1-3/+1
Remove devel/py-ctypes (only needed by and supporting python24). Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE lines that just mirror defaults now. Miscellaneous cleanup while editing all these files.
2012-03-15Bump PKGREVISION from default python to 2.7.obache1-1/+2
2012-03-03Update to 1.5.3, update HOMEPAGE.wiz3-9/+13
2012-1-27 meld 1.5.3 ==================== New features: * Add simple animations for chunk actions to make it easier to follow the result of insertion and deletion actions (Kai Willadsen) * Show the currently displayed page area in the side bars (Kai Willadsen) Fixes: * Don't show links between chunks where one of the chunks is completely off-screen, reducing visual clutter (Kai Willadsen) * Syntax highlighting will now assume that all files in a comparison are of the same type if we can't determine otherwise (Kai Willadsen) * Some fixes to colour usage and legibility for dark themes, with more theme fixes coming soon (Kai Willadsen) * Remember active filters across sessions in directory and VC comparions (Kai Willadsen) * Guess which version control system a user is most likely to want to see, in the event of multiple VCs in a single working copy (Kai Willadsen) * Work with Subversion 1.7 (Kai Willadsen) * Many sundry bug fixes (Aaron Schrab, Julian Taylor, Kai Willadsen) Translation updates: * Bruno Brouard (fr) * Christian Kirbach (de) * Daniel Mustieles (es) * Fran Dieguez (gl) * Gabriel Speckhahn (pt_BR) * Jiro Matsuzawa (ja) * Jorge González (es) * Marcin Floryan (pl) * Marek Černocký (cs) * Mario Blättermann (de) * Matej Urbančič (sl) * Petr Kovar (cs) * Piotr Drąg (pl) * Takeshi AIHANA (ja) * Yuri Myasoedov (ru)
2011-08-06Update to 1.5.2:wiz3-7/+10
2011-7-24 meld 1.5.2 ===================== New features: * Add a new menu item and shortcut for switching between panes in file comparisons (Kai Willadsen) * Support type-ahead search in version control views (Oliver Gerlich) Fixes: * Non-editable files are now handled properly when doing sensitivity setting of change actions, and actions on the central change bar are presented accordingly (Piotr Piastucki, Kai Willadsen) * Fix incorrect comparison display in files containing FF or NEL linebreak literals (Kai Willadsen) * Updates to the Fossil version control support (Jan Danielsson) * Use faster validity check for Bazaar repositories (Kai Willadsen) * Many minor updates and other fixes (Tomasz Bury, Alan Horkan, Julian Taylor, Kai Willadsen) Translation updates
2011-04-07Remove unneeded patch after update.wiz1-16/+0
2011-04-05Update to 1.5.1:wiz3-28/+47
2011-3-20 meld 1.5.1 ===================== New features: * Add menu items and keyboard shortcuts for version control and directory comparison actions (Kai Willadsen) * Add support for the Fossil SCM (Jan Danielsson) * Add a menu for switching between tabs (Kai Willadsen) * Add a menu item to unlock scrolling (Kai Willadsen) Code changes and fixes: * Improve filter handling with inline error reporting in the preference pane, and correct refreshing of file and directory comparisons on filter changes (Kai Willadsen) * Make line number display work with GtkSourceView 2.10+ (Piotr Piastucki) * Support external diff tools in subversion (Cedric Le Dillau) * Support CVSNT as a CVS alternative (Kai Willadsen) * Performance fixes for subversion and bazaar (Tristan Hill, Kirill Müller) * Correctly update a modified file's status in git and svn version control views (Peter Tyser) * Make temporary files unwritable to avoid unintentionally editing them (Peter Tyser) * Clean up diff results for cleaner comparisons (Piotr Piastucki) * Improve symlink and binary handling, and error cases for directory comparisons (Kai Willadsen) * Improve copy semantics for directories and symlinks (Kai Willadsen) * Show case insensitivity and file encoding errors less intrusively (Kai Willadsen) * Sundry bug fixes (Kai Willadsen, Piotr Piastucki) Translation updates: * Bruno Brouard (fr) * Claude Paroz (fr) * Daniel Mustieles (es) * Joe Hansen (da) * Mario Blättermann (de) * Matej Urbančič (sl) * Miroslav Nikolić (sr) * Petr Kovar (cs) * Takeshi AIHANA (ja) 2010-12-27 meld 1.5.0 ===================== New features: * Use MyersSequenceMatcher by default (matcher from Piotr Piastucki) * Add a "Show whitespace" preference (Jon Dufresne) * Add "Copy change above/below left/right" actions (Kai Willadsen) * Add Alt+Up/Down as shortcuts for previous/next change (Kai Willadsen) * Add previous/next conflict actions (Kai Willadsen) * Patch creation can now create reverse patches, and can choose between panes in a three-way comparison (Kai Willadsen) * Add a --output option for specifying where to save a merge result (Kai Willadsen) Code changes and fixes: * Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional) * Port to gtk.Builder and gtk.IconTheme (Kai Willadsen) * Remove gnome-vfs usage (Kai Willadsen) * Portability fixes (Thomas Klausner) * Build fixes (Helmut Jarausch) * Add a man page (Peter Tyser) * Put preferences fallback in XDG-compliant location (Kai Willadsen) * Fix Undo/Redo with unicode text (Kai Willadsen) * Handle unicode linebreaks (Kai Willadsen) Translation updates: * Bruno Brouard (fr) * Carles Ferrando (ca@valencia) * Claude Paroz (fr) * Gabor Kelemen (hu) * Joe Hansen (da) * Jorge González (es) * Mario Blättermann (de) * Matej Urbančič (sl) * Petr Kovar (cs)
2010-10-16Update to 1.4.0. Send patch-ac upstream and add comment.wiz3-9/+12
2010-09-27 meld-1.4.0 ===================== * Fix committing with RCS (Iuri Diniz) * Fix compatibility with old PyGObject (Kai Willadsen) * Translation updates: hu (Gabor Kelemen)
2010-09-13Update to 1.3.3:wiz3-13/+7
2010-09-09 meld-1.3.3 ===================== * Highlight currently focused change (Kai Willadsen) * Add ability to check if version control repos are valid (Peter Tyser) * Support multiple-file undo/redo operations after save (Kai Willadsen) * Performance improvements, bug fixes and sundry contributions (Piotr Piastucki, Alexander Smishlajev, Robert Wahler, Kai Willadsen) * Translation updates: de (Mario Blättermann), es (Jorge González), fr (Bruno Brouard), ja (Takeshi AIHANA), sl (Matej Urbančič), zh_CN (Tao Wang)
2010-08-09update to 1.3.2drochner5-158/+191
changes: -Add keyboard merging, bulk change merging, auto-merge with ancestor mode -Updates to VC support, including lots of git fixes -UI cleanups -bug fixes -Translation updates
2010-02-10Bump revision for PYTHON_VERSION_DEFAULT change.joerg1-1/+2
2009-09-07Retire Python 2.3 support.joerg1-2/+1
2009-08-21Update to 1.3.1:wiz3-13/+20
2009-08-14 meld-1.3.1 ===================== * Add svk support (Vincent Legoll) * Add support for marking conflicts as resolved (Matthijs van de Water, Vincent Legoll) * Warp the text cursor to the start of jumped-to diff chunks (Vincent Legoll) * Allow toggling of toolbar and statusbar visibility, and add a fullscreen option (Michael Budde, Stephen Kennedy, Kai Willadsen) * Improved change merging and conflict resolution (Piotr Piastucki) * Speed up file comparisons and highlighting, significantly improving interactive editing performance (Kai Willadsen, Piotr Piastucki) * Meld has a shiny new application icon (Josef Vybíral)
2009-07-22Remove USE_DIRS from pkgsrc.wiz1-2/+1
Shared directories can now be created independently by the pacakges needing them and will be removed automatically by pkg_delete when empty. Packages needing empty directories can use the @pkgdir command in PLIST. Discussed and ok'd in thread starting at http://mail-index.netbsd.org/tech-pkg/2009/06/30/msg003546.html
2009-06-14Remove @dirrm entries from PLISTsjoerg1-19/+1
2009-05-19Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENTwiz1-3/+2
block). Uncomment some commented out LICENSE lines while here.
2009-04-20Update to 1.3.0:wiz4-34/+34
2009-04-17 meld-1.3.0 ===================== * Minimum requirements are pygobject 2.8 and python 2.4 * Find dialog replaced with find bar with replace functionality * Remove gnome dependencies (Kai Willadsen, Vincent Legoll) Meld now runs on win32 (experimental). * Many ui tweaks and cleanups (Kai Willadsen, Vincent Legoll) * Support for multiple sourceview versions (Vincent Legoll) * Updated version control support * Multiple VCs in a single directory (Vincent Legoll) * Subversion 1.6.x (Vincent Legoll) * Add RCS support (Oliver Gerlich, Vincent Legoll) * Add Codeville support (Vincent Legoll)
2009-03-08Use mk/omf-scrollkeeper.mk instead of textproc/rarian/omf.mk.wiz1-2/+2
2009-02-09Switch to Python 2.5 as default. Bump revision of all packages that havejoerg1-1/+2
changed runtime dependencies now.
2009-01-18Remove the bogus requirement for python25, fix the offending line instead.ahoka3-4/+16
2009-01-04Move scrollkeeper/omf.mk to rarian/omf.mk.wiz1-2/+2
scrollkeeper is nowadays included in rarian, so the omf.mk file should be there as well. Adapt all references.
2008-12-01Mark as only for python-2.5 (newer would work as well, but...).wiz1-1/+3
Addresses PR 40032 by Robert Elz.
2008-11-24Update to 1.2.1. Fix locale file installation.wiz3-95/+53
2008-xx-xx (sic!) meld-1.2.1 ============================ * Pygtk version 2.8 now required * Port to gtk.UIManager (Kai Willadsen) * Handle spaces in svn paths (Neil Mayhew) * Command-line auto-compare all option on startup (Ondrej Novy) * Command-line can launch several comparisons (Brian Holmes) * Several UI tweaks (better focus behavior, better defaults)
2008-07-21update meld to 1.2nb1:abs3-6/+8
Remove part of patch-aa so the installdir for help/fr/GNUmakefile is still created.
2008-07-18Update to 1.2:wiz4-9/+31
2008-06-26 meld-1.2 ======================= * Improve tab rendering (Kai Willadsen) * Speedup folder comparison massively for large directories. * Fix crasher i18n bug (Kai Willadsen) * UI tweaks and cleanups (Tom Baugis, Kai Willadsen) * Cleanup vc library redundancy (Vincent Legoll) * Various version control fixes.
2008-07-14Mark as destdir ready.joerg1-1/+3
2008-04-25Update PYTHON_VERSIONS_COMPATIBLEjoerg1-2/+1
- assume that Python 2.4 and 2.5 are compatible and allow checking for fallout. - remove PYTHON_VERSIONS_COMPATIBLE that are obsoleted by the 2.3+ default. Modify the others to deal with the removals.
2008-04-16PYTHON_VERSIONS_ACCEPTED+=25abs1-2/+2
2007-11-03share/vi may also be used by editors/nvi; just try removing it.wiz2-3/+4
Bump PKGREVISION.
2007-06-16Update meld to 1.1.5.1.obache3-8/+16
Patch provided by Dieter Roelants in PR 36488. 2007-06-12 meld-1.1.5.1 ======================= * Do not ship .svn folders in tarball 2007-06-09 meld-1.1.5 ===================== * Handle new version contol command line arguments. * CLI option to set the tab labels. Bug 138860. * Improve mime type detection from Tomasz Bury. Bug 156137. * Hold shift when scrolling to scroll the panes independently. * File & folder history now saved from Sam Jacobson. * Several small ui improvements.
2006-10-12apply PYTHON_PATCH_SCRIPTS to get the right interpreterdrochner1-1/+2
2006-09-09Rename variable MAKEFILE to MAKE_FILE.obache1-2/+2
2006-07-18needs msgfmtabs1-2/+2
2006-07-17Initial import of meld-1.1.4:wiz4-0/+242
Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 01:44:49 +0000