Usunięcie aplikacji wysiwyg.

[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 630939f..22a9d52 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."


@@ -86,9 +89,9 @@ class MercurialRevision(wlrepo.Revision):
             status = self._library._merge(other._changectx.node())
             if status.isclean():
                 self._library._commit(user=user, message=message)
             status = self._library._merge(other._changectx.node())
             if status.isclean():
                 self._library._commit(user=user, message=message)

-                return (True, True)
+                return True

             else:
             else:

-                return (False, False)
+                return False

         finally:
             lock.release()
 
         finally:
             lock.release()