X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/db50b75e23a5cd6b29d1315f3a8ed2b7befeb81f..985ca3a21df2340caa545f27e5f01fd1eb87c9c8:/apps/dvcs/models.py diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index 47e7c26d..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 _ @@ -12,9 +14,11 @@ class Change(models.Model): Data contains a pickled diff needed to reproduce the initial document. """ - author = models.ForeignKey(User) + 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, @@ -25,41 +29,73 @@ class Change(models.Model): 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): + src = src.encode('utf-8') + if isinstance(dst, unicode): + dst = dst.encode('utf-8') 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, - 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 @@ -74,24 +110,25 @@ 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 """ + self.tree.commit(text=self.materialize(), **kwargs) class Document(models.Model): """ File in repository. """ - creator = models.ForeignKey(User) + creator = models.ForeignKey(User, null=True, blank=True) head = models.ForeignKey(Change, null=True, blank=True, default=None, help_text=_("This document's current head.")) - # Some meta-data - name = models.CharField(max_length=200, - help_text=_("Name for this file to display.")) - def __unicode__(self): - return u"{0}, HEAD: {1}".format(self.name, self.head_id) + return u"{0}, HEAD: {1}".format(self.id, self.head_id) @models.permalink def get_absolute_url(self): @@ -100,14 +137,14 @@ class Document(models.Model): 'version': self.head_id, }) - def materialize(self, version=None): + def materialize(self, change=None): 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: @@ -120,32 +157,56 @@ class Document(models.Model): 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'] + 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.changes.all() + 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 -1 + + 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): + # 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=pickle.dumps(mdiff.textdiff('', '')), + 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)