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-01 22:41:06 PST
Message User: sunny256
Date: 05/04/01 22:41:06

Modified:
 /svnutils/trunk/src/
  svndiff

Log:
 r111 | sunny256 | 2005-04-02 05:14:56 +0000 (Sat, 02 Apr 2005) | 5 lines
 
 * /trunk/src/svndiff
   Don’t use system() directly, but call the new mysyst() sub instead. No
   need to duplicate debugging messages anymore, and deb_wait() is only
   called once.

File Changes:

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

File [changed]: svndiff
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​svndiff?r1=1.12&​r2=1.13
Delta lines: +14 -11
---------------------
--- svndiff 2 Apr 2005 06:39:46 -0000 1.12
+++ svndiff 2 Apr 2005 06:41:06 -0000 1.13
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $
+# $Id: svndiff 111 2005-04-02 05:14:56Z sunny256 $
 # Uses a specified diff program for viewing differences in a Subversion
 # versioned directory tree.
 #
@@ -109,13 +109,9 @@
     (-e $File2) || (warn("$File2: File not found, is not under version control\n"), return);
 
     if ($Cmd eq "vimdiff") {
- D("CMD: $Cmd $File1 $File2\n");
- deb_wait();
- system("$Cmd $File1 $File2");
+ mysyst("$Cmd $File1 $File2");
     } else {
- D("CMD: $Cmd $File2 $File1\n");
- deb_wait();
- system("$Cmd $File2 $File1");
+ mysyst("$Cmd $File2 $File1");
     }
 
     if ($has_conflict) {
@@ -123,8 +119,7 @@
               "in $File1 is resolved: ");
         if (<STDIN> =~ /^y$/i) {
             print("$progname: OK, marking $File1 as resolved.\n");
- D("CMD: $CMD_SVN resolved $File1");
- system("$CMD_SVN resolved $File1");
+ mysyst("$CMD_SVN resolved $File1");
         }
     }
 
@@ -145,6 +140,14 @@
     <STDIN>;
 }
 
+sub mysyst {
+ my @Args = @_;
+ my $system_txt = sprintf("system(\"%s\");", join("\", \"", @Args));
+ D("$system_txt");
+ deb_wait();
+ system(@_);
+}
+
 sub usage {
     # Send the help message to stdout {{{
     my $Retval = shift;
@@ -177,7 +180,7 @@
 
 =head1 REVISION
 
-$Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $
+$Id: svndiff 111 2005-04-02 05:14:56Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -250,4 +253,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $
+# End of file $Id: svndiff 111 2005-04-02 05:14:56Z sunny256 $




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@svnu​tils.tigris.org
For additional commands, e-mail: cvs-help at svnutils dot tigris dot org

« 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-01 22:41:06 PST
Messages per page: