Changeset 10

Timestamp:

12/09/07 21:54:47 (1 year ago)

Author:

bkuhn

Message:

• Finished basic development work to make the svn -> hg file moving for
  the configs that are stored in SVN for loblaw, but need to show up in
  loblaw-test Mecurial repository.
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/dev-tools/post-hook-loblaw-test-feed.plx (added)
• trunk/dev-tools/svn-scripts-run-check.plx (added)
• trunk/dev-tools/update-loblaw-test.plx (modified) (10 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-12-09  Bradley M. Kuhn  <bkuhn@softwarefreedom.org>
+
+        * dev-tools/post-hook-loblaw-test-feed.plx: Ported over from export-cal.
+
+        * dev-tools/update-loblaw-test.plx (ProcessRevision): Finished rewrites.
+
+        * dev-tools/svn-scripts-run-check.plx: Ported over from export-cal.
+
+2007-12-07  Bradley M. Kuhn  <bkuhn@softwarefreedom.org>
+
+        * dev-tools/update-loblaw-test.plx (ProcessRevision): Rewrote to
+        handle loblaw-test Mercurial updates.
+

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

@@ -4 +4 @@
-# uid of the Mercurial repository.  It generally lives in ~svn/bin
-# and called from the repository post hooks
+
+# This program might be of interest to people who want to do some sort of
+# operation on files after an SVN commit that requires some set of
+# commands to be run on the repository's local system.  In other words, if
+# you really wish that when an SVN commit happened, you could log into the
+# server and run a bunch of commands against a local checkout of what was
+# just committed, then this script is for you.
+
+# The whole thing is a hack -- no question.  If there's a better way to do
+# this job, I'd love to hear about it.
-
-# The sub's "safe_read_from_pipe" and read_from_process are:
@@ -23 +33 @@
-# The rest of the file is:
-#
-
+, 2007
-#
-# This software gives you freedom; it is licensed to you under version 3
@@ -41 +51 @@
-use warnings;
-
-my $LOBLAW_TRUNK_CHECKOUT = "/home/hg/SVNCheckouts/loblaw-trunk";
-my $SVN = "/usr/bin/svn";
-my $SVNLOOK = "/usr/bin/svnlook";
+my $HG = '/usr/bin/hg';
+
+my $LOBLAW_TRUNK_CHECKOUT = "/home/hg/SVNCheckouts/loblaw-trunk";
+my $LOBLAW_TEST_HG_CHECKOUT = "/home/hg/SVNCheckouts/loblaw-trunk";
+
-my $PIPE_FILE = "/home/svn/pipes/loblaw-update";
-
@@ -49 +63 @@
-use Fcntl;             # for sysopen
-use Carp;
-use Data::ICal;
-use File::Temp qw/:POSIX tempfile/;
-
-
-
-
+
+
+
-###############################################################################
-use Unix::Syslog qw(:subs);
@@ -174 +186 @@
-}
-###############################################################################
-CALENDAR_
+
-
-my $LOCK_CLEANUP_CODE = sub {
-CALENDAR_
-CALENDAR_
+
+
-    "";
-};
@@ -184 +196 @@
-###############################################################################
-###############################################################################
-###############################################################################
-# Take a list of keys and a list of values and insersperse them and
-# return the result
-sub MergeLists {
-    my ($keys, $values) = @_;
-    DieLog("Length mismatch", $LOCK_CLEANUP_CODE) unless @$keys == @$values;
-    # Add the argument names to the values
-    my @result;
-    for (my $i = 0; $i < @$keys; $i++) {
-        push @result, $keys->[$i] => $values->[$i];
-    }
-    return @result;
-}
-###############################################################################
-sub DoUpdate ($) {
@@ -222 +221 @@
-# Keep track of which revisions we've finished with.
-my %CAUGHT_REVISIONS;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-sub ProcessRevision ($$) {
-  my($repository, $revision) = @_;
-
-Calendars
+loblaw
-
-  chdir $LOBLAW_TRUNK_CHECKOUT or
@@ -236 +254 @@
-  my @operateOnFiles;
-
+  my $updateFileList = 0;
+  $updateFileList = 1 if (keys %DUAL_REVISIONED_FILE_LIST <= 0);
+
-  foreach my $changeLine (@svnLookChangedLines) {
-    chomp $changeLine;
+    # This script only keeps loblaw-test in sync with trunks' scripts and configs
+
-    my(%vals);
-    $vals{changeLine} = $changeLine;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-    push(@operateOnFiles, \%vals)
@@ -255 +274 @@
-       # skip those cases where we didn't want to do anything with the file
-       # and those that we *would* do something but were ignored items
-
-
-
+
+
-
-  DieLog("Failure to aquire lock in $repository for $revision. " .
-Calendar
+loblaw-test Mercurial
-    unless ($? == 0);
-
-  DoUpdate($revision);  # Make sure we have the latest and the greatest
+
+  BuildDualVersionFileList() if $updateFileList;
+
+  # HG process will read this var.
+  $ENV{EMAIL} = 'svn@softwarefreedom.org';
+
-  foreach my $vals (@operateOnFiles) {
-
-
-
-
+
+
-
-    # if we already, through some stretch, we've done this version already,
-    #   then just skip this one.
-
-    next if defined $CAUGHT_REVISIONS{"$repository,$revision"};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-      DieLog("Invalid svnlook status, $operation, in $changeLine",
-             $LOCK_CLEANUP_CODE);
-    }
-    my @commitLines = read_from_process($SVN, 'commit', '-m',
-                          "Automated Public Export of calendar file for $user",
-                          $filteredFile);
-    DieLog("Expected \"Commited revision NUMBER.\" or no output at all " .
-           "from $SVN commit but got: " .
-           join("\n   ", @commitLines), $LOCK_CLEANUP_CODE)
-      unless (@commitLines <= 0 or $commitLines[$#commitLines] =~
-              /^\s*Committed revision\s+(\d+)\s*\.\s*$/i);
-  }
-  &$LOCK_CLEANUP_CODE;
@@ -431 +450 @@
-__END__
-# Local variables:
-export-public-cal
+update-loblaw-test
-# End: