[svk-commit] r2327 - branches/2.0-releng/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Wed Mar 14 19:56:15 2007
New Revision: 2327

Modified:
   branches/2.0-releng/lib/SVK/Inspector.pm
   branches/2.0-releng/lib/SVK/Path.pm
   branches/2.0-releng/lib/SVK/XD.pm

Log:
Merge from trunk:
 r2314 at trunk:  clkao | 2007-03-07 14:22:32 +0000
  r7496 at ubuntu:  clkao | 2007-03-07 09:38:47 +0000
  Remove dead code spotted by coverage.
 
 r2315 at trunk:  clkao | 2007-03-07 14:22:42 +0000
  r7497 at ubuntu:  clkao | 2007-03-07 10:10:27 +0000
  More dead code removal.
 
 r2316 at trunk:  clkao | 2007-03-08 14:26:29 +0000
 r2314 has a require line accidentally removed.


Modified: branches/2.0-releng/lib/SVK/Inspector.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Inspector.pm	(original)
+++ branches/2.0-releng/lib/SVK/Inspector.pm	Wed Mar 14 19:56:15 2007
@@ -139,16 +139,4 @@
     return $path;
 }
 
-sub dirdelta_status_editor {
-    my ($self, $modified) = @_;
-    return SVK::Editor::Status->new
-	( notify => SVK::Notify->new
-	  ( cb_flush => sub {
-		my ($path, $status) = @_;
-		$modified->{$path} = $status->[0];
-	    }));
-}
-
-
-
 1;

Modified: branches/2.0-releng/lib/SVK/Path.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Path.pm	(original)
+++ branches/2.0-releng/lib/SVK/Path.pm	Wed Mar 14 19:56:15 2007
@@ -59,6 +59,7 @@
 
 use SVK::Logger;
 use SVK::Depot;
+use SVK::Root;
 use base 'SVK::Accessor';
 
 __PACKAGE__->mk_shared_accessors
@@ -484,15 +485,6 @@
     return ($toroot, $root->fs->revision_root($copyfrom_rev, $ppool), $path);
 }
 
-sub _copies_contain_path {
-    my ($copy, $path) = @_;
-    my ($match) = grep { index ("$path/", "$_/") == 0 }
-	sort { length $b <=> length $a } keys %$copy;
-    return unless $match;
-    $path =~ s/^\Q$match\E/$copy->{$match}[1]/;
-    return ($copy->{$match}[0], $path);
-}
-
 =head2 related_to
 
 Check if C<$self> is related to another target.

Modified: branches/2.0-releng/lib/SVK/XD.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/XD.pm	(original)
+++ branches/2.0-releng/lib/SVK/XD.pm	Wed Mar 14 19:56:15 2007
@@ -1898,14 +1898,4 @@
     $self->write;
 }
 
-package SVK::XD::Root;
-require SVK::Root;
-
-sub new {
-    my ($class, @arg) = @_;
-    unshift @arg, undef if $#arg == 0;
-    return SVK::Root->new({ txn => $arg[0], root => $arg[1]});
-}
-
-
 1;