Mercurial > gcp

changeset 16:b03bd83c1661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed yet another utf-8 encoding issue + added a space on progress bar before percentage
author Goffi <goffi@goffi.org>
date Tue, 28 Sep 2010 15:45:28 +0800
parents 8253a5ccbe9a
children 132042c7abb2
files gcp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gcp	Tue Sep 28 15:42:47 2010 +0800
+++ b/gcp	Tue Sep 28 15:45:28 2010 +0800
@@ -267,7 +267,7 @@
             assert(filename)
             dest_file = self.__filename_fix(os.path.join(dest_path,filename),options)
             if os.path.exists(dest_file) and not options.force:
-                warning (_("File [%s] already exists, skipping it !") % dest_file)
+                warning (_("File [%s] already exists, skipping it !") % dest_file.decode('utf-8','replace'))
                 return True
             try:
                 dest_fd = open(dest_file, 'wb')
@@ -404,7 +404,7 @@
             if not self.bytes_total:
                 #No progress bar if the files have a null size
                 return
-            self.pbar = ProgressBar(self.bytes_total,[_("Copying %s") % self.__get_string_size(self.bytes_total),Percentage()," ",Bar()," ",FileTransferSpeed()," ",ETA()])
+            self.pbar = ProgressBar(self.bytes_total,[_("Copying %s") % self.__get_string_size(self.bytes_total)," ",Percentage()," ",Bar()," ",FileTransferSpeed()," ",ETA()])
             self.pbar.start()
         self.pbar.update(self.bytes_copied)