X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/9c42ef76e42e997b52c8b02eae058e345d103d80..4437d85206a7deb768c75a4fd1cb1b474e87efe3:/apps/dvcs/models.py

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index ef11dbe8..5ce00c0f 100644
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -6,6 +6,41 @@ from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 import pickle
 
+
+class Tag(models.Model):
+    """
+        a tag (e.g. document stage) which can be applied to a change
+    """
+
+    name = models.CharField(_('name'), max_length=64)
+    slug = models.SlugField(_('slug'), unique=True, max_length=64, 
+            null=True, blank=True)
+    ordering = models.IntegerField(_('ordering'))
+
+    _object_cache = {}
+
+    class Meta:
+        ordering = ['ordering']
+
+    def __unicode__(self):
+        return self.name
+
+    @classmethod
+    def get(cls, slug):
+        if slug in cls._object_cache:
+            return cls._object_cache[slug]
+        else:
+            obj = cls.objects.get(slug=slug)
+            cls._object_cache[slug] = obj
+            return obj
+
+    @staticmethod
+    def listener_changed(sender, instance, **kwargs):
+        sender._object_cache = {}
+
+models.signals.pre_save.connect(Tag.listener_changed, sender=Tag)
+
+
 class Change(models.Model):
     """
         Single document change related to previous change. The "parent"
@@ -15,6 +50,7 @@ class Change(models.Model):
         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)
     patch = models.TextField(blank=True)
     tree = models.ForeignKey('Document')
     revision = models.IntegerField(db_index=True)
@@ -31,6 +67,8 @@ class Change(models.Model):
     created_at = models.DateTimeField(editable=False, db_index=True, 
                         default=datetime.now)
 
+    tags = models.ManyToManyField(Tag)
+
     class Meta:
         ordering = ('created_at',)
         unique_together = ['tree', 'revision']
@@ -38,6 +76,16 @@ class Change(models.Model):
     def __unicode__(self):
         return u"Id: %r, Tree %r, Parent %r, Patch '''\n%s'''" % (self.id, self.tree_id, self.parent_id, self.patch)
 
+    def author_str(self):
+        if self.author:
+            return "%s %s <%s>" % (
+                self.author.first_name,
+                self.author.last_name, 
+                self.author.email)
+        else:
+            return self.author_desc
+
+
     def save(self, *args, **kwargs):
         """
             take the next available revision number if none yet
@@ -67,20 +115,32 @@ class Change(models.Model):
             text = change.apply_to(text)
         return text
 
-    def make_child(self, patch, author, description):
-        return self.children.create(patch=patch,
+    def make_child(self, patch, description, author=None,
+            author_desc=None, tags=None):
+        ch = self.children.create(patch=patch,
                         tree=self.tree, author=author,
+                        author_desc=author_desc,
                         description=description)
+        if tags is not None:
+            ch.tags = tags
+        return ch
 
-    def make_merge_child(self, patch, author, description):
-        return self.merge_children.create(patch=patch,
+    def make_merge_child(self, patch, description, author=None, 
+            author_desc=None, tags=None):
+        ch = self.merge_children.create(patch=patch,
                         tree=self.tree, author=author,
-                        description=description)
+                        author_desc=author_desc,
+                        description=description,
+                        tags=tags)
+        if tags is not None:
+            ch.tags = tags
+        return ch
 
     def apply_to(self, text):
         return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
 
-    def merge_with(self, other, author, description=u"Automatic merge."):
+    def merge_with(self, other, author=None, author_desc=None,
+            description=u"Automatic merge."):
         assert self.tree_id == other.tree_id  # same tree
         if other.parent_id == self.pk:
             # immediate child 
@@ -95,7 +155,8 @@ class Change(models.Model):
         patch = self.make_patch(local, result)
         return self.children.create(
                     patch=patch, merge_parent=other, tree=self.tree,
-                    author=author, description=description)
+                    author=author, author_desc=author_desc,
+                    description=description)
 
     def revert(self, **kwargs):
         """ commit this version of a doc as new head """
@@ -106,10 +167,11 @@ class Document(models.Model):
     """
         File in repository.        
     """
-    creator = models.ForeignKey(User, null=True, blank=True)
+    creator = models.ForeignKey(User, null=True, blank=True, editable=False)
     head = models.ForeignKey(Change,
                     null=True, blank=True, default=None,
-                    help_text=_("This document's current head."))
+                    help_text=_("This document's current head."),
+                    editable=False)
 
     def __unicode__(self):
         return u"{0}, HEAD: {1}".format(self.id, self.head_id)
@@ -148,14 +210,23 @@ class Document(models.Model):
             patch = kwargs['patch']
 
         author = kwargs.get('author', None)
+        author_desc = kwargs.get('author_desc', None)
+        tags = kwargs.get('tags', [])
 
         old_head = self.head
         if parent != old_head:
-            change = parent.make_merge_child(patch, author, kwargs.get('description', ''))
+            change = parent.make_merge_child(patch, author=author, 
+                    author_desc=author_desc,
+                    description=kwargs.get('description', ''),
+                    tags=tags)
             # not Fast-Forward - perform a merge
-            self.head = old_head.merge_with(change, author=author)
+            self.head = old_head.merge_with(change, author=author,
+                    author_desc=author_desc)
         else:
-            self.head = parent.make_child(patch, author, kwargs.get('description', ''))
+            self.head = parent.make_child(patch, author=author, 
+                    author_desc=author_desc, 
+                    description=kwargs.get('description', ''),
+                    tags=tags)
 
         self.save()
         return self.head
@@ -174,6 +245,13 @@ class Document(models.Model):
         else:
             return self.head
 
+    def last_tagged(self, tag):
+        changes = tag.change_set.filter(tree=self).order_by('-created_at')[:1]
+        if changes.count():
+            return changes[0]
+        else:
+            return None
+
     @staticmethod
     def listener_initial_commit(sender, instance, created, **kwargs):
         # run for Document and its subclasses