comparison rhodecode/controllers/files.py @ 2007:324ac367a4da beta

Added VCS into rhodecode core for faster and easier deployments of new versions
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 20 Feb 2012 23:00:54 +0200
parents 8fa8d0d034e6
children 82a88013a3fd 4e1e265af5ca
comparison
equal deleted inserted replaced
2006:34d009e5147a 2007:324ac367a4da
30 from pylons import request, response, tmpl_context as c, url 30 from pylons import request, response, tmpl_context as c, url
31 from pylons.i18n.translation import _ 31 from pylons.i18n.translation import _
32 from pylons.controllers.util import redirect 32 from pylons.controllers.util import redirect
33 from pylons.decorators import jsonify 33 from pylons.decorators import jsonify
34 34
35 from vcs.conf import settings 35 from rhodecode.lib.vcs.conf import settings
36 from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \ 36 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \
37 EmptyRepositoryError, ImproperArchiveTypeError, VCSError, \ 37 EmptyRepositoryError, ImproperArchiveTypeError, VCSError, \
38 NodeAlreadyExistsError 38 NodeAlreadyExistsError
39 from vcs.nodes import FileNode 39 from rhodecode.lib.vcs.nodes import FileNode
40 40
41 from rhodecode.lib.compat import OrderedDict 41 from rhodecode.lib.compat import OrderedDict
42 from rhodecode.lib import convert_line_endings, detect_mode, safe_str 42 from rhodecode.lib import convert_line_endings, detect_mode, safe_str
43 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator 43 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
44 from rhodecode.lib.base import BaseRepoController, render 44 from rhodecode.lib.base import BaseRepoController, render