__doc__ = "Module documentation."
import wlrepo
+from mercurial.node import nullid
class MercurialRevision(wlrepo.Revision):
@property
def document_name(self):
- return self._docname
+ return self._docname.decode('utf-8')
@property
def user_name(self):
- return self._username
+ return self._username.decode('utf-8')
def hgrev(self):
return self._changectx.node()
def hgbranch(self):
return self._changectx.branch()
+ @property
+ def timestamp(self):
+ return self._changectx.date()[0]
+
def __unicode__(self):
return u"%s" % self._changectx.hex()
+ def __str__(self):
+ return self.__unicode__().encode('utf-8')
+
def __repr__(self):
return "%s" % self._changectx.hex()
a = self._changectx.ancestor(other._changectx)
return (a.branch() == self._changectx.branch())
+ def has_children(self):
+ return bool(self._library._hgrepo.changelog.children(self.hgrev()))
+
def merge_with(self, other, user, message):
- lock = self._library._lock(True)
+ lock = self._library.lock(True)
try:
self._library._checkout(self._changectx.node())
status = self._library._merge(other._changectx.node())
- if status.is_clean():
+ if status.isclean():
self._library._commit(user=user, message=message)
return (True, True)
else: