From 0bc5ac14ea933480285af738fdc380c99474d100 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 13 2017 09:01:20 +0000 Subject: [PATCH 1/4] Check first if all repos are empty then if the branch is in the target repo --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 6068563..1059e79 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1282,7 +1282,11 @@ def diff_pull_request( if branch: commitid = branch.get_object().hex - if request.branch not in orig_repo.listall_branches(): + if repo_obj.is_empty and orig_repo.is_empty: + raise pagure.exceptions.PagureException( + 'Fork is empty, there are no commits to request pulling') + + if not orig_repo.is_empty and request.branch not in orig_repo.listall_branches(): raise pagure.exceptions.PagureException( 'The branch into which this pull-request was to be merged: %s ' 'seems to no longer be present in this repo' % request.branch) @@ -1369,9 +1373,6 @@ def diff_pull_request( repo_commit = repo_obj[request.commit_stop] if with_diff: diff = repo_commit.tree.diff_to_tree(swap=True) - else: - raise pagure.exceptions.PagureException( - 'Fork is empty, there are no commits to request pulling') return (diff_commits, diff) From 56a740474613e91c3b8d82565ec18ec67f6926f4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 13 2017 09:01:20 +0000 Subject: [PATCH 2/4] Adjust the unit-tests for the new UI around the roadmap --- diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py index 8053e8a..fea09de 100644 --- a/tests/test_pagure_flask_ui_roadmap.py +++ b/tests/test_pagure_flask_ui_roadmap.py @@ -481,24 +481,24 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # test the roadmap view output = self.app.get('/test/roadmap') self.assertEqual(output.status_code, 200) - self.assertIn(u'Milestone: v2.0', output.data) - self.assertIn(u'Milestone: unplanned', output.data) + self.assertIn(u'v2.0', output.data) + self.assertIn(u'unplanned', output.data) self.assertEqual( output.data.count(u'#'), 4) # test the roadmap view for all milestones output = self.app.get('/test/roadmap?status=All') self.assertEqual(output.status_code, 200) - self.assertIn(u'Milestone: v1.0', output.data) - self.assertIn(u'Milestone: v2.0', output.data) - self.assertIn(u'Milestone: unplanned', output.data) + self.assertIn(u'v1.0', output.data) + self.assertIn(u'v2.0', output.data) + self.assertIn(u'unplanned', output.data) self.assertEqual( output.data.count(u'#'), 6) # test the roadmap view for a specific milestone output = self.app.get('/test/roadmap?milestone=v2.0') self.assertEqual(output.status_code, 200) - self.assertIn(u'Milestone: v2.0', output.data) + self.assertIn(u'v2.0', output.data) self.assertEqual( output.data.count(u'#'), 2) @@ -512,7 +512,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # test the roadmap view for a specific milestone - closed output = self.app.get('/test/roadmap?milestone=v1.0&status=All') self.assertEqual(output.status_code, 200) - self.assertIn(u'Milestone: v1.0', output.data) + self.assertIn(u'v1.0', output.data) self.assertEqual( output.data.count(u'#'), 2) From c1808eecd32a4fd072035f570e45de58beaaede0 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 13 2017 09:01:20 +0000 Subject: [PATCH 3/4] Only check if the fork is empty to say that it is --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 1059e79..a27e083 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1282,7 +1282,7 @@ def diff_pull_request( if branch: commitid = branch.get_object().hex - if repo_obj.is_empty and orig_repo.is_empty: + if repo_obj.is_empty: raise pagure.exceptions.PagureException( 'Fork is empty, there are no commits to request pulling') From db2e4b1aa765a51e25eae47c7ee29f4ddc489e13 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 13 2017 09:01:20 +0000 Subject: [PATCH 4/4] Drop the id='issue-title' when the content is actually not an issue title --- diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html index e691e44..e78587c 100644 --- a/pagure/templates/roadmap.html +++ b/pagure/templates/roadmap.html @@ -144,7 +144,7 @@ -
{{ milestone }} + {{ milestone }} {% if repo.milestones[milestone] %}   (Due: {{ repo.milestones[milestone] }}) {% endif %} diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py index fea09de..31fdee0 100644 --- a/tests/test_pagure_flask_ui_roadmap.py +++ b/tests/test_pagure_flask_ui_roadmap.py @@ -481,24 +481,24 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # test the roadmap view output = self.app.get('/test/roadmap') self.assertEqual(output.status_code, 200) - self.assertIn(u'v2.0', output.data) - self.assertIn(u'unplanned', output.data) + self.assertIn(u'v2.0', output.data) + self.assertIn(u'unplanned', output.data) self.assertEqual( output.data.count(u'#'), 4) # test the roadmap view for all milestones output = self.app.get('/test/roadmap?status=All') self.assertEqual(output.status_code, 200) - self.assertIn(u'v1.0', output.data) - self.assertIn(u'v2.0', output.data) - self.assertIn(u'unplanned', output.data) + self.assertIn(u'v1.0', output.data) + self.assertIn(u'v2.0', output.data) + self.assertIn(u'unplanned', output.data) self.assertEqual( output.data.count(u'#'), 6) # test the roadmap view for a specific milestone output = self.app.get('/test/roadmap?milestone=v2.0') self.assertEqual(output.status_code, 200) - self.assertIn(u'v2.0', output.data) + self.assertIn(u'v2.0', output.data) self.assertEqual( output.data.count(u'#'), 2) @@ -512,7 +512,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): # test the roadmap view for a specific milestone - closed output = self.app.get('/test/roadmap?milestone=v1.0&status=All') self.assertEqual(output.status_code, 200) - self.assertIn(u'v1.0', output.data) + self.assertIn(u'v1.0', output.data) self.assertEqual( output.data.count(u'#'), 2)