def _merge_if_needed(self, base_revision, new_body):
if self.revision == base_revision:
return new_body
base = WikiPageRevision.query(WikiPageRevision.title == self.title, WikiPageRevision.revision == base_revision).get().body
merged = ''.join(Merge3(base, self.body, new_body).merge_lines())
conflicted = len(re.findall(PageOperationMixin.re_conflicted, merged)) > 0
if conflicted:
raise ConflictError('Conflicted', base, new_body, merged)
return merged
def _merge_if_needed(self, base_revision, new_body):
if self.revision == base_revision:
return new_body
base = WikiPageRevision.query(
WikiPageRevision.title == self.title,
WikiPageRevision.revision == base_revision).get().body
merged = ''.join(Merge3(base, self.body, new_body).merge_lines())
conflicted = len(re.findall(PageOperationMixin.re_conflicted,
merged)) > 0
if conflicted:
raise ConflictError('Conflicted', base, new_body, merged)
return merged
def revisions(self):
return WikiPageRevision.query(ancestor=self._rev_key())
def revisions(self):
return WikiPageRevision.query(ancestor=self._rev_key())
