Changeset 420 in tailor

Timestamp:

07/23/05 02:29:41 (8 years ago)

Author:

lele@…

Hash name:

20050723002941-97f81-c0557b8f9f674b4a1bba7f0e42de894b38e3c9dd

Message:

Explicitly encode the changelog and author
If no charset is forced with --encoding, it defaults to
sys.getdefaultencoding()

Files:

• tailor (modified) (1 diff)
• vcpx/cvsps.py (modified) (1 diff)
• vcpx/svn.py (modified) (1 diff)
• vcpx/shwrap.py (modified) (2 diffs)
• vcpx/monotone.py (modified) (1 diff)
• vcpx/hg.py (modified) (1 diff)

tailor

@@ -40 +40 @@
                 ChangesetApplicationFailure), exc:
             print "%s: %s" % (exc.__doc__, exc)
-
-
+        except UnicodeEncodeError, exc:
+            print exc
+            print "You may want to specify a suitable charset using --encoding"

vcpx/cvsps.py

@@ -478 +478 @@
 
         from shwrap import ReopenableNamedTemporaryFile
+        from sys import getdefaultencoding
+        
+        encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
         
         rontf = ReopenableNamedTemporaryFile('cvs', 'tailor')
         log = open(rontf.name, "w")
-        log.write(remark)
+        log.write(remark.encode(encoding))
         if changelog:
             log.write('\n')
-            log.write(changelog)
-        log.write("\n\nOriginal author: %s\nDate: %s\n" % (author, date))
+            log.write(changelog.encode(encoding))
+        log.write("\n\nOriginal author: %s\nDate: %s\n" % (
+            author.encode(encoding), date))
         log.close()            
 

vcpx/svn.py

@@ -303 +303 @@
         """
 
+        from sys import getdefaultencoding
+        
+        encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
+        
         rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
         log = open(rontf.name, "w")
-        log.write(remark)
+        log.write(remark.encode(encoding))
         if changelog:
             log.write('\n')
-            log.write(changelog)
-        log.write("\n\nOriginal author: %s\nDate: %s\n" % (author, date))
+            log.write(changelog.encode(encoding))
+        log.write("\n\nOriginal author: %s\nDate: %s\n" % (
+            author.encode(encoding), date))
         log.close()            
 

vcpx/shwrap.py

@@ -115 +115 @@
         """Execute the command."""
 
-        from sys import stderr
+        from sys import stderr, getdefaultencoding
         from os import environ
         from cStringIO import StringIO
@@ -159 +159 @@
             return
         
-        if input and self.FORCE_ENCODING:
-            input = input.encode(self.FORCE_ENCODING)
+        if input:
+            input = input.encode(self.FORCE_ENCODING or getdefaultencoding())
+            
         out = process.communicate(input=input)[0]
         if out:

vcpx/monotone.py

@@ -38 +38 @@
         """
 
+        from sys import getdefaultencoding
+
+        encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
+
         rontf = ReopenableNamedTemporaryFile('mtn', 'tailor')
         log = open(rontf.name, "w")
-        log.write(remark)
+        log.write(remark.encode(encoding))
         log.write('\n')
         if changelog:
-            log.write(changelog)
+            log.write(changelog.encode(encoding))
             log.write('\n')
         log.close()

vcpx/hg.py

@@ -42 +42 @@
 
         from time import mktime
-
+        from sys import getdefaultencoding
+        
         cmd = [HG_CMD, "commit", "-u", author, "-l", "%(logfile)s",
                "-d", "%(time)s UTC"]
         c = ExternalCommand(cwd=root, command=cmd)
+
+        encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
         
         rontf = ReopenableNamedTemporaryFile('hg', 'tailor')
         log = open(rontf.name, "w")
-        log.write(remark)
+        log.write(remark.encode(encoding))
         if changelog:
             log.write('\n\n')
-            log.write(changelog)
+            log.write(changelog.encode(encoding))
         log.close()