diff --git a/requires.txt b/requires.txt --- a/requires.txt +++ b/requires.txt @@ -14,4 +14,4 @@ webob==1.0.8 markdown==2.1.1 docutils==0.8.1 py-bcrypt -mercurial>=2.1,<2.2 \ No newline at end of file +mercurial>=2.2,<2.3 \ No newline at end of file diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -69,10 +69,10 @@ if __py_version__ < (2, 6): requirements.append("pysqlite") if __platform__ in PLATFORM_WIN: - requirements.append("mercurial>=2.1,<2.2") + requirements.append("mercurial>=2.2,<2.3") else: requirements.append("py-bcrypt") - requirements.append("mercurial>=2.1,<2.2") + requirements.append("mercurial>=2.2,<2.3") def get_version(): diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py --- a/rhodecode/controllers/changelog.py +++ b/rhodecode/controllers/changelog.py @@ -125,7 +125,8 @@ class ChangelogController(BaseRepoContro data.append(['', vtx, edges]) elif repo.alias == 'hg': - c.dag = graphmod.colored(graphmod.dagwalker(repo._repo, revs)) + dag = graphmod.dagwalker(repo._repo, revs) + c.dag = graphmod.colored(dag, repo._repo) for (id, type, ctx, vtx, edges) in c.dag: if type != graphmod.CHANGESET: continue