Changeset 433 in tailor for vcpx/bzr.py

Timestamp:

07/26/05 23:48:35 (8 years ago)

Author:

lele@…

Hash name:

20050726214835-97f81-b7b36e0e7ea125328e7d386cc7e3bf14594c30f1

Message:

Uniquify the mechanism of computing the destination changelog
Now all targets share a similar mechanism to compute the changelog of
the committed patch, honoring the eventual encoding and skipping missing
parts.

File:

• vcpx/bzr.py (modified) (1 diff)

vcpx/bzr.py

@@ -34 +34 @@
         """
 
-        logmessage = remark
+        from sys import getdefaultencoding
+        
+        encoding = ExternalCommand.FORCE_ENCODING or getdefaultencoding()
+        
+        logmessage = []
+        if remark:
+            logmessage.append(remark.encode(encoding))
         if changelog:
-            logmessage += '\n%s' % changelog
-        logmessage += '\n\nOriginal author: %s\nDate: %s\n' % (author, date)
+            logmessage.append(changelog.encode(encoding))
+        logmessage.append('')
+        logmessage.append('Original author: %s' % author.encode(encoding))
+        logmessage.append('Date: %s' % date)
+        logmessage.append('')
 
-        cmd = [BAZAAR_CMD, "commit", "-m", logmessage]
+        cmd = [BAZAAR_CMD, "commit", "-m", '\n'.join(logmessage)]
         if not entries:
             entries = ['.']