Mercurial > kallithea
changeset 3440:4725d097c3c0 beta
check if given f_path in diff is not a dir by any chance
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 03 Mar 2013 23:20:58 +0100 |
parents | 0153f5514aa3 |
children | c4bb2b22110e |
files | rhodecode/controllers/files.py |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/files.py Thu Feb 28 23:17:56 2013 +0100 +++ b/rhodecode/controllers/files.py Sun Mar 03 23:20:58 2013 +0100 @@ -486,6 +486,8 @@ c.changeset_1 = c.rhodecode_repo.get_changeset(diff1) try: node1 = c.changeset_1.get_node(f_path) + if node1.is_dir(): + raise NodeError('%s path is a %s not a file' % (node1, type(node1))) except NodeDoesNotExistError: c.changeset_1 = EmptyChangeset(cs=diff1, revision=c.changeset_1.revision, @@ -499,6 +501,7 @@ c.changeset_2 = c.rhodecode_repo.get_changeset(diff2) try: node2 = c.changeset_2.get_node(f_path) + raise NodeError('%s path is a %s not a file' % (node2, type(node2))) except NodeDoesNotExistError: c.changeset_2 = EmptyChangeset(cs=diff2, revision=c.changeset_2.revision,