Mercurial > kallithea

diff rhodecode/controllers/compare.py @ 3976:42bca6fa923b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unionrepo: update for Mercurial 2.6
author Mads Kiilerich <madski@unity3d.com>
date Wed, 12 Jun 2013 01:36:35 +0200
parents ce4b7023a492
children 48142e84bdc8
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py	Tue Jun 11 14:40:31 2013 +0200
+++ b/rhodecode/controllers/compare.py	Wed Jun 12 01:36:35 2013 +0200
@@ -35,11 +35,11 @@
 
 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