fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'view-refactor' of stigma:platforma into zuber-view-refactor
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
document.py
diff --git
a/lib/wlrepo/mercurial_backend/document.py
b/lib/wlrepo/mercurial_backend/document.py
index
523e330
..
51a2014
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/document.py
+++ b/
lib/wlrepo/mercurial_backend/document.py
@@
-35,7
+35,7
@@
class MercurialDocument(wlrepo.Document):
return self.invoke_and_commit(write, lambda d: (msg, self.owner))
def invoke_and_commit(self, ops,
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())
lock = self._library.lock()
try:
self._library._checkout(self._revision.hgrev())
@@
-44,7
+44,7
@@
class MercurialDocument(wlrepo.Document):
return self.id + '.' + entry
ops(self._library, entry_path)
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)
self._library._commit(message, user)
try:
return self._library.document(docid=self.id, user=user)
@@
-60,7
+60,7
@@
class MercurialDocument(wlrepo.Document):
# self.invoke_and_commit(message, user, lambda *a: True)
def ismain(self):
# 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():
def shared(self):
if self.ismain():
@@
-111,7
+111,7
@@
class MercurialDocument(wlrepo.Document):
if self.ismain():
return (True, False) # always shared
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
main = self.shared()._revision
local = self._revision