From 4230afd4dac77df9e4cf8bb9390337a73c1a411d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:00:50 +0000 Subject: [PATCH 1/6] Adjust get_git_tags_objects to actually return the Tag object instead of the Reference --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 1a9726c..3b703d3 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1165,11 +1165,13 @@ def get_git_tags(project): """ repopath = pagure.get_repo_path(project) repo_obj = PagureRepo(repopath) + tags = [ tag.split('refs/tags/')[1] for tag in repo_obj.listall_references() if 'refs/tags/' in tag ] + return tags @@ -1180,8 +1182,9 @@ def get_git_tags_objects(project): repopath = pagure.get_repo_path(project) repo_obj = PagureRepo(repopath) tags = [ - repo_obj.lookup_reference(tag) + repo_obj[repo_obj.lookup_reference(tag).target] for tag in repo_obj.listall_references() if 'refs/tags/' in tag ] + return tags From f706bc93eaf6eef204cc4cc1b29a3b75be7a46c2 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:01:06 +0000 Subject: [PATCH 2/6] Show the first line of the tag message in the release page --- diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index 9c1eac1..610b676 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -40,7 +40,10 @@
  • - {{ tag.shorthand }} + {{ tag.name }} + {% if tag.message %} + -- {{ tag.message.split('\n')[0] }} + {% endif %} {{ tag.get_object().hex | short }}
  • From 810c1146ae65b6f947588e9b1d490e89850454f4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:07:37 +0000 Subject: [PATCH 3/6] Fix the pagination on the user's page --- diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html index 9ddc793..3081142 100644 --- a/pagure/templates/user_info.html +++ b/pagure/templates/user_info.html @@ -28,10 +28,10 @@

    {{ render_repos( - repos, total_page_repos, repopage, + repos, total_page_repos, 'repopage', repopage, 'Projects', repos_length, 'repos') }} {{ render_repos( - forks, total_page_forks, forkpage, + forks, total_page_forks, 'forkpage', forkpage, 'Forks', forks_length, 'forks') }}
    From 6ac1dea3934efecf24acfacc9d98ad1faa796682 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:09:53 +0000 Subject: [PATCH 4/6] Ensure there is a form before setting something in it --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 56f64d5..d78252a 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -851,7 +851,7 @@ def new_request_pull(repo, branch_to, branch_from, username=None): if not is_repo_admin(repo): form = None - if len(diff_commits): + if len(diff_commits) and form: form.title.data=diff_commits[0].message.strip().split('\n')[0] return flask.render_template( From 6469eeca8df3d99da9a3e4b103ac1f11409bb26b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:27:14 +0000 Subject: [PATCH 5/6] Ensure we get a reference for the tag specified --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 3b703d3..6adba13 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1184,7 +1184,7 @@ def get_git_tags_objects(project): tags = [ repo_obj[repo_obj.lookup_reference(tag).target] for tag in repo_obj.listall_references() - if 'refs/tags/' in tag + if 'refs/tags/' in tag and repo_obj.lookup_reference(tag) ] return tags From 182e333a42f527f201dd1a3225e0fc9808d7338d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 12 2015 09:41:21 +0000 Subject: [PATCH 6/6] Fix the runserver script - Fix setting the env variable - Fix using the -c/--config argument, we need to set the env variable before we do the imports, otherwise that won't work --- diff --git a/runserver.py b/runserver.py index dc2c207..71fc5b3 100755 --- a/runserver.py +++ b/runserver.py @@ -8,8 +8,6 @@ import argparse import sys import os -from pagure import APP -APP.debug = True parser = argparse.ArgumentParser( description='Run the packages2 app') @@ -36,6 +34,9 @@ if args.profile: APP.wsgi_app = ProfilerMiddleware(APP.wsgi_app, restrictions=[30]) if args.config: - os.environ['PKGS_CONFIG'] = args.config + os.environ['PAGURE_CONFIG'] = args.config + +from pagure import APP +APP.debug = True APP.run(port=int(args.port))