=== modified file 'bzrlib/annotate.py'
--- bzrlib/annotate.py	2006-12-17 18:57:05 +0000
+++ bzrlib/annotate.py	2007-01-16 15:37:26 +0000
@@ -25,11 +25,13 @@
 # TODO: perhaps abbreviate timescales depending on how recent they are
 # e.g. "3:12 Tue", "13 Oct", "Oct 2005", etc.  
 
+import codecs
 import sys
 import time
 
 from bzrlib import (
     errors,
+    osutils,
     patiencediff,
     tsort,
     )
@@ -41,6 +43,8 @@
     if to_file is None:
         to_file = sys.stdout
 
+    encoder = codecs.getencoder(osutils.get_user_encoding())
+
     prevanno=''
     last_rev_id = None
     if show_ids:
@@ -50,7 +54,7 @@
         max_origin_len = max(len(origin) for origin, text in annotations)
         for origin, text in annotations:
             if full or last_rev_id != origin:
-                this = origin
+                this = encoder(origin)[0]
             else:
                 this = ''
             to_file.write('%*s | %s' % (max_origin_len, this, text))
@@ -70,6 +74,7 @@
     max_revno_len = max(max_revno_len, 3)
 
     for (revno_str, author, date_str, line_rev_id, text) in annotation:
+        author = encoder(author)[0]
         if verbose:
             anno = '%-*s %-*s %8s ' % (max_revno_len, revno_str,
                                        max_origin_len, author, date_str)