Changeset 323

Timestamp:

07/18/2007 12:19:19 PM

Author:

luedi

Message:

#51: the CRLF to LF conversion needs to be done on every commit of the file
#13: apply auto_props also on renames
#25, #53: if a specific version of an item is not recoverable the Copy patch fails to copy the missing file.

Files:

• trunk/script/Vss2Svn/Dumpfile.pm (modified) (4 diffs)

trunk/script/Vss2Svn/Dumpfile.pm

@@ -309 +309 @@
-    my $node = Vss2Svn::Dumpfile::Node->new();
-    $node->set_initial_props($newpath, $data);
+    # change the properties according to the new name
+    if (defined $self->{auto_props}) {
+        $node->add_props ($self->{auto_props}->get_props ($newpath));
+    }
-    $node->{action} = 'add';
-
@@ -765 +769 @@
-    my $fh = $self->{fh};
-
+    # only in an add or rename action the propery array is set. So we have
+    # to lookup the eol-style flag again. The best thing is to query the
+    # property always temporarirly
+    my %tmpProps = ();
+    if (defined $self->{auto_props}) {
+        %tmpProps = $self->{auto_props}->get_props ($node->{path});
+    }
+    my $eolStyle = %tmpProps->{'svn:eol-style'};
+    my $isNative = (defined $eolStyle && $eolStyle eq 'native') ? 1 : 0;
+
-    my $string = $node->get_headers();
-    print $fh $string;
-    $self->output_content($node->{hideprops}? undef : $node->{props},
-
+, $isNative
-}  #  End output_node
-
@@ -775 +789 @@
-###############################################################################
-sub output_content {
-
+, $isNative
-
-    my $fh = $self->{fh};
@@ -804 +818 @@
-    $md5 = Digest::MD5->new if $self->{do_md5};
-
+    # prevent errors due to non existing files
+    if(!defined $text && defined $file && !-e $file) {
+        $text = "";
+    }
+
-    # convert CRLF -> LF before calculating the size and compute the md5
-    if(!defined $text && defined $file) {
-    my ($input, $output);
-$style = $props->{'svn:eol-style'}
-style && $style eq 'native'
+         
+($input, $output)
+isNative
-            open ($input, "<:crlf", $file);
-            my $tmpFile = "$gTmpDir/crlf_to_lf.tmp.txt";