+from datetime import datetime
+
from django.db import models
from django.contrib.auth.models import User
from django.utils.translation import ugettext_lazy as _
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)
parent = models.ForeignKey('self',
null=True, blank=True, default=None,
related_name="merge_children")
description = models.TextField(blank=True, default='')
- created_at = models.DateTimeField(auto_now_add=True)
+ created_at = models.DateTimeField(editable=False, db_index=True,
+ default=datetime.now)
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 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
+ """
+ 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):
if self.parent is None and self.merge_parent is not None:
return self.apply_to(self.merge_parent.materialize())
- changes = Change.objects.filter(
- ~models.Q(parent=None) | models.Q(merge_parent=None),
+ 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)
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
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 """
null=True, blank=True, default=None,
help_text=_("This document's current head."))
- @classmethod
- def create(cls, text='', *args, **kwargs):
- instance = cls(*args, **kwargs)
- instance.save()
- head = instance.head
- head.patch = Change.make_patch('', text)
- head.save()
- return instance
-
def __unicode__(self):
return u"{0}, HEAD: {1}".format(self.id, self.head_id)
raise ValueError("You can provide only text or patch - not both")
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, kwargs['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=kwargs['author'])
+ self.head = old_head.merge_with(change, author=author,
+ author_desc=author_desc)
else:
- self.head = parent.make_child(patch, kwargs['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.all()
+ return self.change_set.filter(revision__gt=-1)
def revision(self):
- return self.change_set.all().count()
+ rev = self.change_set.aggregate(
+ models.Max('revision'))['revision__max']
+ return rev if rev is not None else -1
def at_revision(self, rev):
if rev:
- return self.change_set.all()[rev-1]
+ return self.change_set.get(revision=rev)
else:
return self.head
@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=-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)
fnp / redakcja.git / blobdiff