Changeset 26

Timestamp:

12/11/07 21:05:53 (1 year ago)

Author:

bkuhn

Message:

• Fixed various bugs that existed due to confusion between file names in
  the SVN repository and those in the HG repository.
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/dev-tools/update-loblaw-test.plx (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-12-11  Bradley M. Kuhn  <bkuhn@softwarefreedom.org>
+
+        * dev-tools/update-loblaw-test.plx (ProcessRevision): Fixed
+        various bugs based on confusions about which file name is in which
+        directory.
+
-2007-12-09  Bradley M. Kuhn  <bkuhn@softwarefreedom.org>
-

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

@@ -280 +280 @@
-  DieLog("Failure to aquire lock in $repository for $revision. " .
-         "loblaw-test Mercurial update aborted!")
-
+defined $lockData[0] and 
-
-  DoUpdate($revision);  # Make sure we have the latest and the greatest
@@ -291 +291 @@
-
-  foreach my $vals (@operateOnFiles) {
-f
+inputF
-      ($vals->{operation}, $vals->{file}, $vals->{changeLine});
-
@@ -300 +300 @@
-    # See if this is a file we are actually processing over to the hg repository
-    next unless defined $DUAL_REVISIONED_FILE_LIST{$file};
+    my $outputFile = $DUAL_REVISIONED_FILE_LIST{$file};
-
-    if ($operation =~ /^\s*(?:U|M|\~|L|A)\s*/) {
-      my($dir, $filename);
-$file
-f
+"$LOBLAW_TRUNK_CHECKOUT/$inputFile"
+outputF
-      } else {
-f
+outputF
-      }
-      eval { mkpath("$LOBLAW_TEST_HG_CHECKOUT/$dir", 0, 0755) };
@@ -314 +315 @@
-      # copy the actual file over, if it is a file and not a directory.
-      unless ($filename =~ /^\s*$/) {
-
-
+
+
+
-             $LOCK_CLEANUP_CODE);
-      }
@@ -321 +323 @@
-        if ($operation =~ /^\s*A\s*/);
-    } elsif ($operation =~ /^\s*D\s*/) {
-DUAL_REVISIONED_FILE_LIST{$file}
+outputFile
-      read_from_process($HG, 'remove',
-DUAL_REVISIONED_FILE_LIST{$file}
+outputFile
-    } else {
-      DieLog("Invalid svnlook status, $operation, in $changeLine",
-             $LOCK_CLEANUP_CODE);
-    }
-f
+inputF
-    my($tempFH, $tempFile) = mkstemps( "hgcommitXXXXXX", ".log");
-    foreach my $line (@svnLog) {
@@ -338 +340 @@
-    $tempFH->close();
-    my @vals = read_from_process($HG, '-l', $tempFile, 'commit',
-f
+outputF
-    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;
-}
+}
+read_from_process($HG, 'push') if $commitDone;
-  &$LOCK_CLEANUP_CODE;
-}