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 = {}
+
+ def next(self):
+ """
+ Returns the next tag - stage to work on.
+ Returns None for the last stage.
+ """
+ try:
+ return Tag.objects.filter(ordering__gt=self.ordering)[0]
+ except IndexError:
+ return None
+
+models.signals.pre_save.connect(Tag.listener_changed, sender=Tag)
+
+
class Change(models.Model):
"""
Single document change related to previous change. The "parent"
Data contains a pickled diff needed to reproduce the initial document.
"""
author = models.ForeignKey(User, null=True, blank=True)
+ author_name = models.CharField(max_length=128, null=True, blank=True)
+ author_email = models.CharField(max_length=128, null=True, blank=True)
patch = models.TextField(blank=True)
tree = models.ForeignKey('Document')
revision = models.IntegerField(db_index=True)
description = models.TextField(blank=True, default='')
created_at = models.DateTimeField(editable=False, db_index=True,
default=datetime.now)
+ publishable = models.BooleanField(default=False)
+
+ tags = models.ManyToManyField(Tag)
class Meta:
ordering = ('created_at',)
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 "%s <%s>" % (
+ self.author_name,
+ self.author_email
+ )
+
+
def save(self, *args, **kwargs):
"""
take the next available revision number if none yet
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_name=None, author_email=None, tags=None):
+ ch = self.children.create(patch=patch,
tree=self.tree, author=author,
+ author_name=author_name,
+ author_email=author_email,
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_name=None, author_email=None, tags=None):
+ ch = self.merge_children.create(patch=patch,
tree=self.tree, author=author,
- description=description)
+ author_name=author_name,
+ author_email=author_email,
+ 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_name=None, author_email=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_name=author_name,
+ author_email=author_email,
+ description=description)
def revert(self, **kwargs):
""" commit this version of a doc as new head """
"""
File in repository.
"""
- creator = models.ForeignKey(User, null=True, blank=True)
+ creator = models.ForeignKey(User, null=True, blank=True, editable=False,
+ related_name="created_documents")
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)
+
+ user = models.ForeignKey(User, null=True, blank=True)
+ stage = models.ForeignKey(Tag, null=True, blank=True)
def __unicode__(self):
return u"{0}, HEAD: {1}".format(self.id, self.head_id)
patch = kwargs['patch']
author = kwargs.get('author', None)
+ author_name = kwargs.get('author_name', None)
+ author_email = kwargs.get('author_email', None)
+ tags = kwargs.get('tags', [])
+ if tags:
+ # set stage to next tag after the commited one
+ self.stage = max(tags, key=lambda t: t.ordering).next()
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_name=author_name,
+ author_email=author_email,
+ 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_name=author_name,
+ author_email=author_email)
else:
- self.head = parent.make_child(patch, author, kwargs.get('description', ''))
+ self.head = parent.make_child(patch, author=author,
+ author_name=author_name,
+ author_email=author_email,
+ description=kwargs.get('description', ''),
+ tags=tags)
self.save()
return self.head
return rev if rev is not None else -1
def at_revision(self, rev):
- if rev:
+ if rev is not None:
return self.change_set.get(revision=rev)
else:
return self.head
+ def publishable(self):
+ changes = self.change_set.filter(publishable=True).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
fnp / redakcja.git / blobdiff