Fixes #2615

[redakcja.git] / apps / dvcs / models.py

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index ab5f77d..f4cb519 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -4,13 +4,13 @@ import os.path
 from django.contrib.auth.models import User
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage
 from django.contrib.auth.models import User
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage

-from django.db import models
+from django.db import models, transaction

 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 
 from django.conf import settings
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 
 from django.conf import settings

-from dvcs.signals import post_commit
+from dvcs.signals import post_commit, post_publishable

 from dvcs.storage import GzipFileSystemStorage
 
 
 from dvcs.storage import GzipFileSystemStorage
 
 


@@ -45,13 +45,13 @@ class Tag(models.Model):
     def listener_changed(sender, instance, **kwargs):
         sender._object_cache = {}
 
     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.
         """
         try:
         """
             Returns the next tag - stage to work on.
             Returns None for the last stage.
         """
         try:

-            return Tag.objects.filter(ordering__gt=self.ordering)[0]
+            return type(self).objects.filter(ordering__gt=self.ordering)[0]

         except IndexError:
             return None
 
         except IndexError:
             return None
 


@@ -125,7 +125,7 @@ class Change(models.Model):
         if self.revision is None:
             tree_rev = self.tree.revision()
             if tree_rev is None:
         if self.revision is None:
             tree_rev = self.tree.revision()
             if tree_rev is None:

-                self.revision = 0
+                self.revision = 1

             else:
                 self.revision = tree_rev + 1
         return super(Change, self).save(*args, **kwargs)
             else:
                 self.revision = tree_rev + 1
         return super(Change, self).save(*args, **kwargs)


@@ -167,7 +167,7 @@ class Change(models.Model):
     def set_publishable(self, publishable):
         self.publishable = publishable
         self.save()
     def set_publishable(self, publishable):
         self.publishable = publishable
         self.save()

-        post_publishable(sender=self, publishable=publishable).send()
+        post_publishable.send(sender=self, publishable=publishable)

 
 
 def create_tag_model(model):
 
 
 def create_tag_model(model):


@@ -280,7 +280,7 @@ class Document(models.Model):
         tags = kwargs.get('tags', [])
         if tags:
             # set stage to next tag after the commited one
         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,
 
         change = self.change_set.create(author=author,
                     author_name=author_name,


@@ -307,7 +307,7 @@ class Document(models.Model):
         return self.head
 
     def history(self):
         return self.head
 
     def history(self):

-        return self.change_set.filter(revision__gt=-1)
+        return self.change_set.all().order_by('revision')

 
     def revision(self):
         rev = self.change_set.aggregate(
 
     def revision(self):
         rev = self.change_set.aggregate(


@@ -319,8 +319,21 @@ class Document(models.Model):
         return self.change_set.get(revision=rev)
 
     def publishable(self):
         return self.change_set.get(revision=rev)
 
     def publishable(self):

-        changes = self.change_set.filter(publishable=True)
+        changes = self.history().filter(publishable=True)

         if changes.exists():
         if changes.exists():

-            return changes.order_by('-created_at')[0]
+            return changes.order_by('-revision')[0]

         else:
             return None
         else:
             return None

+
+    @transaction.commit_on_success
+    def prepend_history(self, other):
+        """Takes over the the other document's history and prepends to own."""
+
+        assert self != other
+        other_revs = other.change_set.all().count()
+        # workaround for a non-atomic UPDATE in SQLITE
+        self.change_set.all().update(revision=0-models.F('revision'))
+        self.change_set.all().update(revision=other_revs - models.F('revision'))
+        other.change_set.all().update(tree=self)
+        assert not other.change_set.exists()
+        other.delete()