kallithea Changeset - 056d2fc1f93f

Changeset - 056d2fc1f93f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2014-08-12 13:08:23
madski@unity3d.com

mercurial: support Mercurial 3.1 after memfilectx.__init__ was changed in 503bb3af70fe

2 files changed with 10 insertions and 2 deletions:

kallithea/lib/vcs/backends/hg/inmemory.py

kallithea/lib/vcs/utils/hgcompat.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/inmemory.py

➞

Show inline comments

@@ @@ -44,35 +44,35 @@ class MercurialInMemoryChangeset(BaseInM @@
             Marks given path as added/changed/removed in a given _repo. This is
             for internal mercurial commit function.
             """
             # check if this path is removed
             if path in (node.path for node in self.removed):
                 # Raising exception is a way to mark node for removal
                 raise IOError(errno.ENOENT, '%s is deleted' % path)
             # check if this path is added
             for node in self.added:
                 if node.path == path:
                     return memfilectx(path=node.path,
+                    return memfilectx(_repo, path=node.path,
                         data=(node.content.encode('utf8')
                               if not node.is_binary else node.content),
                         islink=False,
                         isexec=node.is_executable,
                         copied=False)
             # or changed
             for node in self.changed:
                 if node.path == path:
                     return memfilectx(path=node.path,
+                    return memfilectx(_repo, path=node.path,
                         data=(node.content.encode('utf8')
                               if not node.is_binary else node.content),
                         islink=False,
                         isexec=node.is_executable,
                         copied=False)
             raise RepositoryError("Given path haven't been marked as added,"
                                   "changed or removed (%s)" % path)
         parents = [None, None]
         for i, parent in enumerate(self.parents):
             if parent is not None:

kallithea/lib/vcs/utils/hgcompat.py

➞

Show inline comments

@@ @@ -23,12 +23,20 @@ from mercurial.mdiff import diffopts @@
 from mercurial.node import hex
 from mercurial.encoding import tolocal
 from mercurial.discovery import findcommonoutgoing
 from mercurial.hg import peer
 from mercurial.httppeer import httppeer
 from mercurial.util import url as hg_url
 from mercurial.scmutil import revrange
 from mercurial.node import nullrev
 # those authnadlers are patched for python 2.6.5 bug an
 # infinit looping when given invalid resources
 from mercurial.url import httpbasicauthhandler, httpdigestauthhandler
 import inspect
 # Mercurial 3.1 503bb3af70fe
 if inspect.getargspec(memfilectx.__init__).args[1] != 'repo':
     _org__init__=memfilectx.__init__
     def _memfilectx__init__(self, repo, *a, **b):
         return _org__init__(self, *a, **b)
     memfilectx.__init__ = _memfilectx__init__

0 comments (0 inline, 0 general)