X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/793b39c86e9583467f1cbc41f8b1a4677d079f23..985ca3a21df2340caa545f27e5f01fd1eb87c9c8:/apps/dvcs/models.py

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index 9c9d350b..7ac7cbef 100644
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
@@ -13,6 +15,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)
@@ -26,7 +29,8 @@ class Change(models.Model):
                         related_name="merge_children")
 
     description = models.TextField(blank=True, default='')
-    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    created_at = models.DateTimeField(editable=False, db_index=True, 
+                        default=datetime.now)
 
     class Meta:
         ordering = ('created_at',)
@@ -35,6 +39,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
@@ -64,20 +78,24 @@ class Change(models.Model):
             text = change.apply_to(text)
         return text
 
-    def make_child(self, patch, author, description):
+    def make_child(self, patch, description, author=None, author_desc=None):
         return self.children.create(patch=patch,
                         tree=self.tree, author=author,
+                        author_desc=author_desc,
                         description=description)
 
-    def make_merge_child(self, patch, author, description):
+    def make_merge_child(self, patch, description, author=None, 
+            author_desc=None):
         return self.merge_children.create(patch=patch,
                         tree=self.tree, author=author,
+                        author_desc=author_desc,
                         description=description)
 
     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 
@@ -92,7 +110,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 """
@@ -145,25 +164,31 @@ class Document(models.Model):
             patch = kwargs['patch']
 
         author = kwargs.get('author', None)
+        author_desc = kwargs.get('author_desc', None)
 
         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', ''))
             # 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', ''))
 
         self.save()
         return self.head
 
     def history(self):
-        return self.change_set.filter(revision__gt=0)
+        return self.change_set.filter(revision__gt=-1)
 
     def revision(self):
         rev = self.change_set.aggregate(
                 models.Max('revision'))['revision__max']
-        return rev if rev is not None else 0
+        return rev if rev is not None else -1
 
     def at_revision(self, rev):
         if rev:
@@ -173,12 +198,15 @@ class Document(models.Model):
 
     @staticmethod
     def listener_initial_commit(sender, instance, created, **kwargs):
+        # run for Document and its subclasses
+        if not isinstance(instance, Document):
+            return
         if created:
             instance.head = Change.objects.create(
-                    revision=0,
+                    revision=-1,
                     author=instance.creator,
                     patch=Change.make_patch('', ''),
                     tree=instance)
             instance.save()
 
-models.signals.post_save.connect(Document.listener_initial_commit, sender=Document)
+models.signals.post_save.connect(Document.listener_initial_commit)