files.py
647 lines
| 27.2 KiB
| text/x-python
|
PythonLexer
r812 | # -*- coding: utf-8 -*- | |||
""" | ||||
rhodecode.controllers.files | ||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||
r547 | ||||
r812 | Files controller for RhodeCode | |||
r1203 | ||||
r812 | :created_on: Apr 21, 2010 | |||
:author: marcink | ||||
r1824 | :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com> | |||
r812 | :license: GPLv3, see COPYING for more details. | |||
""" | ||||
r1206 | # This program is free software: you can redistribute it and/or modify | |||
# it under the terms of the GNU General Public License as published by | ||||
# the Free Software Foundation, either version 3 of the License, or | ||||
# (at your option) any later version. | ||||
r1203 | # | |||
r547 | # This program is distributed in the hope that it will be useful, | |||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||||
# GNU General Public License for more details. | ||||
r1203 | # | |||
r547 | # You should have received a copy of the GNU General Public License | |||
r1206 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
r2291 | from __future__ import with_statement | |||
r1200 | import os | |||
r812 | import logging | |||
r1305 | import traceback | |||
r2267 | import tempfile | |||
r3490 | import shutil | |||
r812 | ||||
r1789 | from pylons import request, response, tmpl_context as c, url | |||
r547 | from pylons.i18n.translation import _ | |||
from pylons.controllers.util import redirect | ||||
r3061 | from rhodecode.lib.utils import jsonify | |||
r812 | ||||
r2109 | from rhodecode.lib import diffs | |||
from rhodecode.lib import helpers as h | ||||
r1753 | ||||
r1789 | from rhodecode.lib.compat import OrderedDict | |||
r2931 | from rhodecode.lib.utils2 import convert_line_endings, detect_mode, safe_str,\ | |||
str2bool | ||||
r1305 | from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator | |||
from rhodecode.lib.base import BaseRepoController, render | ||||
r2684 | from rhodecode.lib.vcs.backends.base import EmptyChangeset | |||
r2109 | from rhodecode.lib.vcs.conf import settings | |||
from rhodecode.lib.vcs.exceptions import RepositoryError, \ | ||||
ChangesetDoesNotExistError, EmptyRepositoryError, \ | ||||
r2977 | ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\ | |||
r3037 | NodeDoesNotExistError, ChangesetError, NodeError | |||
r2109 | from rhodecode.lib.vcs.nodes import FileNode | |||
r1305 | from rhodecode.model.repo import RepoModel | |||
r2109 | from rhodecode.model.scm import ScmModel | |||
r2255 | from rhodecode.model.db import Repository | |||
r2109 | ||||
r1789 | from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\ | |||
_context_url, get_line_ctx, get_ignore_ws | ||||
r3621 | from webob.exc import HTTPNotFound | |||
r2109 | ||||
r1305 | ||||
r547 | log = logging.getLogger(__name__) | |||
r1134 | ||||
r1045 | class FilesController(BaseRepoController): | |||
r636 | ||||
r547 | def __before__(self): | |||
super(FilesController, self).__before__() | ||||
r813 | c.cut_off_limit = self.cut_off_limit | |||
r547 | ||||
r1483 | def __get_cs_or_redirect(self, rev, repo_name, redirect_after=True): | |||
r1045 | """ | |||
r1137 | Safe way to get changeset if error occur it redirects to tip with | |||
proper message | ||||
r1203 | ||||
r1045 | :param rev: revision to fetch | |||
:param repo_name: repo name to redirect after | ||||
""" | ||||
try: | ||||
return c.rhodecode_repo.get_changeset(rev) | ||||
except EmptyRepositoryError, e: | ||||
r1483 | if not redirect_after: | |||
return None | ||||
url_ = url('files_add_home', | ||||
repo_name=c.repo_name, | ||||
r1485 | revision=0, f_path='') | |||
r3547 | add_new = h.link_to(_('click here to add new file'), url_) | |||
|
r2570 | h.flash(h.literal(_('There are no files yet %s') % add_new), | ||
r1483 | category='warning') | |||
r1045 | redirect(h.url('summary_home', repo_name=repo_name)) | |||
r3621 | except RepositoryError, e: # including ChangesetDoesNotExistError | |||
|
r3573 | h.flash(str(e), category='error') | ||
r3621 | raise HTTPNotFound() | |||
r1045 | ||||
r1189 | def __get_filenode_or_redirect(self, repo_name, cs, path): | |||
""" | ||||
Returns file_node, if error occurs or given path is directory, | ||||
it'll redirect to top level path | ||||
r1203 | ||||
r1189 | :param repo_name: repo_name | |||
:param cs: given changeset | ||||
:param path: path to lookup | ||||
""" | ||||
try: | ||||
file_node = cs.get_node(path) | ||||
if file_node.is_dir(): | ||||
raise RepositoryError('given path is a directory') | ||||
except RepositoryError, e: | ||||
|
r3573 | h.flash(str(e), category='error') | ||
r3621 | raise HTTPNotFound() | |||
r1189 | ||||
return file_node | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r2177 | def index(self, repo_name, revision, f_path, annotate=False): | |||
r1789 | # redirect to given revision from form if given | |||
r1137 | post_revision = request.POST.get('at_rev', None) | |||
if post_revision: | ||||
r1224 | cs = self.__get_cs_or_redirect(post_revision, repo_name) | |||
r636 | ||||
r1137 | c.changeset = self.__get_cs_or_redirect(revision, repo_name) | |||
c.branch = request.GET.get('branch', None) | ||||
c.f_path = f_path | ||||
r2177 | c.annotate = annotate | |||
r3237 | c.changeset = self.__get_cs_or_redirect(revision, repo_name) | |||
r1137 | cur_rev = c.changeset.revision | |||
r636 | ||||
r1789 | # prev link | |||
r1137 | try: | |||
prev_rev = c.rhodecode_repo.get_changeset(cur_rev).prev(c.branch) | ||||
c.url_prev = url('files_home', repo_name=c.repo_name, | ||||
revision=prev_rev.raw_id, f_path=f_path) | ||||
if c.branch: | ||||
c.url_prev += '?branch=%s' % c.branch | ||||
except (ChangesetDoesNotExistError, VCSError): | ||||
c.url_prev = '#' | ||||
r883 | ||||
r1789 | # next link | |||
r1137 | try: | |||
next_rev = c.rhodecode_repo.get_changeset(cur_rev).next(c.branch) | ||||
c.url_next = url('files_home', repo_name=c.repo_name, | ||||
revision=next_rev.raw_id, f_path=f_path) | ||||
if c.branch: | ||||
c.url_next += '?branch=%s' % c.branch | ||||
except (ChangesetDoesNotExistError, VCSError): | ||||
c.url_next = '#' | ||||
r636 | ||||
r1789 | # files or dirs | |||
r1137 | try: | |||
r1737 | c.file = c.changeset.get_node(f_path) | |||
r1190 | ||||
r1737 | if c.file.is_file(): | |||
r3001 | c.load_full_history = False | |||
file_last_cs = c.file.last_changeset | ||||
c.file_changeset = (c.changeset | ||||
if c.changeset.revision < file_last_cs.revision | ||||
else file_last_cs) | ||||
r3237 | #determine if we're on branch head | |||
_branches = c.rhodecode_repo.branches | ||||
|
r3267 | c.on_branch_head = revision in _branches.keys() + _branches.values() | ||
r3001 | _hist = [] | |||
c.file_history = [] | ||||
if c.load_full_history: | ||||
c.file_history, _hist = self._get_node_history(c.changeset, f_path) | ||||
r2456 | c.authors = [] | |||
for a in set([x.author for x in _hist]): | ||||
c.authors.append((h.email(a), h.person(a))) | ||||
r1190 | else: | |||
r2456 | c.authors = c.file_history = [] | |||
r644 | except RepositoryError, e: | |||
r3621 | h.flash(str(e), category='error') | |||
raise HTTPNotFound() | ||||
r644 | ||||
r2686 | if request.environ.get('HTTP_X_PARTIAL_XHR'): | |||
return render('files/files_ypjax.html') | ||||
r547 | return render('files/files.html') | |||
r3001 | def history(self, repo_name, revision, f_path, annotate=False): | |||
if request.environ.get('HTTP_X_PARTIAL_XHR'): | ||||
c.changeset = self.__get_cs_or_redirect(revision, repo_name) | ||||
c.f_path = f_path | ||||
c.annotate = annotate | ||||
c.file = c.changeset.get_node(f_path) | ||||
if c.file.is_file(): | ||||
file_last_cs = c.file.last_changeset | ||||
c.file_changeset = (c.changeset | ||||
if c.changeset.revision < file_last_cs.revision | ||||
else file_last_cs) | ||||
c.file_history, _hist = self._get_node_history(c.changeset, f_path) | ||||
c.authors = [] | ||||
for a in set([x.author for x in _hist]): | ||||
c.authors.append((h.email(a), h.person(a))) | ||||
return render('files/files_history_box.html') | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r547 | def rawfile(self, repo_name, revision, f_path): | |||
r1137 | cs = self.__get_cs_or_redirect(revision, repo_name) | |||
r1189 | file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path) | |||
r1045 | ||||
r1189 | response.content_disposition = 'attachment; filename=%s' % \ | |||
r2255 | safe_str(f_path.split(Repository.url_sep())[-1]) | |||
r1189 | ||||
r547 | response.content_type = file_node.mimetype | |||
return file_node.content | ||||
r2461 | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r547 | def raw(self, repo_name, revision, f_path): | |||
r1137 | cs = self.__get_cs_or_redirect(revision, repo_name) | |||
r1189 | file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path) | |||
r1045 | ||||
r1241 | raw_mimetype_mapping = { | |||
# map original mimetype to a mimetype used for "show as raw" | ||||
# you can also provide a content-disposition to override the | ||||
# default "attachment" disposition. | ||||
# orig_type: (new_type, new_dispo) | ||||
# show images inline: | ||||
'image/x-icon': ('image/x-icon', 'inline'), | ||||
'image/png': ('image/png', 'inline'), | ||||
'image/gif': ('image/gif', 'inline'), | ||||
'image/jpeg': ('image/jpeg', 'inline'), | ||||
'image/svg+xml': ('image/svg+xml', 'inline'), | ||||
} | ||||
mimetype = file_node.mimetype | ||||
try: | ||||
mimetype, dispo = raw_mimetype_mapping[mimetype] | ||||
except KeyError: | ||||
# we don't know anything special about this, handle it safely | ||||
if file_node.is_binary: | ||||
# do same as download raw for binary files | ||||
mimetype, dispo = 'application/octet-stream', 'attachment' | ||||
else: | ||||
# do not just use the original mimetype, but force text/plain, | ||||
# otherwise it would serve text/html and that might be unsafe. | ||||
# Note: underlying vcs library fakes text/plain mimetype if the | ||||
r1245 | # mimetype can not be determined and it thinks it is not | |||
# binary.This might lead to erroneous text display in some | ||||
# cases, but helps in other cases, like with text files | ||||
# without extension. | ||||
r1241 | mimetype, dispo = 'text/plain', 'inline' | |||
if dispo == 'attachment': | ||||
dispo = 'attachment; filename=%s' % \ | ||||
r1401 | safe_str(f_path.split(os.sep)[-1]) | |||
r1241 | ||||
response.content_disposition = dispo | ||||
response.content_type = mimetype | ||||
r547 | return file_node.content | |||
r636 | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') | |||
def edit(self, repo_name, revision, f_path): | ||||
r3237 | repo = c.rhodecode_db_repo | |||
r2727 | if repo.enable_locking and repo.locked[0]: | |||
h.flash(_('This repository is has been locked by %s on %s') | ||||
% (h.person_by_id(repo.locked[0]), | ||||
h.fmt_date(h.time_to_datetime(repo.locked[1]))), | ||||
'warning') | ||||
return redirect(h.url('files_home', | ||||
repo_name=repo_name, revision='tip')) | ||||
r3237 | # check if revision is a branch identifier- basically we cannot | |||
# create multiple heads via file editing | ||||
_branches = repo.scm_instance.branches | ||||
# check if revision is a branch name or branch hash | ||||
if revision not in _branches.keys() + _branches.values(): | ||||
h.flash(_('You can only edit files with revision ' | ||||
'being a valid branch '), category='warning') | ||||
return redirect(h.url('files_home', | ||||
repo_name=repo_name, revision='tip', | ||||
f_path=f_path)) | ||||
r1305 | r_post = request.POST | |||
c.cs = self.__get_cs_or_redirect(revision, repo_name) | ||||
c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path) | ||||
r1313 | if c.file.is_binary: | |||
return redirect(url('files_home', repo_name=c.repo_name, | ||||
revision=c.cs.raw_id, f_path=f_path)) | ||||
r3237 | c.default_message = _('Edited file %s via RhodeCode') % (f_path) | |||
r1305 | c.f_path = f_path | |||
if r_post: | ||||
old_content = c.file.content | ||||
r1306 | sl = old_content.splitlines(1) | |||
first_line = sl[0] if sl else '' | ||||
r1305 | # modes: 0 - Unix, 1 - Mac, 2 - DOS | |||
r1306 | mode = detect_mode(first_line, 0) | |||
r1305 | content = convert_line_endings(r_post.get('content'), mode) | |||
r1306 | ||||
r3237 | message = r_post.get('message') or c.default_message | |||
r1311 | author = self.rhodecode_user.full_contact | |||
r1305 | ||||
if content == old_content: | ||||
r3621 | h.flash(_('No changes'), category='warning') | |||
r1306 | return redirect(url('changeset_home', repo_name=c.repo_name, | |||
revision='tip')) | ||||
r1305 | try: | |||
r1311 | self.scm_model.commit_change(repo=c.rhodecode_repo, | |||
repo_name=repo_name, cs=c.cs, | ||||
r3487 | user=self.rhodecode_user.user_id, | |||
r1311 | author=author, message=message, | |||
content=content, f_path=f_path) | ||||
|
r2570 | h.flash(_('Successfully committed to %s') % f_path, | ||
r1305 | category='success') | |||
r1306 | ||||
r1311 | except Exception: | |||
r1305 | log.error(traceback.format_exc()) | |||
h.flash(_('Error occurred during commit'), category='error') | ||||
return redirect(url('changeset_home', | ||||
repo_name=c.repo_name, revision='tip')) | ||||
return render('files/files_edit.html') | ||||
r2457 | @LoginRequired() | |||
r1483 | @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') | |||
def add(self, repo_name, revision, f_path): | ||||
r2727 | ||||
repo = Repository.get_by_repo_name(repo_name) | ||||
if repo.enable_locking and repo.locked[0]: | ||||
h.flash(_('This repository is has been locked by %s on %s') | ||||
% (h.person_by_id(repo.locked[0]), | ||||
h.fmt_date(h.time_to_datetime(repo.locked[1]))), | ||||
'warning') | ||||
return redirect(h.url('files_home', | ||||
repo_name=repo_name, revision='tip')) | ||||
r1483 | r_post = request.POST | |||
r1485 | c.cs = self.__get_cs_or_redirect(revision, repo_name, | |||
r1483 | redirect_after=False) | |||
if c.cs is None: | ||||
c.cs = EmptyChangeset(alias=c.rhodecode_repo.alias) | ||||
r3237 | c.default_message = (_('Added file via RhodeCode')) | |||
r1483 | c.f_path = f_path | |||
if r_post: | ||||
unix_mode = 0 | ||||
content = convert_line_endings(r_post.get('content'), unix_mode) | ||||
r3237 | message = r_post.get('message') or c.default_message | |||
r3559 | filename = r_post.get('filename') | |||
r1483 | location = r_post.get('location') | |||
r1485 | file_obj = r_post.get('upload_file', None) | |||
if file_obj is not None and hasattr(file_obj, 'filename'): | ||||
filename = file_obj.filename | ||||
content = file_obj.file | ||||
r1483 | if not content: | |||
h.flash(_('No content'), category='warning') | ||||
return redirect(url('changeset_home', repo_name=c.repo_name, | ||||
revision='tip')) | ||||
r1484 | if not filename: | |||
h.flash(_('No filename'), category='warning') | ||||
return redirect(url('changeset_home', repo_name=c.repo_name, | ||||
r1485 | revision='tip')) | |||
r3559 | if location.startswith('/') or location.startswith('.') or '../' in location: | |||
h.flash(_('location must be relative path and must not ' | ||||
'contain .. in path'), category='warning') | ||||
return redirect(url('changeset_home', repo_name=c.repo_name, | ||||
revision='tip')) | ||||
r3591 | if location: | |||
location = os.path.normpath(location) | ||||
r3559 | filename = os.path.basename(filename) | |||
node_path = os.path.join(location, filename) | ||||
author = self.rhodecode_user.full_contact | ||||
r1483 | ||||
try: | ||||
self.scm_model.create_node(repo=c.rhodecode_repo, | ||||
r2199 | repo_name=repo_name, cs=c.cs, | |||
r3487 | user=self.rhodecode_user.user_id, | |||
r2199 | author=author, message=message, | |||
content=content, f_path=node_path) | ||||
|
r2570 | h.flash(_('Successfully committed to %s') % node_path, | ||
r1483 | category='success') | |||
r3559 | except (NodeError, NodeAlreadyExistsError), e: | |||
r1485 | h.flash(_(e), category='error') | |||
r1483 | except Exception: | |||
log.error(traceback.format_exc()) | ||||
h.flash(_('Error occurred during commit'), category='error') | ||||
return redirect(url('changeset_home', | ||||
repo_name=c.repo_name, revision='tip')) | ||||
return render('files/files_add.html') | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r872 | def archivefile(self, repo_name, fname): | |||
r945 | ||||
r942 | fileformat = None | |||
revision = None | ||||
r948 | ext = None | |||
r1450 | subrepos = request.GET.get('subrepos') == 'true' | |||
r945 | ||||
r1480 | for a_type, ext_data in settings.ARCHIVE_SPECS.items(): | |||
r948 | archive_spec = fname.split(ext_data[1]) | |||
if len(archive_spec) == 2 and archive_spec[1] == '': | ||||
fileformat = a_type or ext_data[1] | ||||
r942 | revision = archive_spec[0] | |||
r948 | ext = ext_data[1] | |||
r872 | ||||
try: | ||||
r1045 | dbrepo = RepoModel().get_by_repo_name(repo_name) | |||
|
r3625 | if not dbrepo.enable_downloads: | ||
r962 | return _('downloads disabled') | |||
r1809 | if c.rhodecode_repo.alias == 'hg': | |||
# patch and reset hooks section of UI config to not run any | ||||
# hooks on fetching archives with subrepos | ||||
for k, v in c.rhodecode_repo._repo.ui.configitems('hooks'): | ||||
c.rhodecode_repo._repo.ui.setconfig('hooks', k, None) | ||||
r1664 | ||||
r1045 | cs = c.rhodecode_repo.get_changeset(revision) | |||
r1480 | content_type = settings.ARCHIVE_SPECS[fileformat][0] | |||
r872 | except ChangesetDoesNotExistError: | |||
return _('Unknown revision %s') % revision | ||||
r945 | except EmptyRepositoryError: | |||
return _('Empty repository') | ||||
r961 | except (ImproperArchiveTypeError, KeyError): | |||
r948 | return _('Unknown archive type') | |||
r3490 | # archive cache | |||
from rhodecode import CONFIG | ||||
rev_name = cs.raw_id[:12] | ||||
archive_name = '%s-%s%s' % (safe_str(repo_name.replace('/', '_')), | ||||
safe_str(rev_name), ext) | ||||
r872 | ||||
r3490 | use_cached_archive = False # defines if we use cached version of archive | |||
archive_cache_enabled = CONFIG.get('archive_cache_dir') | ||||
if not subrepos and archive_cache_enabled: | ||||
#check if we it's ok to write | ||||
if not os.path.isdir(CONFIG['archive_cache_dir']): | ||||
os.makedirs(CONFIG['archive_cache_dir']) | ||||
cached_archive_path = os.path.join(CONFIG['archive_cache_dir'], archive_name) | ||||
if os.path.isfile(cached_archive_path): | ||||
log.debug('Found cached archive in %s' % cached_archive_path) | ||||
fd, archive = None, cached_archive_path | ||||
use_cached_archive = True | ||||
else: | ||||
log.debug('Archive %s is not yet cached' % (archive_name)) | ||||
if not use_cached_archive: | ||||
#generate new archive | ||||
try: | ||||
fd, archive = tempfile.mkstemp() | ||||
t = open(archive, 'wb') | ||||
log.debug('Creating new temp archive in %s' % archive) | ||||
cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos) | ||||
if archive_cache_enabled: | ||||
#if we generated the archive and use cache rename that | ||||
log.debug('Storing new archive in %s' % cached_archive_path) | ||||
shutil.move(archive, cached_archive_path) | ||||
archive = cached_archive_path | ||||
finally: | ||||
t.close() | ||||
r2294 | ||||
r2318 | def get_chunked_archive(archive): | |||
stream = open(archive, 'rb') | ||||
while True: | ||||
data = stream.read(16 * 1024) | ||||
if not data: | ||||
stream.close() | ||||
r3490 | if fd: # fd means we used temporary file | |||
os.close(fd) | ||||
if not archive_cache_enabled: | ||||
log.debug('Destroing temp archive %s' % archive) | ||||
os.remove(archive) | ||||
r2318 | break | |||
yield data | ||||
r1308 | ||||
r3490 | response.content_disposition = str('attachment; filename=%s' % (archive_name)) | |||
r2318 | response.content_type = str(content_type) | |||
return get_chunked_archive(archive) | ||||
r948 | ||||
r2457 | @LoginRequired() | |||
r1305 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r547 | def diff(self, repo_name, f_path): | |||
r1752 | ignore_whitespace = request.GET.get('ignorews') == '1' | |||
r1768 | line_context = request.GET.get('context', 3) | |||
r1789 | diff1 = request.GET.get('diff1', '') | |||
diff2 = request.GET.get('diff2', '') | ||||
r547 | c.action = request.GET.get('diff') | |||
c.no_changes = diff1 == diff2 | ||||
c.f_path = f_path | ||||
r1273 | c.big_diff = False | |||
r1789 | c.anchor_url = anchor_url | |||
c.ignorews_url = _ignorews_url | ||||
c.context_url = _context_url | ||||
c.changes = OrderedDict() | ||||
c.changes[diff2] = [] | ||||
r2931 | ||||
#special case if we want a show rev only, it's impl here | ||||
#to reduce JS and callbacks | ||||
r2995 | ||||
r2931 | if request.GET.get('show_rev'): | |||
if str2bool(request.GET.get('annotate', 'False')): | ||||
_url = url('files_annotate_home', repo_name=c.repo_name, | ||||
revision=diff1, f_path=c.f_path) | ||||
else: | ||||
_url = url('files_home', repo_name=c.repo_name, | ||||
revision=diff1, f_path=c.f_path) | ||||
return redirect(_url) | ||||
r547 | try: | |||
if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]: | ||||
r1045 | c.changeset_1 = c.rhodecode_repo.get_changeset(diff1) | |||
r2995 | try: | |||
node1 = c.changeset_1.get_node(f_path) | ||||
r3440 | if node1.is_dir(): | |||
r3563 | raise NodeError('%s path is a %s not a file' | |||
% (node1, type(node1))) | ||||
r2995 | 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) | ||||
r547 | else: | |||
r1224 | c.changeset_1 = EmptyChangeset(repo=c.rhodecode_repo) | |||
r2995 | node1 = FileNode(f_path, '', changeset=c.changeset_1) | |||
r636 | ||||
r547 | if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]: | |||
r1045 | c.changeset_2 = c.rhodecode_repo.get_changeset(diff2) | |||
r2995 | try: | |||
node2 = c.changeset_2.get_node(f_path) | ||||
r3563 | if node2.is_dir(): | |||
raise NodeError('%s path is a %s not a file' | ||||
% (node2, type(node2))) | ||||
r2995 | 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) | ||||
r547 | else: | |||
r1224 | c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo) | |||
r2995 | node2 = FileNode(f_path, '', changeset=c.changeset_2) | |||
r3037 | except (RepositoryError, NodeError): | |||
r2995 | log.error(traceback.format_exc()) | |||
r1818 | return redirect(url('files_home', repo_name=c.repo_name, | |||
r1789 | f_path=f_path)) | |||
r547 | ||||
if c.action == 'download': | ||||
r1753 | _diff = diffs.get_gitdiff(node1, node2, | |||
r1768 | ignore_whitespace=ignore_whitespace, | |||
context=line_context) | ||||
r1789 | diff = diffs.DiffProcessor(_diff, format='gitdiff') | |||
r1044 | ||||
r547 | diff_name = '%s_vs_%s.diff' % (diff1, diff2) | |||
response.content_type = 'text/plain' | ||||
r2083 | response.content_disposition = ( | |||
'attachment; filename=%s' % diff_name | ||||
) | ||||
r2995 | return diff.as_raw() | |||
r636 | ||||
r547 | elif c.action == 'raw': | |||
r1753 | _diff = diffs.get_gitdiff(node1, node2, | |||
r1768 | ignore_whitespace=ignore_whitespace, | |||
context=line_context) | ||||
r1789 | diff = diffs.DiffProcessor(_diff, format='gitdiff') | |||
r649 | response.content_type = 'text/plain' | |||
r2995 | return diff.as_raw() | |||
r662 | ||||
r547 | else: | |||
r1789 | fid = h.FID(diff2, node2.path) | |||
line_context_lcl = get_line_ctx(fid, request.GET) | ||||
ign_whitespace_lcl = get_ignore_ws(fid, request.GET) | ||||
r1149 | ||||
r1789 | lim = request.GET.get('fulldiff') or self.cut_off_limit | |||
r2109 | _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1, | |||
r1789 | filenode_new=node2, | |||
cut_off_limit=lim, | ||||
ignore_whitespace=ign_whitespace_lcl, | ||||
line_context=line_context_lcl, | ||||
enable_comments=False) | ||||
r2995 | op = '' | |||
filename = node1.path | ||||
cs_changes = { | ||||
'fid': [cs1, cs2, op, filename, diff, st] | ||||
} | ||||
c.changes = cs_changes | ||||
r636 | ||||
r547 | return render('files/file_diff.html') | |||
r636 | ||||
r2456 | def _get_node_history(self, cs, f_path, changesets=None): | |||
r2977 | """ | |||
get changesets history for given node | ||||
:param cs: changeset to calculate history | ||||
:param f_path: path for node to calculate history for | ||||
:param changesets: if passed don't calculate history and take | ||||
changesets defined in this list | ||||
""" | ||||
# calculate history based on tip | ||||
tip_cs = c.rhodecode_repo.get_changeset() | ||||
r2456 | if changesets is None: | |||
r2977 | try: | |||
changesets = tip_cs.get_file_history(f_path) | ||||
r2981 | except (NodeDoesNotExistError, ChangesetError): | |||
r2977 | #this node is not present at tip ! | |||
changesets = cs.get_file_history(f_path) | ||||
r547 | hist_l = [] | |||
r774 | ||||
changesets_group = ([], _("Changesets")) | ||||
branches_group = ([], _("Branches")) | ||||
tags_group = ([], _("Tags")) | ||||
r2046 | _hg = cs.repository.alias == 'hg' | |||
r547 | for chs in changesets: | |||
r3001 | #_branch = '(%s)' % chs.branch if _hg else '' | |||
_branch = chs.branch | ||||
r3009 | n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, _branch) | |||
r774 | changesets_group[0].append((chs.raw_id, n_desc,)) | |||
hist_l.append(changesets_group) | ||||
r1045 | for name, chs in c.rhodecode_repo.branches.items(): | |||
r774 | branches_group[0].append((chs, name),) | |||
hist_l.append(branches_group) | ||||
r1045 | for name, chs in c.rhodecode_repo.tags.items(): | |||
r774 | tags_group[0].append((chs, name),) | |||
hist_l.append(tags_group) | ||||
r3009 | ||||
r2981 | return hist_l, changesets | |||
r1452 | ||||
r2457 | @LoginRequired() | |||
r1452 | @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', | |||
'repository.admin') | ||||
r2457 | @jsonify | |||
r1452 | def nodelist(self, repo_name, revision, f_path): | |||
if request.environ.get('HTTP_X_PARTIAL_XHR'): | ||||
cs = self.__get_cs_or_redirect(revision, repo_name) | ||||
r1810 | _d, _f = ScmModel().get_nodes(repo_name, cs.raw_id, f_path, | |||
flat=False) | ||||
r2428 | return {'nodes': _d + _f} | |||