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/

Reply

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

Modified:
   svnutils/trunk/src/svndiff

Log:
 r123 | sunny256 | 2005-04-26 22:34:56 +0000 (Tue, 26 Apr 2005) | 9 lines
 
 Get rid of some unrelated stuff in svndiff before the next checkin.
 
 * /trunk/src/svndiff
   - Moved $CMD_SVN before the call to read_rcfile() so it will be able
     to change the value when that functionality comes in the next
     commit. $ST_CONFLICT and $ST_MODIFIED also ended up there.
   - Added a couple of debugging messages.
   - Typo fix in the POD.

File Changes:

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

File [changed]: svndiff
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​svndiff?r1=1.20&​r2=1.21
Delta lines: +15 -12
---------------------
--- svndiff 26 Apr 2005 21:48:32 -0000 1.20
+++ svndiff 26 Apr 2005 22:41:27 -0000 1.21
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: svndiff 121 2005-04-26 21:11:10Z sunny256 $
+# $Id: svndiff 123 2005-04-26 22:34:56Z sunny256 $
 # Uses a specified diff program for viewing differences in a Subversion
 # versioned directory tree.
 #
@@ -24,6 +24,13 @@
 # Default value, can be overridden in ~/.svndiffrc
 my $Cmd = "vimdiff";
 
+# Change this if the svn executable is non-standard and you don’t want
+# to use the -e option all the time:
+my $CMD_SVN = "svn";
+
+my $ST_CONFLICT = 'C';
+my $ST_MODIFIED = 'M';
+
 our $progname = $0;
 $progname =~ s#^(.*)/(.+?)$#$2#;
 
@@ -45,13 +52,6 @@
 
 getopts('Cc:e:hp:r:') || die("$progname: Option error. Use -h for help.\n");
 
-# Change this if the svn executable is non-standard and you don’t want
-# to use the -e option all the time:
-my $CMD_SVN = "svn";
-
-my $ST_CONFLICT = 'C';
-my $ST_MODIFIED = 'M';
-
 $opt_h && usage(0);
 
 length($opt_c) && ($Cmd = $opt_c);
@@ -71,6 +71,7 @@
         if (-f $Curr && !-l $Curr) {
             D("$Curr is a file.");
             my $has_conflict;
+ D("Before PipeFP 1: CMD_SVN = \"$CMD_SVN\"");
             if (open(PipeFP, "$CMD_SVN stat $Curr -q |")) {
                 $has_conflict = (<PipeFP> =~ /$ST_CONFLICT/) ? 1 : 0;
             } else {
@@ -86,6 +87,7 @@
 } else {
     # {{{
     length($opt_r) && die("You need to specify one or more files when using the -r option\n");
+ D("Before PipeFP 2: CMD_SVN = \"$CMD_SVN\"");
     if (open(PipeFP, "$CMD_SVN stat -q |")) {
         my %has_conflict = ();
         while (<PipeFP>) {
@@ -261,6 +263,7 @@
                 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>
@@ -353,7 +356,7 @@
 
 =head1 REVISION
 
-$Id: svndiff 121 2005-04-26 21:11:10Z sunny256 $
+$Id: svndiff 123 2005-04-26 22:34:56Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -418,8 +421,8 @@
 
 (Whitespace is optional and more options will come.)
 
-The string inside the C<diffprog> can be set to whatever your diff
-program is called as, the default string is "vimdiff".
+The string inside the C<diffprog> elements can be set to whatever your
+diff program is called as, the default string is "vimdiff".
 
 =back
 
@@ -468,4 +471,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: svndiff 121 2005-04-26 21:11:10Z sunny256 $
+# End of file $Id: svndiff 123 2005-04-26 22:34:56Z 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 15:41:29 PDT
Messages per page: