Galerie mk2

[redakcja.git] / lib / wlrepo / mercurial_backend / __init__.py

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index f919e81..536d08c 100644 (file)
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 # -*- encoding: utf-8 -*-
 

+import logging
+log = logging.getLogger('ral.mercurial')
+

 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."
 __author__= "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."


@@ -79,6 +82,7 @@ class MercurialRevision(wlrepo.Revision):
         return bool(self._library._hgrepo.changelog.children(self.hgrev()))
 
     def merge_with(self, other, user, message):
         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())
         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())