X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b0773e2054ab6bc6305142fdd28799e0f41616c9..c6b7810b77a7b84da1114ddfd424357496bcab9f:/lib/wlrepo/mercurial_backend/__init__.py

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index a22e49f1..536d08ce 100644
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 
+import logging
+log = logging.getLogger('ral.mercurial')
+
 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."
@@ -7,6 +10,9 @@ __doc__ = "Module documentation."
 import wlrepo
 from mercurial.node import nullid
 
+from mercurial import encoding
+encoding.encoding = 'utf-8'
+
 class MercurialRevision(wlrepo.Revision):
 
     def __init__(self, lib, changectx):
@@ -76,6 +82,7 @@ class MercurialRevision(wlrepo.Revision):
         return bool(self._library._hgrepo.changelog.children(self.hgrev()))
 
     def merge_with(self, other, user, message):
+        message = self._library._sanitize_string(message)
         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())