filtered chunks table,

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

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index f81f2ca..177b0d3 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from django.db import models
 from datetime import datetime
 
 from django.db import models

+from django.db.models.base import ModelBase

 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge


@@ -20,6 +21,7 @@ class Tag(models.Model):
     _object_cache = {}
 
     class Meta:
     _object_cache = {}
 
     class Meta:

+        abstract = True

         ordering = ['ordering']
 
     def __unicode__(self):
         ordering = ['ordering']
 
     def __unicode__(self):


@@ -60,9 +62,9 @@ class Change(models.Model):
         Data contains a pickled diff needed to reproduce the initial document.
     """
     author = models.ForeignKey(User, null=True, blank=True)
         Data contains a pickled diff needed to reproduce the initial document.
     """
     author = models.ForeignKey(User, null=True, blank=True)

-    author_desc = models.CharField(max_length=128, null=True, blank=True)
+    author_name = models.CharField(max_length=128, null=True, blank=True)
+    author_email = models.CharField(max_length=128, null=True, blank=True)

     patch = models.TextField(blank=True)
     patch = models.TextField(blank=True)

-    tree = models.ForeignKey('Document')

     revision = models.IntegerField(db_index=True)
 
     parent = models.ForeignKey('self',
     revision = models.IntegerField(db_index=True)
 
     parent = models.ForeignKey('self',


@@ -78,9 +80,8 @@ class Change(models.Model):
                         default=datetime.now)
     publishable = models.BooleanField(default=False)
 
                         default=datetime.now)
     publishable = models.BooleanField(default=False)
 

-    tags = models.ManyToManyField(Tag)
-

     class Meta:
     class Meta:

+        abstract = True

         ordering = ('created_at',)
         unique_together = ['tree', 'revision']
 
         ordering = ('created_at',)
         unique_together = ['tree', 'revision']
 


@@ -94,7 +95,10 @@ class Change(models.Model):
                 self.author.last_name, 
                 self.author.email)
         else:
                 self.author.last_name, 
                 self.author.email)
         else:

-            return self.author_desc
+            return "%s <%s>" % (
+                self.author_name,
+                self.author_email
+                )

 
 
     def save(self, *args, **kwargs):
 
 
     def save(self, *args, **kwargs):


@@ -118,29 +122,30 @@ class Change(models.Model):
         if self.parent is None and self.merge_parent is not None:
             return self.apply_to(self.merge_parent.materialize())
 
         if self.parent is None and self.merge_parent is not None:
             return self.apply_to(self.merge_parent.materialize())
 

-        changes = Change.objects.exclude(parent=None).filter(
-                        tree=self.tree,
+        changes = self.tree.change_set.exclude(parent=None).filter(

                         revision__lte=self.revision).order_by('revision')
                         revision__lte=self.revision).order_by('revision')

-        text = u''
+        text = ''

         for change in changes:
             text = change.apply_to(text)
         for change in changes:
             text = change.apply_to(text)

-        return text
+        return text.decode('utf-8')

 
     def make_child(self, patch, description, author=None,
 
     def make_child(self, patch, description, author=None,

-            author_desc=None, tags=None):
+            author_name=None, author_email=None, tags=None):

         ch = self.children.create(patch=patch,
                         tree=self.tree, author=author,
         ch = self.children.create(patch=patch,
                         tree=self.tree, author=author,

-                        author_desc=author_desc,
+                        author_name=author_name,
+                        author_email=author_email,

                         description=description)
         if tags is not None:
             ch.tags = tags
         return ch
 
     def make_merge_child(self, patch, description, author=None, 
                         description=description)
         if tags is not None:
             ch.tags = tags
         return ch
 
     def make_merge_child(self, patch, description, author=None, 

-            author_desc=None, tags=None):
+            author_name=None, author_email=None, tags=None):

         ch = self.merge_children.create(patch=patch,
                         tree=self.tree, author=author,
         ch = self.merge_children.create(patch=patch,
                         tree=self.tree, author=author,

-                        author_desc=author_desc,
+                        author_name=author_name,
+                        author_email=author_email,

                         description=description,
                         tags=tags)
         if tags is not None:
                         description=description,
                         tags=tags)
         if tags is not None:


@@ -150,7 +155,8 @@ class Change(models.Model):
     def apply_to(self, text):
         return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
 
     def apply_to(self, text):
         return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
 

-    def merge_with(self, other, author=None, author_desc=None,
+    def merge_with(self, other, author=None, 
+            author_name=None, author_email=None, 

             description=u"Automatic merge."):
         assert self.tree_id == other.tree_id  # same tree
         if other.parent_id == self.pk:
             description=u"Automatic merge."):
         assert self.tree_id == other.tree_id  # same tree
         if other.parent_id == self.pk:


@@ -166,7 +172,9 @@ class Change(models.Model):
         patch = self.make_patch(local, result)
         return self.children.create(
                     patch=patch, merge_parent=other, tree=self.tree,
         patch = self.make_patch(local, result)
         return self.children.create(
                     patch=patch, merge_parent=other, tree=self.tree,

-                    author=author, author_desc=author_desc,
+                    author=author,
+                    author_name=author_name,
+                    author_email=author_email,

                     description=description)
 
     def revert(self, **kwargs):
                     description=description)
 
     def revert(self, **kwargs):


@@ -174,19 +182,60 @@ class Change(models.Model):
         self.tree.commit(text=self.materialize(), **kwargs)
 
 
         self.tree.commit(text=self.materialize(), **kwargs)
 
 

+def create_tag_model(model):
+    name = model.__name__ + 'Tag'
+    attrs = {
+        '__module__': model.__module__,
+    }
+    return type(name, (Tag,), attrs)
+
+
+def create_change_model(model):
+    name = model.__name__ + 'Change'
+
+    attrs = {
+        '__module__': model.__module__,
+        'tree': models.ForeignKey(model, related_name='change_set'),
+        'tags': models.ManyToManyField(model.tag_model, related_name='change_set'),
+    }
+    return type(name, (Change,), attrs)
+
+
+
+class DocumentMeta(ModelBase):
+    "Metaclass for Document models."
+    def __new__(cls, name, bases, attrs):
+        model = super(DocumentMeta, cls).__new__(cls, name, bases, attrs)
+        if not model._meta.abstract:
+            # create a real Tag object and `stage' fk
+            model.tag_model = create_tag_model(model)
+            models.ForeignKey(model.tag_model, 
+                null=True, blank=True).contribute_to_class(model, 'stage')
+
+            # create real Change model and `head' fk
+            model.change_model = create_change_model(model)
+            models.ForeignKey(model.change_model,
+                    null=True, blank=True, default=None,
+                    help_text=_("This document's current head."),
+                    editable=False).contribute_to_class(model, 'head')
+
+        return model
+
+
+

 class Document(models.Model):
     """
         File in repository.        
     """
 class Document(models.Model):
     """
         File in repository.        
     """

+    __metaclass__ = DocumentMeta
+

     creator = models.ForeignKey(User, null=True, blank=True, editable=False,
                 related_name="created_documents")
     creator = models.ForeignKey(User, null=True, blank=True, editable=False,
                 related_name="created_documents")

-    head = models.ForeignKey(Change,
-                    null=True, blank=True, default=None,
-                    help_text=_("This document's current head."),
-                    editable=False)

 
     user = models.ForeignKey(User, null=True, blank=True)
 
     user = models.ForeignKey(User, null=True, blank=True)

-    stage = models.ForeignKey(Tag, null=True, blank=True)
+
+    class Meta:
+        abstract = True

 
     def __unicode__(self):
         return u"{0}, HEAD: {1}".format(self.id, self.head_id)
 
     def __unicode__(self):
         return u"{0}, HEAD: {1}".format(self.id, self.head_id)


@@ -213,7 +262,7 @@ class Document(models.Model):
         else:
             parent = kwargs['parent']
             if not isinstance(parent, Change):
         else:
             parent = kwargs['parent']
             if not isinstance(parent, Change):

-                parent = Change.objects.get(pk=kwargs['parent'])
+                parent = self.change_set.objects.get(pk=kwargs['parent'])

 
         if 'patch' not in kwargs:
             if 'text' not in kwargs:
 
         if 'patch' not in kwargs:
             if 'text' not in kwargs:


@@ -225,7 +274,8 @@ class Document(models.Model):
             patch = kwargs['patch']
 
         author = kwargs.get('author', None)
             patch = kwargs['patch']
 
         author = kwargs.get('author', None)

-        author_desc = kwargs.get('author_desc', None)
+        author_name = kwargs.get('author_name', None)
+        author_email = kwargs.get('author_email', None)

         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


@@ -234,15 +284,18 @@ class Document(models.Model):
         old_head = self.head
         if parent != old_head:
             change = parent.make_merge_child(patch, author=author, 
         old_head = self.head
         if parent != old_head:
             change = parent.make_merge_child(patch, author=author, 

-                    author_desc=author_desc,
+                    author_name=author_name,
+                    author_email=author_email,

                     description=kwargs.get('description', ''),
                     tags=tags)
             # not Fast-Forward - perform a merge
             self.head = old_head.merge_with(change, author=author,
                     description=kwargs.get('description', ''),
                     tags=tags)
             # not Fast-Forward - perform a merge
             self.head = old_head.merge_with(change, author=author,

-                    author_desc=author_desc)
+                    author_name=author_name,
+                    author_email=author_email)

         else:
             self.head = parent.make_child(patch, author=author, 
         else:
             self.head = parent.make_child(patch, author=author, 

-                    author_desc=author_desc, 
+                    author_name=author_name,
+                    author_email=author_email,

                     description=kwargs.get('description', ''),
                     tags=tags)
 
                     description=kwargs.get('description', ''),
                     tags=tags)
 


@@ -276,7 +329,7 @@ class Document(models.Model):
         if not isinstance(instance, Document):
             return
         if created:
         if not isinstance(instance, Document):
             return
         if created:

-            instance.head = Change.objects.create(
+            instance.head = instance.change_model.objects.create(

                     revision=-1,
                     author=instance.creator,
                     patch=Change.make_patch('', ''),
                     revision=-1,
                     author=instance.creator,
                     patch=Change.make_patch('', ''),