diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py index ca0df9c..d64adff 100644 --- a/progit/lib/__init__.py +++ b/progit/lib/__init__.py @@ -388,7 +388,7 @@ def add_user_to_project(session, project, user): def add_pull_request_comment(session, request, commit, filename, row, - comment, user): + comment, user, requestfolder): ''' Add a comment to a pull-request. ''' user_obj = __get_user(session, user) @@ -404,6 +404,9 @@ def add_pull_request_comment(session, request, commit, filename, row, # Make sure we won't have SQLAlchemy error before we create the repo session.flush() + progit.lib.git.update_git( + request, repo=request.repo, repofolder=requestfolder) + return 'Comment added' @@ -495,7 +498,8 @@ def new_issue(session, repo, title, content, user, ticketfolder, def new_pull_request(session, repo_from, branch_from, - repo_to, branch_to, title, user, notify=True): + repo_to, branch_to, title, user, requestfolder, + notify=True): ''' Create a new pull request on the specified repo. ''' user_obj = __get_user(session, user) @@ -513,6 +517,9 @@ def new_pull_request(session, repo_from, branch_from, # Make sure we won't have SQLAlchemy error before we create the request session.flush() + progit.lib.git.update_git( + request, repo=request.repo, repofolder=requestfolder) + if notify: progit.lib.notify.notify_new_pull_request(request) @@ -894,7 +901,7 @@ def search_pull_requests( return output -def close_pull_request(session, request, user, merged=True): +def close_pull_request(session, request, user, requestfolder, merged=True): ''' Close the provided pull-request. ''' request.status = False @@ -906,6 +913,9 @@ def close_pull_request(session, request, user, merged=True): else: progit.lib.notify.notify_cancelled_pull_request(request, user) + progit.lib.git.update_git( + request, repo=request.repo, repofolder=requestfolder) + def get_issue_statuses(session): ''' Return the complete list of status an issue can have. diff --git a/progit/ui/fork.py b/progit/ui/fork.py index 2ddcc11..029eb73 100644 --- a/progit/ui/fork.py +++ b/progit/ui/fork.py @@ -280,6 +280,7 @@ def pull_request_add_comment(repo, requestid, commit, filename, row, row=row, comment=comment, user=flask.g.fas_user.username, + requestfolder=APP.config['REQUESTS_FOLDER'], ) SESSION.commit() flask.flash(message) @@ -433,7 +434,10 @@ def merge_request_pull(repo, requestid, username=None): flask.flash('Changes merged!') # Update status - progit.lib.close_pull_request(SESSION, request, flask.g.fas_user) + progit.lib.close_pull_request( + SESSION, request, flask.g.fas_user, + requestfolder=APP.config['REQUESTS_FOLDER'], + ) try: SESSION.commit() except SQLAlchemyError as err: @@ -475,7 +479,9 @@ def cancel_request_pull(repo, requestid, username=None): 'You are not allowed to cancel pull-request for this project') progit.lib.close_pull_request( - SESSION, request, flask.g.fas_user, merged=False) + SESSION, request, flask.g.fas_user, + requestfolder=APP.config['REQUESTS_FOLDER'], + merged=False) try: SESSION.commit() flask.flash('Request pull canceled!') @@ -626,6 +632,7 @@ def new_request_pull(repo, branch_to, branch_from, username=None): repo_from=repo, title=form.title.data, user=flask.g.fas_user.username, + requestfolder=APP.config['REQUESTS_FOLDER'], ) try: SESSION.commit()