Fixed unsanited message/user description in document.invoke_and_commit

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index f0d3d07..6dd3c11 100644 (file)
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -72,10 +72,8 @@ class MercurialRevision(wlrepo.Revision):
         a = self._changectx.ancestor(other._changectx)       
         return (a.branch() == self._changectx.branch())
 
         a = self._changectx.ancestor(other._changectx)       
         return (a.branch() == self._changectx.branch())
 

-    def has_children(self):
-        children = self._library._hgrepo.changelog.children(self.hgrev())
-        print "C:", children, bool(children)
-        return bool(children)
+    def children(self):
+        return bool(self._library._hgrepo.changelog.children(self.hgrev()))

 
     def merge_with(self, other, user, message):
         lock = self._library.lock(True)
 
     def merge_with(self, other, user, message):
         lock = self._library.lock(True)

diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py
index fcfd14c..a579fb7 100644 (file)
--- a/lib/wlrepo/mercurial_backend/document.py
+++ b/lib/wlrepo/mercurial_backend/document.py
@@ -50,6 +50,10 @@ class MercurialDocument(wlrepo.Document):
             
             ops(self._library, entry_path)
             message, user = commit_info(self)
             
             ops(self._library, entry_path)
             message, user = commit_info(self)

+
+            message = self._library._sanitize_string(message)
+            user = self._library._sanitize_string(user)
+

             self._library._commit(message, user)
             try:
                 return self._library.document(docid=self.id, user=user)
             self._library._commit(message, user)
             try:
                 return self._library.document(docid=self.id, user=user)