if not changed:
return response.SuccessNoContent().django_response()
- new_udoc = udoc.latest()
+ nudoc = udoc.latest()
return response.SuccessAllOk().django_response({
- "name": udoc.id,
+ "name": nudoc.id,
"parent_user_resivion": udoc.revision,
"parent_revision": doc.revision,
- "revision": ndoc.revision,
- 'timestamp': ndoc.revision.timestamp,
+ "revision": nudoc.revision,
+ 'timestamp': nudoc.revision.timestamp,
})
a = self._changectx.ancestor(other._changectx)
return (a.branch() == self._changectx.branch())
- def children(self):
+ def has_children(self):
return bool(self._library._hgrepo.changelog.children(self.hgrev()))
def merge_with(self, other, user, message):