#
# patch "ChangeLog"
#  from [cc172b1034bf45c6a5a48cf35d12ba257e3bd457]
#    to [c18a2745c60d8ed60f2c85417fb212cf7c8cc4af]
#
# patch "netsync.cc"
#  from [04871c9d35e04f3f8ed0d10c6311c643c5f79df1]
#    to [98bb94f9c22a40bc6f826cad62737a7f9bfb9a04]
#
# patch "ui.cc"
#  from [f0e2ff249a83fa8a210f961d773ca560bb281592]
#    to [bf5397526968d5189f12fef56ecd4990f622beef]
#
--- ChangeLog
+++ ChangeLog
@@ -1,8 +1,14 @@
 2005-04-15  Olivier Andrieu  <address@hidden>

 	* diff_patch.cc(guess_binary): do not use '\x00' as first
 	character of a C string ...

+2005-04-15  Sebastian Spaeth  <address@hidden>
+
+	* ui.cc: print byte progress to one decimal place
+	  in k or M.
+	* netsync.cc: update dot ticker every 1024 bytes.
+
 2005-04-15  Matt Johnston  <address@hidden>

 	* change_set.cc (confirm_proper_tree): use bitsets rather than maps
@@ -2755,7 +2761,7 @@
 	* AUTHORS: Mention Wojciech and Neil.
 	* revision.cc (calculate_ancestors_from_graph): Make non-recursive.

-2005-01-17  Wojciech Miłkowski  <address@hidden>
+2005-01-17  Wojciech Miłkowski  <address@hidden>

 	* std_hooks.lua: Teach about meld.

--- netsync.cc
+++ netsync.cc
@@ -2897,8 +2897,8 @@
   session sess(role, client_voice, collections, all_collections, app,
                address(), server.get_socketfd(), timeout);

-  sess.byte_in_ticker.reset(new ticker("bytes in", ">", 256, true));
-  sess.byte_out_ticker.reset(new ticker("bytes out", "<", 256, true));
+  sess.byte_in_ticker.reset(new ticker("bytes in", ">", 1024, true));
+  sess.byte_out_ticker.reset(new ticker("bytes out", "<", 1024, true));
   if (role == sink_role)
     {
       sess.cert_in_ticker.reset(new ticker("certs in", "c", 3));
--- ui.cc
+++ ui.cc
@@ -5,6 +5,7 @@
 #include "transforms.hh"

 #include <iostream>
+#include <iomanip>
 #include <boost/lexical_cast.hpp>

 // copyright (C) 2002, 2003 graydon hoare <address@hidden>
@@ -84,15 +85,28 @@
        i != ui.tickers.end(); ++i)
     {
       string suffix;
-      int div = 1;
+      ostringstream disptick;
       if (i->second->kilocount && i->second->ticks >= 10000)
-        {
-          div = 1024;
-          suffix = "k";
+        { // automatic unit conversion is enabled
+          float div;
+          if (i->second->ticks >= 1048576) {
+          // ticks >=1MB, use Mb
+            div = 1048576;
+            suffix = "M";
+          } else {
+          // ticks <1MB, use kb
+            div = 1024;
+            suffix = "k";
+          }
+          disptick << std::fixed << std::setprecision(1) <<
+              (i->second->ticks / div);
+        } else {
+          // no automatic unit conversion.
+          disptick << i->second->ticks;
         }
       tickline +=
         string(" [")
-        + i->first + ": " + lexical_cast<string>(i->second->ticks / div)
+        + i->first + ": " + disptick.str()
         + suffix
         + "]";
     }