1. Marcin Kuzminski
  2. RhodeCode

Issues

Issue #490 invalid

Changelog for mercurial repositories broken in r2402:9d097c2592d3

Martin Felis
created an issue

When trying to navigate to the Changelog page of a mercurial repository I get an Error 505 in the current tip of the default branch (r2402)

Here the output of the WebApp error message: {{{ Module weberror.errormiddleware:162 in call

app_iter = self.application(environ, sr_checker) Module beaker.middleware:155 in call return self.wrap_app(environ, session_start_response) Module routes.middleware:131 in call response = self.app(environ, start_response) Module pylons.wsgiapp:107 in call response = self.dispatch(controller, environ, start_response) Module pylons.wsgiapp:312 in dispatch return controller(environ, start_response) Module rhodecode.lib.base:180 in call return WSGIController.call(self, environ, start_response) Module pylons.controllers.core:211 in call response = self._dispatch_call() Module pylons.controllers.core:162 in _dispatch_call response = self._inspect_call(func) Module pylons.controllers.core:105 in _inspect_call result = self._perform_call(func, args) Module pylons.controllers.core:57 in _perform_call return func(**args) Module rhodecode.controllers.changelog:93 in index self._graph(c.rhodecode_repo, collection, c.total_cs, c.size, p) Module rhodecode.controllers.changelog:129 in _graph c.dag = graphmod.colored(dag, repo._repo) TypeError: colored() takes exactly 1 argument (2 given) }}}

Changing the offending (rhodecode/controllers/changelog.py:129) line from {{{ c.dag = graphmod.colored(dag, repo._repo) }}} to {{{ c.dag = graphmod.colored(dag) }}} seems to work but I do not know whether it's correct.

Comments (3)

  1. Martin Felis reporter

    Hmmm... when reverting my change and updating to mercurial 2.2.2 using pip I get an error when restarting paster:

      File "/var/www/rhodecode/virtualenv/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 588, in resolve
        raise VersionConflict(dist,req) # XXX put more info here
    pkg_resources.VersionConflict: (mercurial 2.2.2 (/var/www/rhodecode/virtualenv/lib/python2.7/site-packages), Requirement.parse('mercurial>=2.1,<2.2'))
    

    I adjusted the requirements in /rhodecode/RhodeCode.egg-info/requires.txt to

    mercurial>=2.1,<2.3
    

    and now it seems to work.

  2. Log in to comment