')
- def merge_with(self, other, author, description=u"Automatic merge."):
- assert self.tree_id == other.tree_id # same tree
- if other.parent_id == self.pk:
- # immediate child
- return other
+ revision = cls.objects.create(
+ parent=parent,
+ merge_parent=merge_parent,
+ author=author,
+ author_name=author_name,
+ author_email=author_email,
+ description=description
+ )
+ revision.save_text(text)
+ return revision
- local = self.materialize()
- base = other.merge_parent.materialize()
- remote = other.apply_to(base)
+ def materialize(self):
+ f = repo.open(self.get_text_path())
+ text = f.read().decode('utf-8')
+ f.close()
+ if text:
+ text = text.replace(
+ '
', '
')
+ return text
- merge = simplemerge.Merge3Text(base, local, remote)
- result = ''.join(merge.merge_lines())
- patch = self.make_patch(local, result)
- return self.children.create(
- patch=patch, merge_parent=other, tree=self.tree,
- author=author, description=description)
+ def is_descendant_of(self, other):
+ # Naive approach.
+ return (
+ (
+ self.parent is not None and (
+ self.parent.pk == other.pk or
+ self.parent.is_descendant_of(other)
+ )
+ ) or (
+ self.merge_parent is not None and (
+ self.merge_parent.pk == other.pk or
+ self.merge_parent.is_descendant_of(other)
+ )
+ )
+ )
+ def get_common_ancestor_with(self, other):
+ # VERY naive approach.
+ if self.pk == other.pk:
+ return self
+ if self.is_descendant_of(other):
+ return other
+ if other.is_descendant_of(self):
+ return self
-class Document(models.Model):
- """
- File in repository.
- """
- creator = models.ForeignKey(User)
- 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)
-
- @models.permalink
- def get_absolute_url(self):
- return ('dvcs.views.document_data', (), {
- 'document_id': self.id,
- 'version': self.head_id,
- })
-
- def materialize(self, version=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()
-
- def commit(self, **kwargs):
- if 'parent' not in kwargs:
- parent = self.head
+ if self.parent is not None:
+ parent_ca = self.parent.get_common_ancestor_with(other)
else:
- parent = kwargs['parent']
- if not isinstance(parent, Change):
- parent = Change.objects.get(pk=kwargs['parent'])
-
- 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'])
+ parent_ca = None
+
+ if self.merge_parent is not None:
+ merge_parent_ca = self.merge_parent.get_common_ancestor_with(other)
else:
- if 'text' in kwargs:
- raise ValueError("You can provide only text or patch - not both")
- patch = kwargs['patch']
-
- old_head = self.head
- if parent != old_head:
- change = parent.make_merge_child(patch, kwargs['author'], kwargs.get('description', ''))
- # not Fast-Forward - perform a merge
- self.head = old_head.merge_with(change, author=kwargs['author'])
+ return parent_ca
+
+ if parent_ca is None or parent_ca.created_at < merge_parent_ca.created_at:
+ return merge_parent_ca
+
+ return parent_ca
+
+ def get_ancestors(self):
+ revs = set()
+ if self.parent is not None:
+ revs.add(self.parent)
+ revs.update(self.parent.get_ancestors())
+ if self.merge_parent is not None:
+ revs.add(self.merge_parent)
+ revs.update(self.merge_parent.get_ancestors())
+ return revs
+
+
+@python_2_unicode_compatible
+class Ref(models.Model):
+ """A reference pointing to a specific revision."""
+
+ revision = models.ForeignKey(
+ Revision, null=True, blank=True, default=None, verbose_name=_('revision'),
+ help_text=_("The document's revision."), editable=False)
+
+ def __str__(self):
+ return "ref:{0}->rev:{1}".format(self.id, self.revision_id)
+
+ def merge_text(self, base, local, remote):
+ """Override in subclass to have different kinds of merges."""
+ files = []
+ for f in local, base, remote:
+ temp = NamedTemporaryFile(delete=False)
+ temp.write(f)
+ temp.close()
+ files.append(temp.name)
+ p = Popen(['/usr/bin/diff3', '-mE', '-L', 'old', '-L', '', '-L', 'new'] + files, stdout=PIPE)
+ result, errs = p.communicate()
+
+ for f in files:
+ os.unlink(f)
+ return result.decode('utf-8')
+
+ def merge_with(self, revision, author=None, author_name=None, author_email=None, description="Automatic merge."):
+ """Merges a given revision into the ref."""
+ if self.revision is None:
+ fast_forward = True
+ self.revision = revision
+ elif self.revision.pk == revision.pk or self.revision.is_descendant_of(revision):
+ # Already merged.
+ return
+ elif revision.is_descendant_of(self.revision):
+ # Fast forward.
+ fast_forward = True
+ self.revision = revision
else:
- self.head = parent.make_child(patch, kwargs['author'], kwargs.get('description', ''))
+ # Need to create a merge revision.
+ fast_forward = False
+ base = self.revision.get_common_ancestor_with(revision)
+
+ local_text = self.materialize().encode('utf-8')
+ base_text = base.materialize().encode('utf-8')
+ other_text = revision.materialize().encode('utf-8')
+
+ merge_text = self.merge_text(base_text, local_text, other_text)
+
+ merge_revision = Revision.create(
+ text=merge_text,
+ parent=self.revision,
+ merge_parent=revision,
+ author=author,
+ author_name=author_name,
+ author_email=author_email,
+ description=description
+ )
+ self.revision = merge_revision
self.save()
- return self.head
+ post_merge.send(sender=type(self), instance=self, fast_forward=fast_forward)
+
+ def materialize(self):
+ return self.revision.materialize() if self.revision is not None else ''
+
+ def commit(self, text, parent=False, author=None, author_name=None, author_email=None, description=''):
+ """Creates a new revision and sets it as the ref.
+
+ This will automatically merge the commit into the main branch,
+ if parent is not document's head.
+
+ :param unicode text: new version of the document
+ :param User author: the commiter
+ :param unicode author_name: commiter name (if ``author`` not specified)
+ :param unicode author_email: commiter e-mail (if ``author`` not specified)
+ :returns: new head
+ """
+ if parent is False:
+ # If parent revision not set explicitly, use your head.
+ parent = self.revision
+
+ # Warning: this will silently leave revs unreferenced.
+ rev = Revision.create(
+ text=text,
+ author=author,
+ author_name=author_name,
+ author_email=author_email,
+ description=description,
+ parent=parent
+ )
+ self.merge_with(rev, author=author, author_name=author_name, author_email=author_email)
+
+ post_commit.send(sender=type(self), instance=self)
def history(self):
- return self.changes.all()
-
- @staticmethod
- def listener_initial_commit(sender, instance, created, **kwargs):
- if created:
- instance.head = Change.objects.create(
- author=instance.creator,
- patch=pickle.dumps(mdiff.textdiff('', '')),
- tree=instance)
- instance.save()
-
-models.signals.post_save.connect(Document.listener_initial_commit, sender=Document)
+ revs = self.revision.get_ancestors()
+ revs.add(self.revision)
+ return sorted(revs, key=lambda x: x.created_at)