X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a13dbb38931d9248376d92016d1c457d5a4adbde..9921992e940cf9c1cc53715098233e23665d8f94:/lib/wlrepo/mercurial_backend/document.py

diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py
index 6cf8a5bf..51a2014c 100644
--- a/lib/wlrepo/mercurial_backend/document.py
+++ b/lib/wlrepo/mercurial_backend/document.py
@@ -32,10 +32,10 @@ class MercurialDocument(wlrepo.Document):
             f.close()
             l._fileadd(r(entry))            
 
-        return self.invoke_and_commit(write, lambda d: (msg, user))
+        return self.invoke_and_commit(write, lambda d: (msg, self.owner))
 
     def invoke_and_commit(self, ops,
-            before_commit, rollback=False):
+            commit_info):
         lock = self._library.lock()
         try:            
             self._library._checkout(self._revision.hgrev())
@@ -44,13 +44,13 @@ class MercurialDocument(wlrepo.Document):
                 return self.id + '.' + entry
             
             ops(self._library, entry_path)
-            message, user = before_commit(self)            
+            message, user = commit_info(self)
             self._library._commit(message, user)
             try:
                 return self._library.document(docid=self.id, user=user)
             except Exception, e:
                 # rollback the last commit
-                self._library.rollback()
+                self._library._rollback()
                 raise e
         finally:
             lock.release()
@@ -60,7 +60,7 @@ class MercurialDocument(wlrepo.Document):
     #    self.invoke_and_commit(message, user, lambda *a: True)
 
     def ismain(self):
-        return self._revision.user_name() is None
+        return self._revision.user_name is None
 
     def shared(self):
         if self.ismain():
@@ -111,7 +111,7 @@ class MercurialDocument(wlrepo.Document):
             if self.ismain():
                 return (True, False) # always shared
 
-            user = self._revision.user_name()
+            user = self._revision.user_name
             main = self.shared()._revision
             local = self._revision