Changeset 319

Timestamp:

07/09/2007 04:25:25 PM

Author:

luedi

Message:

• #59: added a possibility to allow for fine grained label mapping
  
• #60: treat UNPIN/PIN activities as commit and not as copy from
  
• #60: assign a correct comment to an UNPIN/PIN activity
  
• #61: don't create a subversion action if the PIN/UNPIN does not change the state of the file
  
• #62: detect multiple interwoven UNPIN/PIN activities
  

Files:

• trunk/script/Vss2Svn/ActionHandler.pm (modified) (2 diffs)
• trunk/script/Vss2Svn/Dumpfile.pm (modified) (5 diffs)
• trunk/script/Vss2Svn/Dumpfile/LabelMapper.pm (added)
• trunk/script/vss2svn.pl (modified) (10 diffs)

trunk/script/Vss2Svn/ActionHandler.pm

@@ -642 +642 @@
-    my $parentinfo = \%{$physinfo->{parents}->{$row->{parentphys}}};
-
+    # depending on the version number of the PIN/UNPIN action, we don't have
+    # to convert this action into a real commit. In this case we only have to
+    # track, the state.
+    my $change_action = 1;
+    
-    my $version = $row->{version};
-    if (!defined $row->{version}) {
-        # this is the unpin handler
+        
+        # is this the unpin version and the last version identically?
+        $change_action = 0 if (defined $parentinfo->{pinned}
+            && $parentinfo->{pinned} == $physinfo->{last_version} );
+        
-        undef $parentinfo->{pinned};
-        $version = $physinfo->{last_version};
-    }
-    else {
+        # is this the pin version and the last version identically?
+        # since the UNPIN/PIN merge, it is possible, that the item can still be
+        # in a pinned state:
+        $change_action = 0 if ($row->{version} == $physinfo->{last_version}
+                               && !defined $parentinfo->{pinned});
+        
-        $parentinfo->{pinned} = $row->{version};
-    }
@@ -660 +676 @@
-    $self->_track_item_path ($physname, $row->{parentphys}, $version, $itempath);
-
-1
+$change_action
-}  #  End _pin_handler
-

trunk/script/Vss2Svn/Dumpfile.pm

@@ -4 +4 @@
-use Vss2Svn::Dumpfile::SanityChecker;
-use Vss2Svn::Dumpfile::AutoProps;
+use Vss2Svn::Dumpfile::LabelMapper;
-
-require Time::Local;
@@ -49 +50 @@
-###############################################################################
-sub new {
-
+, $labelmapper
-
-    my $self =
@@ -61 +62 @@
-         auto_props => $autoprops,
-         do_md5 => $md5,
+         label_mapper => $labelmapper,
-        };
-
@@ -568 +570 @@
-    # if one of the necessary copy from attributes are unavailable we fall back
-    # to a complete checkin
-
+
+
+
+
-        return $self->_commit_handler ($itempath, $nodes, $data, $expdir);
-
+#
-    
-    my $node = Vss2Svn::Dumpfile::Node->new();
@@ -605 +610 @@
-    # as a valid share source.
-    if (defined ($label)) {
+        my $labeldir = $main::gCfg{labeldir};
+        
+        if (defined $self->{label_mapper}) {
+            $labeldir = $self->{label_mapper}->remap ($main::gCfg{labeldir}, $label);
+        }
+        $labeldir =~ s:\\:/:g;
+        $labeldir =~ s:/$::;
+        
-        $label =~ s![\\/:*?"<>|]!_!g;
-        
-        my $vssitempath = $itempath;
-        $vssitempath =~ s/^$main::gCfg{trunkdir}//;
-main::gCfg{labeldir}
+labeldir
-
-        $self->_create_svn_path ($nodes, $labelpath);

trunk/script/vss2svn.pl

@@ -79 +79 @@
-            # Remove unnecessary Unpin/pin activities
-            MERGEUNPINPIN => {handler => \&MergeUnpinPinData,
+                                 next    => 'BUILDCOMMENTS'},
+
+            # Rebuild possible missing comments
+            BUILDCOMMENTS => {handler => \&BuildComments,
-                                 next    => 'BUILDACTIONHIST'},
-
@@ -445 +449 @@
-            $vernum = $action->{PinnedToVersion} if (defined $action->{PinnedToVersion});
-#        }
+
+        # for unpin actions also remeber the unpinned version
+        $info = $action->{UnpinnedFromVersion} if (defined $action->{UnpinnedFromVersion});
-
-        $priority -= 4 if $actiontype eq 'ADD'; # Adds are always first
@@ -632 +639 @@
-    $sth->execute( $depth, $row->{action_id} );
-
-ParentRec
+Depth
-
-###############################################################################
@@ -837 +844 @@
-    for $r (0 .. @$rows-2) {
-        $row = $rows->[$r];
-        $next_row = $rows->[$r+1];
-        
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
- 
+}
-    }
- 
@@ -862 +887 @@
- 
-}  #  End MergeUnpinPinData
+
+###############################################################################
+#  BuildComments
+###############################################################################
+sub BuildComments {
+    my($sth, $rows, $row, $r, $next_row);
+    my $sql = 'SELECT * FROM PhysicalAction WHERE actiontype="PIN" AND itemtype=2 ORDER BY physname ASC';
+    $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) {
+
+        # technically we have the following situations:
+        # PIN only: we come from the younger version and PIN to a older one: the
+        #     younger version is the currenty version of the timestamp of the PIN action
+        # UNPIN only: we unpin from a older version to the current version, the
+        #     timestamp of the action will again define the younger version
+        # UNPIN/PIN with known UNPIN version: we merge from UNPIN version to PIN version
+        # 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;
+
+        # PIN only
+        if (    defined $row->{version}     # PIN version number
+            && !defined $row->{info}) {     # no UNPIN version number
+            $sql2 = 'SELECT * FROM PhysicalAction'
+                    . ' WHERE physname="' . $row->{physname} . '"'
+                    . '      AND parentphys ISNULL'
+                    . '      AND itemtype=2'
+                    . '      AND version>=' . $row->{version}
+                    . '      AND timestamp<=' . $row->{timestamp}
+                    . ' ORDER BY version DESC';
+        }
+        
+        # UNPIN only
+        if (   !defined $row->{version}     # no PIN version number
+            &&  defined $row->{info}) {     # UNPIN version number
+            $sql2 = 'SELECT * FROM PhysicalAction'
+                    . ' WHERE physname="' .  $row->{physname} . '"'
+                    . '      AND parentphys ISNULL'
+                    . '      AND itemtype=2'
+                    . '      AND timestamp<=' . $row->{timestamp}
+                    . '      AND version>' . $row->{info}
+                    . ' ORDER BY version ASC';
+        }
+
+        # PIN/UNPIN 
+        if (    defined $row->{version}     # no PIN version number
+            &&  defined $row->{info}) {     # UNPIN version number
+            $sql2 = 'SELECT * FROM PhysicalAction'
+                    . ' WHERE physname="' . $row->{physname} . '"'
+                    . '      AND parentphys ISNULL'
+                    . '      AND itemtype=2'
+                    . '      AND version>' . $row->{info}
+                    . '      AND version<=' . $row->{version}
+                    . ' ORDER BY version ASC';
+        }
+
+        next if !defined $sql2;
+        
+        my $sth2 = $gCfg{dbh}->prepare($sql2);
+        $sth2->execute();
+
+        my $comments = $sth2->fetchall_arrayref( {} );
+        my $comment;     
+        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};
+            $comment .= $c->{comment} . "\n";
+            $comment =~ s/^\n+//;
+            $comment =~ s/\n+$//;
+        }
+        
+        if (defined $comment && !defined $row->{comment}) {
+            $comment =~ s/"/""/g;
+            my $sql3 = 'UPDATE PhysicalAction SET comment="' . $comment . '" WHERE action_id = ' . $row->{action_id};
+            my $sth3 = $gCfg{dbh}->prepare($sql3);
+            $sth3->execute();
+        }
+    }
+    1;
+ 
+}  #  End BuildComments
-
-###############################################################################
@@ -1041 +1157 @@
-
-    my $autoprops = Vss2Svn::Dumpfile::AutoProps->new($gCfg{auto_props}) if $gCfg{auto_props};
-
+
+
-    Vss2Svn::Dumpfile->SetTempDir($gCfg{tempdir});
-
@@ -1166 +1283 @@
-VSS Encoding : $gCfg{encoding}
-Auto Props   : $gCfg{auto_props}
-
+
+
+
-
-VSS2SVN ver  : $VERSION
@@ -1564 +1683 @@
-        DestroyedFile => {type => 2, action => 'DELETE'},
-        RecoveredFile => {type => 2, action => 'RECOVER'},
-
+
+
-        ArchiveFile => {type => 2, action => 'DELETE'},
-        RestoredFile => {type => 2, action => 'RESTORE'},
@@ -1800 +1920 @@
-    GetOptions(\%gCfg,'vssdir=s','tempdir=s','dumpfile=s','resume','verbose',
-               'debug','timing+','task=s','revtimerange=i','ssphys=s',
-
+label_mapper=s', '
-
-    &GiveHelp("Must specify --vssdir") if !defined($gCfg{vssdir});
@@ -1974 +2094 @@
-                        --auto_props="c:/Dokumente und Einstellungen/user/Anwendungsdaten/Subversion/config"
-    --md5             : generate md5 checksums
+    --label_mapper    : INI style file to map labels to different locataions
-EOTXT
-