kallithea Changeset - 98d235e28078

Changeset - 98d235e28078

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Sean Farley - 11 years ago 2014-11-17 00:03:07
sean.michael.farley@gmail.com

hg: adapt for changes in 3.2 and 3.3

Mercurial 3.2:

- moved localrepo.pull to exchange.pull
- removed __getitem__ from lazysets

3 files changed with 24 insertions and 6 deletions:

kallithea/controllers/compare.py

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

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

0 comments (0 inline, 0 general)

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -86,25 +86,29 @@ class CompareController(BaseRepoControll @@
             #no remote compare do it on the same repository
             else:
                 hgrepo = other_repo._repo
             if org_repo.EMPTY_CHANGESET in (org_rev, other_rev):
                 # work around unexpected Mercurial behaviour
                 ancestor = org_repo.EMPTY_CHANGESET
             else:
                 ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev)
                 if ancestors:
                     # FIXME: picks arbitrary ancestor - but there is usually only one
                     ancestor = hgrepo[ancestors[0]].hex()
                     try:
                         ancestor = hgrepo[ancestors.first()].hex()
                     except AttributeError:
                         # removed in hg 3.2
                         ancestor = hgrepo[ancestors[0]].hex()
             other_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",
                                      other_rev, org_rev, org_rev)
             other_changesets = [other_repo.get_changeset(rev) for rev in other_revs]
             org_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",
                                    org_rev, other_rev, other_rev)
             org_changesets = [org_repo.get_changeset(hgrepo[rev].hex()) for rev in org_revs]
         elif alias == 'git':
             if org_repo != other_repo:
                 from dulwich.repo import Repo

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

➞

Show inline comments

@@ @@ -38,26 +38,30 @@ class MercurialInMemoryChangeset(BaseInM @@
         if branch is None:
             branch = MercurialRepository.DEFAULT_BRANCH_NAME
         kwargs['branch'] = branch
         def filectxfn(_repo, memctx, path):
             """
             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)
                 if getattr(memctx, '_returnnoneformissingfiles', False):
                     return None
                 else:
                     # (hg < 3.2) Raising exception is the 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(_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

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

➞

Show inline comments

@@ @@ -445,25 +445,29 @@ class MercurialRepository(BaseRepository @@
+            }
         # avoid expensive branch(x) iteration over whole repo
         rev_spec = "%%s & %s(%%s)" % _revset_predicates[ref_type]
         try:
             revs = self._repo.revs(rev_spec, ref_name, ref_name)
         except LookupError:
             msg = ("Ambiguous identifier %s:%s for %s" % (ref_type, ref_name, self.name))
             raise ChangesetDoesNotExistError(msg)
         except RepoLookupError:
             msg = ("Revision %s:%s does not exist for %s" % (ref_type, ref_name, self.name))
             raise ChangesetDoesNotExistError(msg)
         if revs:
             revision = revs[-1]
             try:
                 revision = revs.last()
             except AttributeError:
                 # removed in hg 3.2
                 revision = revs[-1]
         else:
             # TODO: just report 'not found'?
             revision = ref_name
         return self._get_revision(revision)
     def _get_archives(self, archive_name='tip'):
         allowed = self.baseui.configlist("web", "allow_archive",
                                          untrusted=True)
         for i in [('zip', '.zip'), ('gz', '.tar.gz'), ('bz2', '.tar.bz2')]:
             if i[0] in allowed or self._repo.ui.configbool("web",
                                                            "allow" + i[0],
@@ @@ -531,37 +535,43 @@ class MercurialRepository(BaseRepository @@
         if start_date and not end_date:
             filter_.append('date(">%s")' % start_date)
         if end_date and not start_date:
             filter_.append('date("<%s")' % end_date)
         if start_date and end_date:
             filter_.append('date(">%s") and date("<%s")' % (start_date, end_date))
         if filter_:
             revisions = scmutil.revrange(self._repo, filter_)
         else:
             revisions = self.revisions
         revs = revisions[start_pos:end_pos]
         # this is very much a hack to turn this into a list; a better solution
         # would be to get rid of this function entirely and use revsets
         revs = list(revisions)[start_pos:end_pos]
         if reverse:
             revs = reversed(revs)
         return CollectionGenerator(self, revs)
     def pull(self, url):
         """
         Tries to pull changes from external location.
         """
         url = self._get_url(url)
         other = peer(self._repo, {}, url)
         try:
             other = peer(self._repo, {}, url)
             # hg 3.2 moved push / pull to exchange module
             from mercurial import exchange
             exchange.pull(self._repo, other, heads=None, force=None)
         except ImportError:
             self._repo.pull(other, heads=None, force=None)
         except Abort, err:
             # Propagate error but with vcs's type
             raise RepositoryError(str(err))
     @LazyProperty
     def workdir(self):
         """
         Returns ``Workdir`` instance for this repository.
         """
         return MercurialWorkdir(self)

0 comments (0 inline, 0 general)