X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/47fb67f3c824094213cd33ebebf8e70ec149b783..74378d009ec094bd52789bcb5f1a7be89c3509de:/apps/dvcs/models.py?ds=inline

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index 2526028f..e82ad193 100644
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -7,7 +7,7 @@ from django.core.files.storage import FileSystemStorage
 from django.db import models, transaction
 from django.db.models.base import ModelBase
 from django.utils.translation import string_concat, ugettext_lazy as _
-from mercurial import mdiff, simplemerge
+from mercurial import simplemerge
 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable
@@ -43,7 +43,7 @@ class Tag(models.Model):
     def listener_changed(sender, instance, **kwargs):
         sender._object_cache = {}
 
-    def next(self):
+    def get_next(self):
         """
             Returns the next tag - stage to work on.
             Returns None for the last stage.
@@ -166,8 +166,6 @@ class Change(models.Model):
         post_publishable.send(sender=self, publishable=publishable)
 
 
-
-
 def create_tag_model(model):
     name = model.__name__ + 'Tag'
 
@@ -286,7 +284,7 @@ class Document(models.Model):
         tags = kwargs.get('tags', [])
         if tags:
             # set stage to next tag after the commited one
-            self.stage = max(tags, key=lambda t: t.ordering).next()
+            self.stage = max(tags, key=lambda t: t.ordering).get_next()
 
         change = self.change_set.create(author=author,
                     author_name=author_name,
@@ -331,7 +329,7 @@ class Document(models.Model):
         else:
             return None
 
-    @transaction.commit_on_success
+    @transaction.atomic
     def prepend_history(self, other):
         """Takes over the the other document's history and prepends to own."""