# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2013-03-03 22:20:58
# Node ID 4725d097c3c068eb429e8a8f927ccee673eb282f
# Parent  0153f5514aa36cc05d4e382a2a2020858e2057ea

check if given f_path in diff is not a dir by any chance

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -486,6 +486,8 @@ class FilesController(BaseRepoController
                 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 @@ class FilesController(BaseRepoController
                 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,