fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
django 1.3, comments on books, last activity log, some minor changes
[redakcja.git]
/
apps
/
dvcs
/
models.py
diff --git
a/apps/dvcs/models.py
b/apps/dvcs/models.py
index
6c5796a
..
86f66bc
100644
(file)
--- a/
apps/dvcs/models.py
+++ b/
apps/dvcs/models.py
@@
-38,6
+38,16
@@
class Tag(models.Model):
def listener_changed(sender, instance, **kwargs):
sender._object_cache = {}
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)
models.signals.pre_save.connect(Tag.listener_changed, sender=Tag)
@@
-50,7
+60,8
@@
class Change(models.Model):
Data contains a pickled diff needed to reproduce the initial document.
"""
author = models.ForeignKey(User, null=True, blank=True)
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)
+ 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)
patch = models.TextField(blank=True)
tree = models.ForeignKey('Document')
revision = models.IntegerField(db_index=True)
@@
-66,6
+77,7
@@
class Change(models.Model):
description = models.TextField(blank=True, default='')
created_at = models.DateTimeField(editable=False, db_index=True,
default=datetime.now)
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)
tags = models.ManyToManyField(Tag)
@@
-83,7
+95,10
@@
class Change(models.Model):
self.author.last_name,
self.author.email)
else:
self.author.last_name,
self.author.email)
else:
- return self.author_desc
+ return "%s <%s>" % (
+ self.author_name,
+ self.author_email
+ )
def save(self, *args, **kwargs):
def save(self, *args, **kwargs):
@@
-116,20
+131,22
@@
class Change(models.Model):
return text
def make_child(self, patch, description, author=None,
return text
def make_child(self, patch, description, author=None,
- author_
desc
=None, tags=None):
+ author_
name=None, author_email
=None, tags=None):
ch = self.children.create(patch=patch,
tree=self.tree, author=author,
ch = self.children.create(patch=patch,
tree=self.tree, author=author,
- author_desc=author_desc,
+ 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, description, author=None,
description=description)
if tags is not None:
ch.tags = tags
return ch
def make_merge_child(self, patch, description, author=None,
- author_
desc
=None, tags=None):
+ author_
name=None, author_email
=None, tags=None):
ch = self.merge_children.create(patch=patch,
tree=self.tree, author=author,
ch = self.merge_children.create(patch=patch,
tree=self.tree, author=author,
- author_desc=author_desc,
+ author_name=author_name,
+ author_email=author_email,
description=description,
tags=tags)
if tags is not None:
description=description,
tags=tags)
if tags is not None:
@@
-139,7
+156,8
@@
class Change(models.Model):
def apply_to(self, text):
return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
def apply_to(self, text):
return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
- def merge_with(self, other, author=None, author_desc=None,
+ 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:
description=u"Automatic merge."):
assert self.tree_id == other.tree_id # same tree
if other.parent_id == self.pk:
@@
-155,7
+173,9
@@
class Change(models.Model):
patch = self.make_patch(local, result)
return self.children.create(
patch=patch, merge_parent=other, tree=self.tree,
patch = self.make_patch(local, result)
return self.children.create(
patch=patch, merge_parent=other, tree=self.tree,
- author=author, author_desc=author_desc,
+ author=author,
+ author_name=author_name,
+ author_email=author_email,
description=description)
def revert(self, **kwargs):
description=description)
def revert(self, **kwargs):
@@
-167,10
+187,15
@@
class Document(models.Model):
"""
File in repository.
"""
"""
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,
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)
def __unicode__(self):
return u"{0}, HEAD: {1}".format(self.id, self.head_id)
@@
-209,21
+234,28
@@
class Document(models.Model):
patch = kwargs['patch']
author = kwargs.get('author', None)
patch = kwargs['patch']
author = kwargs.get('author', None)
- author_desc = kwargs.get('author_desc', None)
+ author_name = kwargs.get('author_name', None)
+ author_email = kwargs.get('author_email', None)
tags = kwargs.get('tags', [])
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=author,
old_head = self.head
if parent != old_head:
change = parent.make_merge_child(patch, author=author,
- author_desc=author_desc,
+ 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,
description=kwargs.get('description', ''),
tags=tags)
# not Fast-Forward - perform a merge
self.head = old_head.merge_with(change, author=author,
- author_desc=author_desc)
+ author_name=author_name,
+ author_email=author_email)
else:
self.head = parent.make_child(patch, author=author,
else:
self.head = parent.make_child(patch, author=author,
- author_desc=author_desc,
+ author_name=author_name,
+ author_email=author_email,
description=kwargs.get('description', ''),
tags=tags)
description=kwargs.get('description', ''),
tags=tags)
@@
-239,13
+271,13
@@
class Document(models.Model):
return rev if rev is not None else -1
def at_revision(self, rev):
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
return self.change_set.get(revision=rev)
else:
return self.head
- def
last_tagged(self, tag
):
- changes =
tag.change_set.filter(tree=self
).order_by('-created_at')[:1]
+ def
publishable(self
):
+ changes =
self.change_set.filter(publishable=True
).order_by('-created_at')[:1]
if changes.count():
return changes[0]
else:
if changes.count():
return changes[0]
else: