unionrepo: update for Mercurial 2.6

rhodecode/controllers/compare.py

@@ -35,11 +35,11 b' from pylons.i18n.translation import _'
 
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError, RepositoryError
 from rhodecode.lib.vcs.utils import safe_str
-from rhodecode.lib.vcs.utils.hgcompat import scmutil
+from rhodecode.lib.vcs.utils.hgcompat import scmutil, unionrepo
 from rhodecode.lib import helpers as h
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib import diffs, unionrepo
+from rhodecode.lib import diffs
 
 from rhodecode.model.db import Repository
 from webob.exc import HTTPBadRequest

rhodecode/lib/dbmigrate/schema/db_1_6_0.py

@@ -2039,4 +2039,3 b' class DbMigrateVersion(Base, BaseModel):'
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)
-

rhodecode/lib/vcs/utils/hgcompat.py

@@ -9,6 +9,7 b' mercurial.demandimport.enable = lambda *'
 from mercurial import archival, merge as hg_merge, patch, ui
 from mercurial import discovery
 from mercurial import localrepo
+from mercurial import unionrepo
 from mercurial import scmutil
 from mercurial import config
 from mercurial.commands import clone, nullid, pull