+set complaints 10

[nethome.git] / bin / cvsutil

diff --git a/bin/cvsutil b/bin/cvsutil
index fd833d5..1048e97 100755 (executable)
--- a/bin/cvsutil
+++ b/bin/cvsutil
@@ -1,6 +1,14 @@
 #! /usr/bin/perl
 #
 #      $Id$
+#
+#      Recommended aliases:
+#              alias cvsfiles='cvsutil --files --print'
+#              alias cvsignores='cvsutil --ignores --print'
+#              alias cvsignoresall='cvsutil --ignores --workings --print'
+#              alias cvsignoresrm='cvsutil --ignores --rm'
+#              alias cvsignoresrmall='cvsutil --ignores --workings --rm'
+#              alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 
 use strict;
 use warnings;
@@ -8,6 +16,8 @@ use warnings;
 use Getopt::Long;
 use Cwd qw(chdir fastgetcwd);
 use Errno qw(ENOENT);
+use File::Remove qw(remove);
+use Carp qw(confess cluck croak carp);
 
 use constant ENTRIES  =>"CVS/Entries";
 use constant CVSIGNORE=>".cvsignore";
@@ -77,8 +87,8 @@ my($msg,%opts)=@_;
 
        my $errstr=$!;
        $msg.=" in \"".fastgetcwd."\" (CVS \"$dir_dirname\")".($opts{"noerrno"} ? "" : ": $errstr");
-       die $msg if $opt_fatal;
-       warn $msg;
+       croak $msg if $opt_fatal;
+       carp $msg;
 }
 
 sub fordirs
@@ -140,9 +150,11 @@ sub localreaddir
                }
        while (<E>) {
                chomp;
+               next if /^D$/;
                do { push @dir_dirs ,$1; next; } if m#^D/([^/]*)/#;
+               next if m#^/[^/]*/-#;   # deleted file: /filename/-1.1/dummy timestamp//
+               next if m#^/[^/]*/0/#;  # new file: /filename/0/dummy timestamp//
                do { push @dir_files,$1; next; } if m#^/([^/]*)/# ;
-               next if /^D$/;
                mayfatal "File ".ENTRIES." contains invalid line \"$_\"",("noerrno"=>1);
                }
        close E;
@@ -195,7 +207,8 @@ sub localactionrm
 {
 my($filename)=@_;
 
-       if (!unlink $filename) {
+       # '\1' for '-r':
+       if (!remove \1,$filename) {
                mayfatal "File \"$_\" cannot be removed" if !$!{ENOENT};
                }
 }