Changeset 296

Timestamp:

02/10/2007 01:46:16 PM

Author:

luedi

Message:

When building a valid path, we first check for non-deleted contexts, even though these item pathes are valid. A deleted context means, that an item existed in this context in a specific version, but was later deleted from that context. So it is normally not possible to perform any further action on this item. Therefore we prefer non-deleted contexts.

Files:

• trunk/script/Vss2Svn/ActionHandler.pm (modified) (5 diffs)

trunk/script/Vss2Svn/ActionHandler.pm

@@ -1112 +1112 @@
-#  _get_valid_path
-# This function returns an itempath for the physical file, that was valid in
-a new version
-t least one active path, there should be at least one valid
-item path 
+new versions
+n active path, there should be at least one valid item path
+
-# If we can't find any valid itempath, we can not perform a "copy from" revision
-# In this case, we need to recheckin the current content of the item
@@ -1120 +1120 @@
-sub _get_valid_path {
-    my($self, $physname, $parentphys, $version) = @_;
+    
+    # 1.) We first check for non-deleted contexts, even though these item pathes 
+    #     are valid. A deleted context means, that an item existed in this context 
+    #     in a specific version, but was later deleted from that context. So it is
+    #     normally not possible to perform any further action on this item. Therefore
+    #     we prefer non-deleted contexts.
+    my $path = $self->_get_valid_path2 ($physname, $parentphys, $version, 0);
+    return $path if defined $path;
+
+    # 2.) now we also check for deleted contexts
+    $path = $self->_get_valid_path2 ($physname, $parentphys, $version, 1);
+    return $path;
+} # End _get_valid_path
+
+###############################################################################
+#  _get_valid_path2
+# This function is an internal helper: It will check for active and inactive,
+# but valid item pathes, depending on the $deleted flag, see also _get_valid_path
+###############################################################################
+sub _get_valid_path2 {
+    my($self, $physname, $parentphys, $version, $deleted) = @_;
-
-    my $physinfo = $gPhysInfo{$physname};
@@ -1131 +1152 @@
-    
-    # 1. check the parent requested, if there was an item name for this version
-
+   
-    my $parent = $physinfo->{parents}->{$parentphys};
-    if (defined $parent &&
-#        $parentphys ne '99999999'
+        (!defined $parent->{deleted} || $deleted == 1)
-        $parent->{versions}->[$version]) {
-        return $parent->{versions}->[$version];
@@ -1147 +1168 @@
-        $parent = $physinfo->{parents}->{$parentphys};
-        if (defined $parent &&
-#            $parentphys ne '99999999'
+            (!defined $parent->{deleted} || $deleted == 1)
-            $parent->{versions}->[$version]) {
-            return $parent->{versions}->[$version];
@@ -1154 +1175 @@
-    
-    return undef;
-
+2
-
-###############################################################################