#1508: don't choke on comments before root

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

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index 18fe18f..9c9d350 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -15,6 +15,7 @@ class Change(models.Model):
     author = models.ForeignKey(User, null=True, blank=True)
     patch = models.TextField(blank=True)
     tree = models.ForeignKey('Document')
     author = models.ForeignKey(User, null=True, blank=True)
     patch = models.TextField(blank=True)
     tree = models.ForeignKey('Document')

+    revision = models.IntegerField(db_index=True)

 
     parent = models.ForeignKey('self',
                         null=True, blank=True, default=None,
 
     parent = models.ForeignKey('self',
                         null=True, blank=True, default=None,


@@ -25,14 +26,23 @@ class Change(models.Model):
                         related_name="merge_children")
 
     description = models.TextField(blank=True, default='')
                         related_name="merge_children")
 
     description = models.TextField(blank=True, default='')

-    created_at = models.DateTimeField(auto_now_add=True)
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)

 
     class Meta:
         ordering = ('created_at',)
 
     class Meta:
         ordering = ('created_at',)

+        unique_together = ['tree', 'revision']

 
     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 __unicode__(self):
         return u"Id: %r, Tree %r, Parent %r, Patch '''\n%s'''" % (self.id, self.tree_id, self.parent_id, self.patch)
 

+    def save(self, *args, **kwargs):
+        """
+            take the next available revision number if none yet
+        """
+        if self.revision is None:
+            self.revision = self.tree.revision() + 1
+        return super(Change, self).save(*args, **kwargs)
+

     @staticmethod
     def make_patch(src, dst):
         if isinstance(src, unicode):
     @staticmethod
     def make_patch(src, dst):
         if isinstance(src, unicode):


@@ -42,9 +52,13 @@ class Change(models.Model):
         return pickle.dumps(mdiff.textdiff(src, dst))
 
     def materialize(self):
         return pickle.dumps(mdiff.textdiff(src, dst))
 
     def materialize(self):

+        # special care for merged nodes
+        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 = Change.objects.exclude(parent=None).filter(
                         tree=self.tree,

-                        created_at__lte=self.created_at).order_by('created_at')
+                        revision__lte=self.revision).order_by('revision')

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


@@ -80,6 +94,10 @@ class Change(models.Model):
                     patch=patch, merge_parent=other, tree=self.tree,
                     author=author, description=description)
 
                     patch=patch, merge_parent=other, tree=self.tree,
                     author=author, description=description)
 

+    def revert(self, **kwargs):
+        """ commit this version of a doc as new head """
+        self.tree.commit(text=self.materialize(), **kwargs)
+

 
 class Document(models.Model):
     """
 
 class Document(models.Model):
     """


@@ -100,14 +118,14 @@ class Document(models.Model):
                         'version': self.head_id,
         })
 
                         'version': self.head_id,
         })
 

-    def materialize(self, version=None):
+    def materialize(self, change=None):

         if self.head is None:
             return u''
         if self.head is None:
             return u''

-        if version is None:
-            version = self.head
-        elif not isinstance(version, Change):
-            version = self.change_set.get(pk=version)
-        return version.materialize()
+        if change is None:
+            change = self.head
+        elif not isinstance(change, Change):
+            change = self.change_set.get(pk=change)
+        return change.materialize()

 
     def commit(self, **kwargs):
         if 'parent' not in kwargs:
 
     def commit(self, **kwargs):
         if 'parent' not in kwargs:


@@ -120,31 +138,46 @@ class Document(models.Model):
         if 'patch' not in kwargs:
             if 'text' not in kwargs:
                 raise ValueError("You must provide either patch or target document.")
         if 'patch' not in kwargs:
             if 'text' not in kwargs:
                 raise ValueError("You must provide either patch or target document.")

-            patch = Change.make_patch(self.materialize(version=parent), kwargs['text'])
+            patch = Change.make_patch(self.materialize(change=parent), kwargs['text'])

         else:
             if 'text' in kwargs:
                 raise ValueError("You can provide only text or patch - not both")
             patch = kwargs['patch']
 
         else:
             if 'text' in kwargs:
                 raise ValueError("You can provide only text or patch - not both")
             patch = kwargs['patch']
 

+        author = kwargs.get('author', None)
+

         old_head = self.head
         if parent != old_head:
         old_head = self.head
         if parent != old_head:

-            change = parent.make_merge_child(patch, kwargs['author'], kwargs.get('description', ''))
+            change = parent.make_merge_child(patch, author, kwargs.get('description', ''))

             # not Fast-Forward - perform a merge
             # not Fast-Forward - perform a merge

-            self.head = old_head.merge_with(change, author=kwargs['author'])
+            self.head = old_head.merge_with(change, author=author)

         else:
         else:

-            self.head = parent.make_child(patch, kwargs['author'], kwargs.get('description', ''))
+            self.head = parent.make_child(patch, author, kwargs.get('description', ''))
+

         self.save()
         return self.head
 
     def history(self):
         self.save()
         return self.head
 
     def history(self):

-        return self.changes.all()
+        return self.change_set.filter(revision__gt=0)
+
+    def revision(self):
+        rev = self.change_set.aggregate(
+                models.Max('revision'))['revision__max']
+        return rev if rev is not None else 0
+
+    def at_revision(self, rev):
+        if rev:
+            return self.change_set.get(revision=rev)
+        else:
+            return self.head

 
     @staticmethod
     def listener_initial_commit(sender, instance, created, **kwargs):
         if created:
             instance.head = Change.objects.create(
 
     @staticmethod
     def listener_initial_commit(sender, instance, created, **kwargs):
         if created:
             instance.head = Change.objects.create(

+                    revision=0,

                     author=instance.creator,
                     author=instance.creator,

-                    patch=pickle.dumps(mdiff.textdiff('', '')),
+                    patch=Change.make_patch('', ''),

                     tree=instance)
             instance.save()
 
                     tree=instance)
             instance.save()