Mercurial > kallithea

comparison rhodecode/controllers/files.py @ 3037:789f20683559 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix error when diff path is a directory, edge case generated by google bots
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 27 Nov 2012 22:53:06 +0100
parents f0e19116f154
children 7727faad5baf
comparison
equal deleted inserted replaced
3036:31f98c850623 3037:789f20683559
44 from rhodecode.lib.vcs.backends.base import EmptyChangeset 44 from rhodecode.lib.vcs.backends.base import EmptyChangeset
45 from rhodecode.lib.vcs.conf import settings 45 from rhodecode.lib.vcs.conf import settings
46 from rhodecode.lib.vcs.exceptions import RepositoryError, \ 46 from rhodecode.lib.vcs.exceptions import RepositoryError, \
47 ChangesetDoesNotExistError, EmptyRepositoryError, \ 47 ChangesetDoesNotExistError, EmptyRepositoryError, \
48 ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\ 48 ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\
49 NodeDoesNotExistError, ChangesetError 49 NodeDoesNotExistError, ChangesetError, NodeError
50 from rhodecode.lib.vcs.nodes import FileNode 50 from rhodecode.lib.vcs.nodes import FileNode
51 51
52 from rhodecode.model.repo import RepoModel 52 from rhodecode.model.repo import RepoModel
53 from rhodecode.model.scm import ScmModel 53 from rhodecode.model.scm import ScmModel
54 from rhodecode.model.db import Repository 54 from rhodecode.model.db import Repository
493 repo=c.rhodecode_repo) 493 repo=c.rhodecode_repo)
494 node2 = FileNode(f_path, '', changeset=c.changeset_2) 494 node2 = FileNode(f_path, '', changeset=c.changeset_2)
495 else: 495 else:
496 c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo) 496 c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo)
497 node2 = FileNode(f_path, '', changeset=c.changeset_2) 497 node2 = FileNode(f_path, '', changeset=c.changeset_2)
498 except RepositoryError: 498 except (RepositoryError, NodeError):
499 log.error(traceback.format_exc()) 499 log.error(traceback.format_exc())
500 return redirect(url('files_home', repo_name=c.repo_name, 500 return redirect(url('files_home', repo_name=c.repo_name,
501 f_path=f_path)) 501 f_path=f_path))
502 502
503 if c.action == 'download': 503 if c.action == 'download':