[svk-commit] r3129 - branches/delta-refactor/lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Mon Nov  3 15:15:14 2008
New Revision: 3129

Modified:
   branches/delta-refactor/lib/SVK/Delta.pm

Log:
simplify cb_unchanged handling

Modified: branches/delta-refactor/lib/SVK/Delta.pm
==============================================================================
--- branches/delta-refactor/lib/SVK/Delta.pm	(original)
+++ branches/delta-refactor/lib/SVK/Delta.pm	Mon Nov  3 15:15:14 2008
@@ -261,17 +261,17 @@
         $self->_compat_xdroot->check_path($entry_target->path_anchor);
     $newpaths{add} = !$newpaths{base_kind} || $arg{in_copy};
 
-    if (my $kind = $newpaths{base_kind}) {
-	my $unchanged = ($kind == $SVN::Node::file && $signature && !$signature->changed ($entry));
-
-	if ($unchanged && !$sche && !$ccinfo->{'.conflict'}) {
+    if (my $unchanged = ($newpaths{base_kind} == $SVN::Node::file &&
+                         $signature && !$signature->changed($entry))) {
+        # XXX: need to see prop-changed-ness to know if we can call cb_unchanged.
+	if (!$ccinfo->{'.conflict'}) {
 	    $self->cb_unchanged->($editor, $newpaths{entry}, $baton,
 				 $self->_delta_rev2($target, $ccinfo)
 				) if $self->cb_unchanged;
 	    return;
 	}
     }
-    else {
+    if (!$newpaths{base_kind}) {
 	my $add = $sche || $arg{auto_add} || $newpaths{kind};
 	# If we are not at intermediate path, process ignore
 	# for unknowns, as well as the case of auto_add (import)