Changeset 340

Timestamp:

04/29/2008 10:53:04 PM

Author:

toby

Message:

* Path for renames during restore and renames during share (thanks to Bryan Aldrich for the patch)
* Formatting cleanup and removal of commented code

Files:

• trunk/script/Vss2Svn/ActionHandler.pm (modified) (13 diffs)
• trunk/script/Vss2Svn/Dumpfile.pm (modified) (2 diffs)
• trunk/script/vss2svn.pl (modified) (39 diffs)

trunk/script/Vss2Svn/ActionHandler.pm

@@ -114 +114 @@
-    if (!defined $version ) {
-        $self->{errmsg} .= "Attempt to add entry '$row->{physname}' with "
-
+ parent: $row->{parentphys} itemtype: $row->{itemtype}
-        
-        $gOrphanedInfo {$row->{physname} } = 1;
@@ -264 +264 @@
-    my $itempath = $parentpath . $row->{itemname};
-
+    # a SHARE *can* rename a file if the parent is no longer present.
+    $row->{info} = $row->{itemname};
+    $self->_rename_handler();
+
-    # 'sourceinfo' contains the source path
-    my $sourceinfo = $self->_get_valid_path ($physname, $row->{parentphys}, $version);
@@ -273 +277 @@
-
-        $self->{action} = 'ADD';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    # track the addition of the new parent
-    $self->_add_parent ($physname, $row->{parentphys});
@@ -330 +322 @@
-    }
-    
-#    # First delete this parentphys from the old shared object; see
-#    # _delete_handler for details
-#    if ($oldphysinfo->{parentphys} eq $row->{parentphys}) {
-#        $oldphysinfo->{parentphys} = shift( @{ $oldphysinfo->{sharedphys} } );
-#    } else {
-#        my $sharedphys = [];
-#
-#        foreach my $oldparent (@{ $oldphysinfo->{sharedphys} }) {
-#            push @$sharedphys, $oldparent
-#                unless $oldparent eq $row->{parentphys};
-#        }
-#
-#        $oldphysinfo->{sharedphys} = $sharedphys;
-#    }
-
-    my $version = defined $row->{version} ? $row->{version}
-                    : $self->{version};
@@ -389 +366 @@
-    return $result;
-
-
-#    # Now create a new entry for this branched item
-#    $gPhysInfo{$physname} =
-#        {
-#         type       => $row->{itemtype},
-#         name       => $row->{itemname},
-##         parentphys => $row->{parentphys},
-##         sharedphys => [],
-#         parents    => {},
-#        };
-
-#    $self->_add_parent ($physname, $row->{parentphys});
-#    $self->{itempaths} = $self->_get_current_item_paths(1);
-
-#    return 1;
-
-}  #  End _branch_handler
-
@@ -411 +372 @@
-###############################################################################
-sub _move_handler {
-
+, $oldName
-    my $row = $self->{row};
-
@@ -440 +401 @@
-    }
-
-    # '$sourceinfo' is the path for the old location (the move source);
-    my $sourceparent = $self->_get_parent_path ($row->{info});
-    my $sourceinfo = $sourceparent . $row->{itemname};
-
-
-    # check the target path
-    if (!defined ($row->{parentphys})) {
@@ -453 +409 @@
-    }
-
+    # '$sourceinfo' is the path for the old location (the move source);
+    my $sourceparent = $self->_get_parent_path ($row->{info});
+    my $sourceinfo;
+    if (defined $oldName)
+    {
+        $sourceinfo = $sourceparent . $oldName;
+    }
+    else
+    {
+        $sourceinfo = $sourceparent . $row->{itemname};
+    }
+
-    # '$itempath' contains the move target path
-    my $parentpath = $self->_get_current_parent_path ();
@@ -495 +463 @@
-    $self->{action} = 'MOVE';
-    $row->{actiontype} = 'MOVE';
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -524 +508 @@
-    my $itempaths = [$parentpath . $physinfo->{name}];
-
-#    if ($physinfo->{parentphys} eq $row->{parentphys}) {
-#        # Deleting from the "main" parent; find a new one by shifting off the
-#        # first shared path, if any; if none exists this will leave a null
-#        # parent entry. We could probably just delete the whole node at this
-#        # point.
-#
-#        $physinfo->{parentphys} = shift( @{ $physinfo->{sharedphys} } );
-#
-#    } else {
-#        my $sharedphys = [];
-#
-#        foreach my $parent (@{ $physinfo->{sharedphys} }) {
-#            push @$sharedphys, $parent
-#                unless $parent eq $row->{parentphys};
-#        }
-#
-#        $physinfo->{sharedphys} = $sharedphys;
-#    }
-
-    # protect for delete/purge cycles: if the parentphys isn't in the shares
-    # anymore, the file was already deleted from the parent and is now purged
@@ -577 +542 @@
-        return 0;
-    }
-
-#    if (defined $physinfo->{parentphys}) {
-#        # Item still has other shares, so recover it by pushing this parent
-#        # onto its shared list
-#
-#        push( @{ $physinfo->{sharedphys} }, $row->{parentphys} );
-#
-#    } else {
-#        # Recovering its only location; set the main parent back to this
-#        $physinfo->{parentphys} = $row->{parentphys};
-#    }
-
-    # recover this item within the current parent
@@ -896 +850 @@
-    $self->{physname_seen} .= "$physname, ";
-
-#    my @pathstoget =
-#        ($physinfo->{parentphys}, @{ $physinfo->{sharedphys} } );
-    my @pathstoget = @parents;
-    
-    my $paths;
-    my $result;
-#    if (defined $physinfo->{parents}->{$row->{parentphys}}->{deleted}) {
-#        return 0;
-#    }
-
-PARENT:
@@ -964 +913 @@
-            $self->_track_item_path ($row->{physname}, $parent, $row->{version}, $result);
-
-#            my $versions = \@{$physinfo->{parents}->{$parent}->{versions}};
-#            
-#            # in the case of pinning and sharing with pinning, the version number
-#            # denotes a version in the past. So if there is already an entry for
-#            # this version number skip this parent.
-#            if (exists $versions->[$row->{version}]) {
-#                next PARENT;
-#            }
-            
-#            # remember the last version, in which the file was modified
-#            $physinfo->{last_version} = $row->{version};
-            
-#            $result = $self->_get_parent_path ($parent) . $physinfo->{name};
-    
-#            if(!defined($result)) {
-#                next PARENT;
-#            }
-    
-#            $versions->[$row->{version}] = $result;
-        }
-    }

trunk/script/Vss2Svn/Dumpfile.pm

@@ -206 +206 @@
-        }
-        else {
-
-
-
+
+
+
+
+
+
+
-            return 0;
-        }
@@ -220 +224 @@
-    }
-    elsif ($success == 0) {
-
-
-
+
+
+
+
+
+
-        $self->_create_svn_path ($nodes, $itempath);
-    }

trunk/script/vss2svn.pl

@@ -69 +69 @@
-                                next    => 'MERGEMOVEDATA'},
-
- 
+
-            MERGEMOVEDATA => {handler => \&MergeMoveData,
-                                next    => 'REMOVETMPCHECKIN'},
@@ -253 +253 @@
-
-    if (!defined $filesegment[0] || !defined $filesegment[1]
-       
+    
-        # physical file doesn't exist; it must have been destroyed later
-        &ThrowWarning("Can't retrieve info from physical file "
@@ -310 +310 @@
-       $tphysname, $itemname, $itemtype, $parent, $user, $timestamp, $comment,
-       $is_binary, $info, $priority, $sortkey, $label, $cachename);
-
+
-    my $last_timestamp = 0;
-
+
-VERSION:
-    foreach $version (@{ $xml->{Version} }) {
@@ -342 +342 @@
-        }
-        $last_timestamp = $timestamp;
-
+
-        $itemtype = $info->{type};
-        $actiontype = $info->{action};
@@ -356 +356 @@
-        $priority = 5;
-        $label = undef;
-
+
-        if ($version->{Comment} && !ref($version->{Comment})) {
-            $comment = $version->{Comment} || undef;
@@ -380 +380 @@
-                    $comment .= "\n";
-                }
-
+
-                $comment .= $action->{LabelComment} || undef;
-            }
@@ -439 +439 @@
-        } elsif ($actiontype eq 'BRANCH') {
-            $info = $action->{Parent};
- 
+
-
-        $vernum = ($parentdata)? undef : $version->{VersionNumber};
@@ -474 +474 @@
-            && $actiontype ne 'LABEL') {
-            my ($labelComment);
-
+
-            if ($version->{LabelComment} && !ref($version->{LabelComment})) {
-                $labelComment = $version->{LabelComment};
@@ -590 +590 @@
-    # Get the row(s) corresponding to the parent(s) of this row, and work out
-    # the maximum depth
-
+
-    my $sql = <<"EOSQL";
-SELECT
@@ -657 +657 @@
-    $parentdata = 0 unless defined $parentdata;
-    $parentdata = 1 if $parentdata != 0;
-
+
-    my $sql = <<"EOSQL";
-SELECT
@@ -723 +723 @@
-
-    my($sth, $rows, $row);
+
-    $sth = $gCfg{dbh}->prepare('SELECT * FROM PhysicalAction '
-                               . 'WHERE actiontype = "MOVE_FROM"');
@@ -739 +740 @@
-        my $target = $row->{parentphys};
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            }
-        }
-
-
+
+
+
+
+
+
-UPDATE
-    PhysicalAction
@@ -762 +766 @@
-    action_id = ?
-EOSQL
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -785 +806 @@
-    }
-
+    $sth = $gCfg{dbh}->prepare('SELECT * FROM PhysicalAction WHERE actiontype = "RESTORE"');
+    $sth->execute();
+    $rows = $sth->fetchall_arrayref( {} );
+
+    foreach $row (@$rows) {
+        #calculate last name of this file. Store it in $info
+
+        my $sql = "SELECT * FROM PhysicalAction WHERE physname = ? AND timestamp < ? ORDER BY timestamp DESC";
+
+        $sth = $gCfg{dbh}->prepare($sql);
+        $sth->execute( $row->{physname}, $row->{timestamp} );
+
+        my $myOlderRecords = $sth->fetchall_arrayref( {} );
+
+        if (scalar @$myOlderRecords > 0) {
+            my $update = $gCfg{dbh}->prepare('UPDATE PhysicalAction SET info = ? WHERE action_id = ?');
+            $update->execute(@$myOlderRecords[0]->{itemname}, $row->{action_id});
+        }
+    }
-
-    1;
@@ -807 +847 @@
-    foreach $row (@$rows) {
-        my $physname = $row->{physname};
-
+
-        my $sql = 'SELECT * FROM PhysicalAction WHERE physname = ?';
-        my $update = $gCfg{dbh}->prepare($sql);
-
+
-        $update->execute( $physname );
-
-               
-               
-
-               
-
-
-
-
-               
+    
+    
+
+    
+  
+  
+  
+
+    
-
-    1;
@@ -835 +875 @@
-    $sth = $gCfg{dbh}->prepare($sql);
-    $sth->execute();
-
+
-    # need to pull in all recs at once, since we'll be updating/deleting data
-    $rows = $sth->fetchall_arrayref( {} );
-
+
-    return if ($rows == -1);
-    return if (@$rows < 2);
-
+
-    my @delchild = ();
-
+
-    for $r (0 .. @$rows-2) {
-        $row = $rows->[$r];
-
+
-        if ($row->{actiontype} eq 'PIN' && !defined $row->{version}) # UNPIN
- 
+
-            # Search for a matching pin action
-            my $u;
@@ -854 +894 @@
-                $next_row = $rows->[$u];
-
- 
+
-                    && defined $next_row->{version}   # PIN
-                    && $row->{physname} eq $next_row->{physname}
@@ -863 +903 @@
-                        print "found UNPIN/PIN combination for $row->{parentphys}/$row->{physname}"
-                            . "($row->{itemname}) @ ID $row->{action_id}\n"  if $gCfg{verbose};
-
+
-                        # if we have a unpinFromVersion number copy this one to the PIN handler
-                        if (defined $row->{info})
@@ -871 +911 @@
-                            $sth2->execute($row->{info}, $next_row->{action_id});
-                        }
-
+
-                        push (@delchild, $row->{action_id});
-                    }
@@ -880 +920 @@
-        }
-    }
-
+
-    my $id;
-    foreach $id (@delchild) {
-        &DeleteChildRec($id);
-    }
-
+
-    1;
-
+
-}  #  End MergeUnpinPinData
-
@@ -898 +938 @@
-    $sth = $gCfg{dbh}->prepare($sql);
-    $sth->execute();
-
+
-    # need to pull in all recs at once, since we'll be updating/deleting data
-    $rows = $sth->fetchall_arrayref( {} );
-
+
-    foreach $row (@$rows) {
-
@@ -912 +952 @@
-        # UNPIN/PIN with unknown UNPIN version: we are lost in this case and we
-        #     can not distinguish this case from the PIN only case.
-
+
-        my $sql2;
-        my $prefix;
@@ -928 +968 @@
-            $prefix = "reverted changes for: \n";
-        }
-
+
-        # UNPIN only
-        if (   !defined $row->{version}     # no PIN version number
@@ -941 +981 @@
-        }
-
- 
+
-        if (    defined $row->{version}     # PIN version number
-            &&  defined $row->{info}) {     # UNPIN version number
@@ -951 +991 @@
-                    . '      AND version<=' . $row->{version}
-                    . ' ORDER BY version ';
-
+
-            if ($row->{info} > $row->{version}) {
-                $sql2 .= "DESC";
@@ -963 +1003 @@
-
-        next if !defined $sql2;
-
+
-        my $sth2 = $gCfg{dbh}->prepare($sql2);
-        $sth2->execute();
-
-        my $comments = $sth2->fetchall_arrayref( {} );
-     
+
-        print "merging comments for $row->{physname}" if $gCfg{verbose};
-        print " from $row->{info}" if ($gCfg{verbose} && defined $row->{info});
-        print " to $row->{version}" if ($gCfg{verbose} && defined $row->{version});
-        print "\n" if $gCfg{verbose};
-
+
-        foreach my $c(@$comments) {
-            print " $c->{version}: $c->{comment}\n" if $gCfg{verbose};
@@ -980 +1020 @@
-            $comment =~ s/\n+$//;
-        }
-
+
-        if (defined $comment && !defined $row->{comment}) {
-            $comment = $prefix . $comment if defined $prefix;
@@ -990 +1030 @@
-    }
-    1;
-
+
-}  #  End BuildComments
-
@@ -1095 +1135 @@
-        # prematurally call the next row. Otherwise, we get an empty revision.
-        $svnrevs->check($row);
-
+
-        # May contain add'l info for the action depending on type:
-        # RENAME: the new name (without path)
-        # SHARE: the source path which was shared
-        # MOVE: the old path
-      
+
-        # LABEL: the name of the label
-        $row->{info} = $handler->{info};
@@ -1108 +1148 @@
-            $row->{version} = $handler->{version};
-        }
-
+
-        $allitempaths = join("\t", @$itempaths);
-        $row->{itempaths} = $allitempaths;
@@ -1115 +1155 @@
-                             itemtype is_binary info) });
-        $joincache->add( $svnrevs->{revnum}, $vsscache->{pkey} );
-
+
-        if (defined $row->{label}) {
-            $labelcache->add(@$row{ qw(physname version label itempaths) });
@@ -1126 +1166 @@
-    $joincache->commit();
-    $labelcache->commit();
-
+
-}  #  End BuildVssActionHistory
-
@@ -1199 +1239 @@
-                        || $action->{action} eq 'COMMIT')) {
-                    &ThrowWarning("'$physname': no version specified for retrieval");
-
+
-                    # fall through and try with version 1.
-                    $version = 1;
-                }
-
+
-                if ($itemtype == 2 && defined $version) {
-                    $exported{$physname} = &ExportVssPhysFile($physname, $version);
@@ -1495 +1535 @@
-    # Build numbers look like:
-    #  a.) ssphys 0.20.0, Build 123
- 
+
-    #  c.) ssphys 0.20.0, Build 123:150 (locally modified)
- 
+
-
-    # turn it into
@@ -1701 +1741 @@
-        RecoveredFile => {type => 2, action => 'RECOVER'},
-        ArchiveVersionsofFile => {type => 2, action => 'ADD'},
-       
+    
-        ArchiveFile => {type => 2, action => 'DELETE'},
-        RestoredFile => {type => 2, action => 'RESTORE'},
@@ -1934 +1974 @@
-sub Initialize {
-    $| = 1;
-
+
-    GetOptions(\%gCfg,'vssdir=s','tempdir=s','dumpfile=s','resume','verbose',
-               'debug','timing+','task=s','revtimerange=i','ssphys=s',
@@ -1988 +2028 @@
-
-    $gCfg{errortasks} = [];
-
+
-    {
-        no warnings 'once';
@@ -2034 +2074 @@
-        XML::SAX->load_parsers($INC[1]);
-    }
-
+
-    $gCfg{xmlParser} = 'XML::SAX::Expat';
-    $XML::SAX::ParserPackage = $gCfg{xmlParser};
@@ -2107 +2147 @@
-    --task <task>     : specify the task to resume; task is one of the following
-                        INIT, LOADVSSNAMES, FINDDBFILES, GETPHYSHIST,
- 
+
-                        MERGEUNPINPIN, BUILDACTIONHIST, IMPORTSVN
-