From c51a084ecf2fefb54ef9f74b21beff437ac9a4bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Wed, 30 Sep 2009 16:19:41 +0200 Subject: [PATCH] =?utf8?q?Poprawione=20kilka=20liter=C3=B3wek.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- apps/api/handlers/library_handlers.py | 8 ++++---- lib/wlrepo/mercurial_backend/__init__.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index eff5ada0..39177f53 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -517,12 +517,12 @@ class MergeHandler(BaseHandler): 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, }) diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py index 6dd3c11b..8b5849cc 100644 --- a/lib/wlrepo/mercurial_backend/__init__.py +++ b/lib/wlrepo/mercurial_backend/__init__.py @@ -72,7 +72,7 @@ class MercurialRevision(wlrepo.Revision): 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): -- 2.20.1