From e4c63c0d38ec12790afb97201391ce81606a8885 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 17 2017 10:17:24 +0000 Subject: [PATCH 1/3] Add some more logging when viewing a PR Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 6c28aab..b4c6ecb 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -177,6 +177,8 @@ def request_pull(repo, requestid, username=None, namespace=None): """ repo = flask.g.repo + _log.info('Viewing pull Request #%s repo: %s', requestid, repo.fullname) + if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') @@ -688,7 +690,7 @@ def merge_request_pull(repo, requestid, username=None, namespace=None): _log.info( 'called merge_request_pull for repo: %s - requestid: %s', - repo, requestid) + repo.fullname, requestid) if not repo.settings.get('pull_requests', True): flask.abort(404, 'No pull-requests found for this project') From 95596b224554788151eca90156d819bc4c7baeb8 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 17 2017 10:17:24 +0000 Subject: [PATCH 2/3] Get the basicConfig() up and running before we tweak it with the dict Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/__init__.py b/pagure/__init__.py index 520d0f2..e79228a 100644 --- a/pagure/__init__.py +++ b/pagure/__init__.py @@ -38,6 +38,8 @@ else: import pagure.exceptions # noqa: E402 +logging.basicConfig() + # Create the application. APP = MultiStaticFlask('pagure') From 5da6bba95d8eec3611f545f59135a26b369cb107 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 17 2017 10:17:24 +0000 Subject: [PATCH 3/3] Some more logging when merging a pull-request Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 0009237..62e9ecb 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -1353,6 +1353,7 @@ def merge_pull_request( if domerge: _log.info(' Writing down merge commit') head = new_repo.lookup_reference('HEAD').get_object() + _log.info(' Basing on: %s - %s', head.hex, repo_commit.oid.hex) user_obj = pagure.lib.get_user(session, username) author = pygit2.Signature( user_obj.fullname.encode('utf-8'), @@ -1367,6 +1368,7 @@ def merge_pull_request( _log.info(' New head: %s', commit) PagureRepo.push(ori_remote, refname) + _log.info(' Pushing to: %s to %s', refname, ori_remote) fork_obj.run_hook( head.hex, commit, 'refs/heads/%s' % request.branch, username)