Changeset 18

Timestamp:

12/09/07 22:35:59 (1 year ago)

Author:

bkuhn

Message:

• Corrected regex for list file
  
• Fixed and organized add/delete
  

Files:

• trunk/dev-tools/update-loblaw-test.plx (modified) (5 diffs)

trunk/dev-tools/update-loblaw-test.plx

@@ -222 +222 @@
-my %CAUGHT_REVISIONS;
-my %DUAL_REVISIONED_FILE_LIST;
-trunk/
+
-###############################################################################
-sub BuildDualVersionFileList () {
@@ -264 +264 @@
-    $vals{changeLine} = $changeLine;
-    if ($changeLine
-
+trunk/
-      $updateFileList = 1;
-      next;
@@ -300 +300 @@
-    next unless defined $DUAL_REVISIONED_FILE_LIST{$file};
-
-|D
+
-      my($dir, $filename);
-      if (-d $file) {
@@ -313 +313 @@
-      # copy the actual file over, if it is a file and not a directory.
-      unless ($filename =~ /^\s*$/) {
-file
+DUAL_REVISIONED_FILE_LIST{$file}
-          or DieLog("Couldn't copy into $LOBLAW_TEST_HG_CHECKOUT/$file: $!",
-             $LOCK_CLEANUP_CODE);
@@ -319 +319 @@
-      read_from_process($HG, 'add', "$LOBLAW_TEST_HG_CHECKOUT/$file")
-        if ($operation =~ /^\s*A\s*/);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    } else {
-      DieLog("Invalid svnlook status, $operation, in $changeLine",
-             $LOCK_CLEANUP_CODE);
-    }
+    my @svnLog = read_from_process($SVN, '-r', $revision, 'log', $file);
+    my($tempFH, $tempFile) = mkstemps( "hgcommitXXXXXX", ".log");
+    foreach my $line (@svnLog) {
+      chomp $line;
+      next if $line =~ /^\s*\-+\s*$/;
+      $line =~ s/^(.*\|.*\|.*)(\|.*)$/$1/;
+      print $tempFH "$line\n";
+    }
+    $tempFH->close();
+    my @vals = read_from_process($HG, '-l', $tempFile, 'commit',
+                                 "$LOBLAW_TEST_HG_CHECKOUT/$file");
+    unlink($tempFile);
+    DieLog("Unexpected output from commit: " . join("\n", @vals),
+           $LOCK_CLEANUP_CODE) if (@vals > 0);
+    $commitDone = 1;
-    read_from_process($HG, 'push') if $commitDone;
-  }