Mercurial > kallithea
changeset 5531:4b647864075e
git: add unicode conversion to make tests pass with dulwich 0.11.2
This makes the test suite pass with both dulwich 0.9.9 and the unsupported
0.11.2.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 08 Oct 2015 23:21:58 +0200 |
parents | 7f9040460576 |
children | 92220cd013b0 |
files | kallithea/controllers/compare.py |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/compare.py Fri Oct 02 22:46:15 2015 +0200 +++ b/kallithea/controllers/compare.py Thu Oct 08 23:21:58 2015 +0200 @@ -35,6 +35,7 @@ from pylons.controllers.util import redirect from pylons.i18n.translation import _ +from kallithea.lib.utils2 import safe_str from kallithea.lib.vcs.utils.hgcompat import unionrepo from kallithea.lib import helpers as h from kallithea.lib.base import BaseRepoController, render @@ -114,10 +115,10 @@ from dulwich.client import SubprocessGitClient gitrepo = Repo(org_repo.path) - SubprocessGitClient(thin_packs=False).fetch(other_repo.path, gitrepo) + SubprocessGitClient(thin_packs=False).fetch(safe_str(other_repo.path), gitrepo) gitrepo_remote = Repo(other_repo.path) - SubprocessGitClient(thin_packs=False).fetch(org_repo.path, gitrepo_remote) + SubprocessGitClient(thin_packs=False).fetch(safe_str(org_repo.path), gitrepo_remote) revs = [] for x in gitrepo_remote.get_walker(include=[other_rev],