Merge remote-tracking branch 'origin/help-color'

* origin/help-color:
  wwwtext: inline sample CSS and use highlight
  hlmod: support "```$LANG" blocks in text
  hlmod: do_hl* performs src_escape immediately
  hlmod: make into a singleton
  hlmod: hoist out do_hl_lang sub
  viewvcs: cleanup utf8 handling

diff --git a/TODO b/TODO
index 66e50633e47c2f8bef358bb3e2f052d36dc8e537..ef77d1c24baeb6a03443cb575f630795cd600321 100644 (file)
--- a/TODO
+++ b/TODO
@@ -95,3 +95,6 @@ all need to be considered for everything we introduce)
 * code repository integration (with cgit, gitweb, etc...)
 
 * migration path to v2 without breaking v1 "git fetch" cronjobs
+
+* imperfect scraper importers for obfuscated list archives
+  (e.g. obfuscated Mailman stuff, Google Groups, etc...)

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index a13ae9e51fba3d1ddfa13ced17806eb809234f21..463a9b6906ba069f87a049ea7f4fc40a51334153 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -558,7 +558,7 @@ sub solve ($$$$$) {
        $self->{todo} = [ { %$hints, oid_b => $oid_want } ];
        $self->{patches} = []; # [ $di, $di, ... ]
        $self->{found} = {}; # { abbr => [ ::Git, oid, type, size, $di ] }
-       $self->{tmp} = File::Temp->newdir('solver.tmp-XXXXXXXX', TMPDIR => 1);
+       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXXXXXX", TMPDIR => 1);
 
        dbg($self, "solving $oid_want ...");
        my $step_cb = step_cb($self);