##// END OF EJS Templates
fixed bad raise statement
marcink -
r3563:8d8c4ddd beta
parent child Browse files
Show More
@@ -525,7 +525,8 b' class FilesController(BaseRepoController'
525 try:
525 try:
526 node1 = c.changeset_1.get_node(f_path)
526 node1 = c.changeset_1.get_node(f_path)
527 if node1.is_dir():
527 if node1.is_dir():
528 raise NodeError('%s path is a %s not a file' % (node1, type(node1)))
528 raise NodeError('%s path is a %s not a file'
529 % (node1, type(node1)))
529 except NodeDoesNotExistError:
530 except NodeDoesNotExistError:
530 c.changeset_1 = EmptyChangeset(cs=diff1,
531 c.changeset_1 = EmptyChangeset(cs=diff1,
531 revision=c.changeset_1.revision,
532 revision=c.changeset_1.revision,
@@ -539,7 +540,9 b' class FilesController(BaseRepoController'
539 c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
540 c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)
540 try:
541 try:
541 node2 = c.changeset_2.get_node(f_path)
542 node2 = c.changeset_2.get_node(f_path)
542 raise NodeError('%s path is a %s not a file' % (node2, type(node2)))
543 if node2.is_dir():
544 raise NodeError('%s path is a %s not a file'
545 % (node2, type(node2)))
543 except NodeDoesNotExistError:
546 except NodeDoesNotExistError:
544 c.changeset_2 = EmptyChangeset(cs=diff2,
547 c.changeset_2 = EmptyChangeset(cs=diff2,
545 revision=c.changeset_2.revision,
548 revision=c.changeset_2.revision,
General Comments 0
You need to be logged in to leave comments. Login now