Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/

Author sunny256
Full name Øyvind A. Holm
Date 2005-04-26 16:15:17 PDT
Message User: sunny256
Date: 2005/04/26 16:15:17

Modified:
   svnutils/trunk/src/svndiff

Log:
 r126 | sunny256 | 2005-04-26 23:03:00 +0000 (Tue, 26 Apr 2005) | 3 lines
 
 * /trunk/src/svndiff
   Removed the <defaults> element in the rc file, looks unnecessary.

File Changes:

Directory: /svnutils/trunk/src/
===============================

File [changed]: svndiff
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​svndiff?r1=1.22&​r2=1.23
Delta lines: +19 -32
---------------------
--- svndiff 26 Apr 2005 22:41:53 -0000 1.22
+++ svndiff 26 Apr 2005 23:15:15 -0000 1.23
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: svndiff 124 2005-04-26 22:38:21Z sunny256 $
+# $Id: svndiff 126 2005-04-26 23:03:00Z sunny256 $
 # Uses a specified diff program for viewing differences in a Subversion
 # versioned directory tree.
 #
@@ -257,15 +257,6 @@
             D("\$el_svndiffrc \x7B\x7B\x7B\n$​el_svndiffrc\n\x7D​\x7D\x7D");
             $el_svndiffrc =~
             s{
- <defaults\b(.*?)​>(.*?)</defaul​ts>
- }
- {
- my $el_defaults = $2;
- D("Inside <defaults><​/defaults>");
- D("\$el_defaults \x7B\x7B\x7B\n$​el_defaults\n\x7D​x7D\x7D");
-
- $el_defaults =~
- s{
                     <diffprog\b(.*?)​>(.*?)</diffpr​og>
                 }
                 {
@@ -274,7 +265,7 @@
                     "";
                 }sex;
 
- $el_defaults =~
+ $el_svndiffrc =~
                 s{
                     <svnclient\b(.*?​)>(.*?)</svncl​ient>
                 }
@@ -283,8 +274,6 @@
                     D("read_rcfile(): \$CMD_SVN = \"$CMD_SVN\"");
                     "";
                 }sex;
- print_leftover($el_defaults, "defaults");
- }sex;
             print_leftover($el_svndiffrc, "svndiffrc");
         }sex;
         print_leftover($el_top, "top");
@@ -366,7 +355,7 @@
 
 =head1 REVISION
 
-$Id: svndiff 124 2005-04-26 22:38:21Z sunny256 $
+$Id: svndiff 126 2005-04-26 23:03:00Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -424,10 +413,8 @@
 It is a standard XML file with this structure:
 
   <svndiffrc>
- <defaults>
       <diffprog>vimd​iff</diffprog>​
       <svnclient>svn​</svnclient>
- </defaults>
   </svndiffrc>
 
 (Whitespace is optional and more options will come.)
@@ -486,4 +473,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: svndiff 124 2005-04-26 22:38:21Z sunny256 $
+# End of file $Id: svndiff 126 2005-04-26 23:03:00Z sunny256 $

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/ sunny256 Øyvind A. Holm 2005-04-26 16:15:17 PDT
Messages per page: