head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q2:1.3.0.2 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.1.0.2 pkgsrc-2009Q1-base:1.1; locks; strict; comment @# @; 1.5 date 2009.08.20.09.06.40; author wiz; state dead; branches; next 1.4; 1.4 date 2009.08.06.21.52.07; author wiz; state Exp; branches; next 1.3; 1.3 date 2009.04.16.22.43.31; author wiz; state Exp; branches; next 1.2; 1.2 date 2009.04.06.10.13.28; author wiz; state Exp; branches; next 1.1; 1.1 date 2009.01.20.19.16.15; author drochner; state Exp; branches; next ; desc @@ 1.5 log @Update to 0.4.0: Diffuse 0.4.0 - 2009-08-17 - changed the default hotkeys for merging to reflect the direction text "moves" - added format menu with new items for changing case, sorting, and manipulating white space - replaced 'Hide end of line characters' preference with 'Show white space characters' - errors are now reported in a dialogue instead of printing to stderr - optimised redraws when only the cursor position has changed - input methods that use pre-editing can now be used when editing text - dead keys can now be used when editing text - updated Monotone support to use 'mtn automate inventory' - Git support now handles files flagged as 'unmerged' - graceful handling of and non-zero exit codes from 'git status' - added version control section to the manual - minor bug fixes @ text @$NetBSD: patch-aa,v 1.4 2009/08/06 21:52:07 wiz Exp $ --- src/usr/bin/diffuse.orig 2009-07-03 23:11:09.000000000 +0000 +++ src/usr/bin/diffuse @@@@ -3368,7 +3368,9 @@@@ class FileDiffViewer(gtk.Table): # middle mouse button, paste primary selection if self.mode == CHAR_MODE and f == self.current_pane: self.button_press(f, x, y, False) + self.openUndoBlock() gtk.clipboard_get(gtk.gdk.SELECTION_PRIMARY).request_text(self.receive_clipboard_text_cb) + self.closeUndoBlock() elif event.button == 3: # right mouse button, raise context sensitive menu can_align = (self.mode == LINE_MODE and (f == self.current_pane + 1 or f == self.current_pane - 1)) @ 1.4 log @Update to 0.3.4: Released 2009-07-03 * syntax highlighting for .plist, GLSL, SConscript, and SConstruct files * status bar now explains how to navigate between modes * added labels to indicate syntax highlighting rules, encoding, and format * Subversion 1.6 support * added Henri Menke's German translation * added '--examplesdir=' and '--mandir=' options to install.py * renamed the '--python-interpreter=' installer option to '--pythonbin=' * minor bug fixes Add an additional post-release fix from upstream (patch-aa). @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to 0.3.3 with post-release patches for easier installation and a bug fix. Set LICENSE. Diffuse 0.3.3 - 2009-04-13 - fixed a bug handling the backspace key with the cursor in the first column Diffuse 0.3.2 - 2009-04-13 - POSIX installer with '--destdir=' and '--files-only' options for packagers - vi-like keybindings for line mode - '-m' option to open modified files in separate tabs - 'Merge From Left Then Right' and 'Merge From Right Then Left' menu items - drag-n-drop support - preferences for behaviour of tabs - files with edits now tagged with '*' - auto indent - 'Open File In New Tab...' and 'Open Modified Files...' menu items - 'Save All' menu item - mac-style line ending support - new end of line display behaviour - improved organisation of menu items - button bar no longer grabs keyboard focus - removed dependence on urllib module - errors are now reported on stderr - removed TODO list - minor bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2009/04/06 10:13:28 wiz Exp $ d3 1 a3 1 --- src/usr/bin/diffuse.orig 2009-04-13 22:24:24.000000000 +0000 d5 10 a14 9 @@@@ -1296,7 +1296,7 @@@@ class VCSs: if len(s) > 2 and s[0] in 'ACMR': k = os.path.join(self.root, prefs.convertToNativePath(s[2:])) if not isabs: - k = replpath(pwd, k) + k = relpath(pwd, k) r[k] = s[0] for k in sorted(r.keys()): v = r[k] @ 1.2 log @Update to 0.3.1. Avoid using urllib, because it causes a core dump. Next release will not use urllib. Diffuse 0.3.1 - 2009-03-05 - fixed a typo that broke the 'Find...' dialogue Diffuse 0.3.0 - 2009-03-03 - new Windows installer - notification on focus change when files change on disk - menu items for adjusting indentation - syntax highlighting for Objective-C++ - '-c' option now works with CVS-style revision numbers - window title now describes current tab - search settings now persist across sessions - minor bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/usr/bin/diffuse.orig 2009-03-30 09:58:33.000000000 +0000 d5 9 a13 9 @@@@ -100,7 +100,7 @@@@ import shlex import stat import string import subprocess -import urllib +#import urllib import webbrowser # platform tests @ 1.1 log @fix some installation problems, and make it work with default 'C' locale @ text @d3 1 a3 1 --- src/usr/bin/diffuse.orig 2009-01-19 17:58:19.000000000 +0100 d5 9 a13 9 @@@@ -177,6 +177,8 @@@@ def getExePath(s): # find the help directory for the current locale def getLocalisedDir(s): lang = locale.getdefaultlocale()[0] + if not lang: + lang = 'C' path = os.path.join(s, lang) if os.path.exists(path): return path @