Learn more about these different git repos.
Other Git URLs
I rebased https://pagure.io/rpkg/pull-request/199 locally and added a Merges: #199 line to commit message. When pushing to server, I got a traceback. The push itself was successful and the commit is pushed, but the PR was not merged by the hook.
Merges: #199
$ git push upstream master Counting objects: 4, done. Delta compression using up to 4 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 502 bytes | 0 bytes/s, done. Total 4 (delta 3), reused 0 (delta 0) remote: Sending to redis to log activity and send commit notification emails remote: Emitting a message to the fedmsg bus. remote: 2017-05-19 07:46:41,124 [DEBUG] fedmsg: Trying to connect to tcp://pagure01.fedoraproject.org:9941 remote: * Publishing information for 1 commits remote: Detailed log of new commits: remote: remote: remote: * commit 06705c8b02d67d351b7f9c08c3c4d683020ae0a4 remote: * Author: Jan Kaluza <jkaluza@redhat.com> remote: * Date: Fri Feb 17 12:31:30 2017 +0100 remote: * remote: * Do not hang indefinitely when lookaside cache server stops sending data remote: * remote: * Merges: #199 remote: 2017-05-19 07:46:43,692 [INFO] pagure.lib.git: Update the git repo: rpkg.git for: PullRequest(199, project:rpkg, user:jkaluza, title:Do not hang indefinitely when lookaside cache server stops sending data.) remote: Traceback (most recent call last): remote: File "./hooks/post-receive.pagure", line 207, in <module> remote: main(sys.argv[1:]) remote: File "./hooks/post-receive.pagure", line 203, in main remote: run_as_post_receive_hook() remote: File "./hooks/post-receive.pagure", line 195, in run_as_post_receive_hook remote: pagure.lib.git.get_revs_between(oldrev, newrev, abspath, refname)) remote: File "./hooks/post-receive.pagure", line 52, in generate_revision_change_log remote: pagure.APP.config.get('APP_URL')) remote: File "./hooks/post-receive.pagure", line 130, in fixes_relation remote: requestfolder=pagure.APP.config['REQUESTS_FOLDER'], remote: File "/usr/lib/python2.7/site-packages/pagure/lib/__init__.py", line 1099, in add_pull_request_comment remote: request, repo=request.project, repofolder=requestfolder) remote: File "/usr/lib/python2.7/site-packages/pagure/lib/git.py", line 216, in update_git remote: pagure.ensure_lock(repo) remote: File "/usr/lib/python2.7/site-packages/pagure/__init__.py", line 421, in ensure_lock remote: if not flask.g.repo_locked: remote: File "/usr/lib/python2.7/site-packages/werkzeug/local.py", line 338, in __getattr__ remote: return getattr(self._get_current_object(), name) remote: File "/usr/lib/python2.7/site-packages/werkzeug/local.py", line 297, in _get_current_object remote: return self.__local() remote: File "/usr/lib/python2.7/site-packages/flask/globals.py", line 27, in _lookup_app_object remote: raise RuntimeError('working outside of application context') remote: RuntimeError: working outside of application context remote: Hook ./hooks/post-receive.pagure failed with error code 1 To ssh://pagure.io/rpkg.git 913b547..06705c8 master -> master
Ok so this is an interesting side-effect of the new locking mechanism introduced in 2.15 which we did not foresee.
This is being re-architectured so hopefully 2.16 will fix this.
+1
I rely on this plugin almost daily. It is how I merge PRs
I believe this has been fixed.
@lsedlar @mikem can you confirm it works for you?
Metadata Update from @pingou: - Issue tagged with: bug
I just merged https://pagure.io/pagure/pull-request/2340 using the Merges keyword and it worked fine.
Merges
So I'm going to close this ticket as fixed, feel free to re-open if it is not.
Metadata Update from @pingou: - Issue close_status updated to: Fixed - Issue status updated to: Closed (was: Open)
I don't think I've seen this in a while actually
Log in to comment on this ticket.