[svk-commit] r2924 - in trunk: lib/SVK/Help lib/SVK/Resolve

[nobody at bestpractical.com]

Author: clsung
Date: Wed Jun 18 03:19:34 2008
New Revision: 2924

Added:
   trunk/lib/SVK/Resolve/WinMerge.pm
Modified:
   trunk/MANIFEST
   trunk/lib/SVK/Help/Environment.pod

Log:
- add support for http://winmerge.org

Patch From: Steve Wagner <lists_AT_lanwin dot de>


Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	(original)
+++ trunk/MANIFEST	Wed Jun 18 03:19:34 2008
@@ -149,6 +149,7 @@
 lib/SVK/Resolve/TkDiff.pm
 lib/SVK/Resolve/TortoiseMerge.pm
 lib/SVK/Resolve/Vim.pm
+lib/SVK/Resolve/WinMerge.pm
 lib/SVK/Resolve/XXDiff.pm
 lib/SVK/Root.pm
 lib/SVK/Root/Checkout.pm

Modified: trunk/lib/SVK/Help/Environment.pod
==============================================================================
--- trunk/lib/SVK/Help/Environment.pod	(original)
+++ trunk/lib/SVK/Help/Environment.pod	Wed Jun 18 03:19:34 2008
@@ -98,6 +98,7 @@
  TkDiff
  TortoiseMerge
  Vim
+ WinMerge
  XXDiff
 
 If you want svk to spawn a specific merge tool, set this variable to

Added: trunk/lib/SVK/Resolve/WinMerge.pm
==============================================================================
--- (empty file)
+++ trunk/lib/SVK/Resolve/WinMerge.pm	Wed Jun 18 03:19:34 2008
@@ -0,0 +1,76 @@
+# BEGIN BPS TAGGED BLOCK {{{
+# COPYRIGHT:
+# 
+# This software is Copyright (c) 2003-2006 Best Practical Solutions, LLC
+#                                          <clkao at bestpractical.com>
+# 
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
+# 
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of either:
+# 
+#   a) Version 2 of the GNU General Public License.  You should have
+#      received a copy of the GNU General Public License along with this
+#      program.  If not, write to the Free Software Foundation, Inc., 51
+#      Franklin Street, Fifth Floor, Boston, MA 02110-1301 or visit
+#      their web page on the internet at
+#      http://www.gnu.org/copyleft/gpl.html.
+# 
+#   b) Version 1 of Perl's "Artistic License".  You should have received
+#      a copy of the Artistic License with this package, in the file
+#      named "ARTISTIC".  The license is also available at
+#      http://opensource.org/licenses/artistic-license.php.
+# 
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of the
+# GNU General Public License and is only of importance to you if you
+# choose to contribute your changes and enhancements to the community
+# by submitting them to Best Practical Solutions, LLC.)
+# 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with SVK,
+# to Best Practical Solutions, LLC, you confirm that you are the
+# copyright holder for those contributions and you grant Best Practical
+# Solutions, LLC a nonexclusive, worldwide, irrevocable, royalty-free,
+# perpetual, license to use, copy, create derivative works based on
+# those contributions, and sublicense and distribute those contributions
+# and any derivatives thereof.
+# 
+# END BPS TAGGED BLOCK }}}
+package SVK::Resolve::WinMerge;
+use strict;
+use base 'SVK::Resolve';
+use SVK::Util qw( catdir );
+
+sub commands { 'WinMergeU' }
+
+sub paths {
+    return catdir(
+	($ENV{ProgramFiles} || 'C:\Program Files'), 
+	'WinMerge',
+    );
+}
+
+sub arguments {
+    my $self = shift;
+    return (
+        "/dl \"$self->{label_yours}\"",
+        "/dr \"$self->{label_theirs}\"",
+        "$self->{yours}",
+        "$self->{theirs}",
+        "$self->{merged}",
+    );
+}
+
+1;