Merge branch 'sup-sync-improvements' into next

Conflicts:

	bin/sup-sync

diff --cc bin/sup-sync
index 79343e6719b30875570444506feb6838dba3f6cd,01dbaa795ebb970017fa7df1b6a3b6965c10207e..01c0ebaac42d452760c1e20999f2e4c37a50f597
--- 1/bin/sup-sync
--- 2/bin/sup-sync
+++ b/bin/sup-sync
@@@ -173,16 -184,8 +184,16 @@@ begi
          ## nothin! use default source labels
        end
  
 +      if Time.now - last_info_time > PROGRESS_UPDATE_INTERVAL
 +        last_info_time = Time.now
 +        elapsed = last_info_time - start_time
 +        pctdone = source.respond_to?(:pct_done) ? source.pct_done : 100.0 * (source.cur_offset.to_f - source.start_offset).to_f / (source.end_offset - source.start_offset).to_f
 +        remaining = (100.0 - pctdone) * (elapsed.to_f / pctdone)
 +        $stderr.printf "## read %dm (about %.0f%%) @ %.1fm/s. %s elapsed, about %s remaining\n", num_scanned, pctdone, num_scanned / elapsed, elapsed.to_time_s, remaining.to_time_s
 +      end
 +
        if index_state.nil?
-         puts "Adding message #{source}##{offset} with state {#{m.labels * ', '}}" if opts[:verbose]
+         puts "Adding message #{source}##{offset} from #{m.from} with state {#{m.labels * ', '}}" if opts[:verbose]
          num_added += 1
        else
          puts "Updating message #{source}##{offset}, source #{entry[:source_id]} => #{source.id}, offset #{entry[:source_info]} => #{offset}, state {#{index_state * ', '}} => {#{m.labels * ', '}}" if opts[:verbose]

diff --cc lib/sup/mbox/loader.rb
Simple merge