Mercurial > public > src > rhodecode
changeset 2304:8ce4c8e43eb7 beta
Bumped mercurial to 2.2 and fixed code for this release ref #429
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Mon, 23 Apr 2012 18:21:19 +0200 |
| parents | d9972f76322e |
| children | 6b97fb00fa03 |
| files | requires.txt rhodecode/__init__.py rhodecode/controllers/changelog.py |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/requires.txt Thu Apr 19 01:27:37 2012 +0200 +++ b/requires.txt Mon Apr 23 18:21:19 2012 +0200 @@ -14,4 +14,4 @@ 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
--- a/rhodecode/__init__.py Thu Apr 19 01:27:37 2012 +0200 +++ b/rhodecode/__init__.py Mon Apr 23 18:21:19 2012 +0200 @@ -69,10 +69,10 @@ 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():
--- a/rhodecode/controllers/changelog.py Thu Apr 19 01:27:37 2012 +0200 +++ b/rhodecode/controllers/changelog.py Mon Apr 23 18:21:19 2012 +0200 @@ -125,7 +125,8 @@ 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