Mercurial > kallithea

comparison rhodecode/lib/indexers/__init__.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Imported some of the GPLv3'd changes from RhodeCode v2.2.5. This imports changes between changesets 21af6c4eab3d and 6177597791c2 in RhodeCode's original repository, including only changes to Python files and HTML. RhodeCode clearly licensed its changes to these files under GPLv3 in their /LICENSE file, which states the following: The Python code and integrated HTML are licensed under the GPLv3 license. (See: https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE or http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE for an online copy of that LICENSE file) Conservancy reviewed these changes and confirmed that they can be licensed as a whole to the Kallithea project under GPLv3-only. While some of the contents committed herein are clearly licensed GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the statement above from RhodeCode indicates that they intend GPLv3-only as their license, per GPLv3ยง14 and other relevant sections of GPLv3.
author Bradley M. Kuhn <bkuhn@sfconservancy.org>
date Wed, 02 Jul 2014 19:03:13 -0400
parents 5293d4bbb1ea
children e9f6b533a8f6
comparison
equal deleted inserted replaced
4115:8b7294a804a0 4116:ffd45b185016
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 """
3 rhodecode.lib.indexers.__init__
4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5
6 Whoosh indexing module for RhodeCode
7
8 :created_on: Aug 17, 2010
9 :author: marcink
10 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
11 :license: GPLv3, see COPYING for more details.
12 """
13 # This program is free software: you can redistribute it and/or modify 2 # This program is free software: you can redistribute it and/or modify
14 # it under the terms of the GNU General Public License as published by 3 # it under the terms of the GNU General Public License as published by
15 # the Free Software Foundation, either version 3 of the License, or 4 # the Free Software Foundation, either version 3 of the License, or
16 # (at your option) any later version. 5 # (at your option) any later version.
17 # 6 #
20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 9 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 # GNU General Public License for more details. 10 # GNU General Public License for more details.
22 # 11 #
23 # You should have received a copy of the GNU General Public License 12 # You should have received a copy of the GNU General Public License
24 # along with this program. If not, see <http://www.gnu.org/licenses/>. 13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
14 """
15 rhodecode.lib.indexers.__init__
16 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
18 Whoosh indexing module for RhodeCode
19
20 :created_on: Aug 17, 2010
21 :author: marcink
22 :copyright: (c) 2013 RhodeCode GmbH.
23 :license: GPLv3, see LICENSE for more details.
24 """
25
25 import os 26 import os
26 import sys 27 import sys
27 import logging 28 import logging
28 from os.path import dirname as dn, join as jn 29 from os.path import dirname as dn, join as jn
29 30
142 f_path = f_path.lstrip(os.sep) 143 f_path = f_path.lstrip(os.sep)
143 content_short = self.get_short_content(res, docid[1]) 144 content_short = self.get_short_content(res, docid[1])
144 res.update({'content_short': content_short, 145 res.update({'content_short': content_short,
145 'content_short_hl': self.highlight(content_short), 146 'content_short_hl': self.highlight(content_short),
146 'f_path': f_path 147 'f_path': f_path
147 }) 148 })
148 elif self.search_type == 'path': 149 elif self.search_type == 'path':
149 full_repo_path = jn(self.repo_location, res['repository']) 150 full_repo_path = jn(self.repo_location, res['repository'])
150 f_path = res['path'].split(full_repo_path)[-1] 151 f_path = res['path'].split(full_repo_path)[-1]
151 f_path = f_path.lstrip(os.sep) 152 f_path = f_path.lstrip(os.sep)
152 res.update({'f_path': f_path}) 153 res.update({'f_path': f_path})