kallithea Changeset - 4725d097c3c0

Changeset - 4725d097c3c0

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-03-03 23:20:58
marcin@python-works.com

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

1 file changed with 3 insertions and 0 deletions:

rhodecode/controllers/files.py

0 comments (0 inline, 0 general)

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -483,12 +483,14 @@ class FilesController(BaseRepoController @@
             return redirect(_url)
         try:
             if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:
                 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,
                                                    repo=c.rhodecode_repo)
                     node1 = FileNode(f_path, '', changeset=c.changeset_1)
             else:
@@ @@ -496,12 +498,13 @@ class FilesController(BaseRepoController @@
                 node1 = FileNode(f_path, '', changeset=c.changeset_1)
             if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:
                 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,
                                                    repo=c.rhodecode_repo)
                     node2 = FileNode(f_path, '', changeset=c.changeset_2)
             else:

0 comments (0 inline, 0 general)