diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py --- a/rhodecode/controllers/changelog.py +++ b/rhodecode/controllers/changelog.py @@ -37,22 +37,65 @@ from rhodecode.lib.helpers import RepoPa from rhodecode.lib.compat import json from rhodecode.lib.graphmod import _colored, _dagwalker from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\ - EmptyRepositoryError + ChangesetError, NodeDoesNotExistError, EmptyRepositoryError from rhodecode.lib.utils2 import safe_int +from webob.exc import HTTPNotFound log = logging.getLogger(__name__) +def _load_changelog_summary(): + p = safe_int(request.GET.get('page'), 1) + size = safe_int(request.GET.get('size'), 10) + + def url_generator(**kw): + return url('changelog_summary_home', + repo_name=c.rhodecode_db_repo.repo_name, size=size, **kw) + + collection = c.rhodecode_repo + + c.repo_changesets = RepoPage(collection, page=p, + items_per_page=size, + url=url_generator) + page_revisions = [x.raw_id for x in list(c.repo_changesets)] + c.comments = c.rhodecode_db_repo.get_comments(page_revisions) + c.statuses = c.rhodecode_db_repo.statuses(page_revisions) + + class ChangelogController(BaseRepoController): - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') def __before__(self): super(ChangelogController, self).__before__() c.affected_files_cut_off = 60 - def index(self): + def _graph(self, repo, revs_int, repo_size, size, p): + """ + Generates a DAG graph for repo + + :param repo: + :param revs_int: + :param repo_size: + :param size: + :param p: + """ + if not revs_int: + c.jsdata = json.dumps([]) + return + + data = [] + revs = revs_int + + dag = _dagwalker(repo, revs, repo.alias) + dag = _colored(dag) + for (id, type, ctx, vtx, edges) in dag: + data.append(['', vtx, edges]) + + c.jsdata = json.dumps(data) + + @LoginRequired() + @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', + 'repository.admin') + def index(self, repo_name, revision=None, f_path=None): limit = 100 default = 20 if request.GET.get('size'): @@ -65,20 +108,33 @@ class ChangelogController(BaseRepoContro c.size = max(c.size, 1) p = safe_int(request.GET.get('page', 1), 1) branch_name = request.GET.get('branch', None) + c.changelog_for_path = f_path try: - if branch_name: - collection = [z for z in - c.rhodecode_repo.get_changesets(start=0, - branch_name=branch_name)] - c.total_cs = len(collection) + + if f_path: + log.debug('generating changelog for path %s' % f_path) + # get the history for the file ! + tip_cs = c.rhodecode_repo.get_changeset() + try: + collection = tip_cs.get_file_history(f_path) + except (NodeDoesNotExistError, ChangesetError): + #this node is not present at tip ! + try: + cs = self.__get_cs_or_redirect(revision, repo_name) + collection = cs.get_file_history(f_path) + except RepositoryError, e: + h.flash(str(e), category='warning') + redirect(h.url('changelog_home', repo_name=repo_name)) + collection = list(reversed(collection)) else: - collection = c.rhodecode_repo - c.total_cs = len(c.rhodecode_repo) + collection = c.rhodecode_repo.get_changesets(start=0, + branch_name=branch_name) + c.total_cs = len(collection) c.pagination = RepoPage(collection, page=p, item_count=c.total_cs, - items_per_page=c.size, branch=branch_name) + items_per_page=c.size, branch=branch_name,) collection = list(c.pagination) - page_revisions = [x.raw_id for x in collection] + page_revisions = [x.raw_id for x in c.pagination] c.comments = c.rhodecode_db_repo.get_comments(page_revisions) c.statuses = c.rhodecode_db_repo.statuses(page_revisions) except (EmptyRepositoryError), e: @@ -89,37 +145,31 @@ class ChangelogController(BaseRepoContro h.flash(str(e), category='error') return redirect(url('changelog_home', repo_name=c.repo_name)) - self._graph(c.rhodecode_repo, collection, c.total_cs, c.size, p) - c.branch_name = branch_name c.branch_filters = [('', _('All Branches'))] + \ [(k, k) for k in c.rhodecode_repo.branches.keys()] + _revs = [] + if not f_path: + _revs = [x.revision for x in c.pagination] + self._graph(c.rhodecode_repo, _revs, c.total_cs, c.size, p) return render('changelog/changelog.html') + @LoginRequired() + @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', + 'repository.admin') def changelog_details(self, cs): if request.environ.get('HTTP_X_PARTIAL_XHR'): c.cs = c.rhodecode_repo.get_changeset(cs) return render('changelog/changelog_details.html') - - def _graph(self, repo, collection, repo_size, size, p): - """ - Generates a DAG graph for mercurial + raise HTTPNotFound() - :param repo: repo instance - :param size: number of commits to show - :param p: page number - """ - if not collection: - c.jsdata = json.dumps([]) - return + @LoginRequired() + @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', + 'repository.admin') + def changelog_summary(self, repo_name): + if request.environ.get('HTTP_X_PARTIAL_XHR'): + _load_changelog_summary() - data = [] - revs = [x.revision for x in collection] - - dag = _dagwalker(repo, revs, repo.alias) - dag = _colored(dag) - for (id, type, ctx, vtx, edges) in dag: - data.append(['', vtx, edges]) - - c.jsdata = json.dumps(data) + return render('changelog/changelog_summary_data.html') + raise HTTPNotFound()