Changeset 306

Timestamp:

03/21/2007 07:03:18 PM

Author:

luedi

Message:

perform a basic check on the linearity of timestamps. If this check fails, move the bad timestamp to one second after the last known timestamp.

Files:

• trunk/script/vss2svn.pl (modified) (5 diffs)

trunk/script/vss2svn.pl

@@ -298 +298 @@
-       $tphysname, $itemname, $itemtype, $parent, $user, $timestamp, $comment,
-       $is_binary, $info, $priority, $sortkey, $label, $cachename);
-
+
+
+
-VERSION:
-    foreach $version (@{ $xml->{Version} }) {
@@ -305 +307 @@
-        $tphysname = $action->{Physical} || $physname;
-        $user = $version->{UserName};
-        $timestamp = $version->{Date};
-
-        $itemname = &GetItemName($name);
@@ -313 +314 @@
-
-        if (!$info) {
-warn "\nWARNING: Unknown action '$actionid'\n"
+&ThrowWarning ("'$physname': Unknown action '$actionid'\n")
-            next VERSION;
-        }
-
+        # check the linear order of timestamps. It could be done better, for
+        # example checking the next version and calculate the middle time stamp
+        # but regardless of what we do here, the result is erroneous, since it
+        # will mess up the labeling.
+        $timestamp = $version->{Date};
+        if ($timestamp < $last_timestamp) {
+            $timestamp = $last_timestamp + 1;
+            &ThrowWarning ("'$physname': wrong timestamp at version "
+                           . "'$version->{VersionNumber}'; setting timestamp to "
+                           . "'$timestamp'");
+        }
+        $last_timestamp = $timestamp;
+        
-        $itemtype = $info->{type};
-        $actiontype = $info->{action};
@@ -346 +360 @@
-        if (defined $action->{Label} && !ref($action->{Label})) {
-            $label = $action->{Label};
-
+
-            # append the label comment to a possible version comment
-            if ($action->{LabelComment} && !ref($action->{LabelComment})) {
@@ -437 +451 @@
-                    $sortkey, $parentdata, $label, $comment);
-
+        # Handle version comments as a secondary action for the same 
+#        if (defined $version->{Label} && !ref($version->{Label})) {
+#            my ($labelComment);
+#            
+#            if ($version->{LabelComment} && !ref($version->{LabelComment})) {
+#                $labelComment = $version->{LabelComment};
+#            }
+#            $cache->add($tphysname, $vernum, $parentphys, 'LABEL', $itemname,
+#                        $itemtype, $timestamp, $user, $is_binary, $info, 5,
+#                        $sortkey, $parentdata, $version->{Label}, $labelComment);
+#        }
+        
-    }
-