You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

pull.go 41 kB

Issue due date (#3794) * Started adding deadline to ui * Implemented basic issue due date managing * Improved UI for due date managing * Added at least write access to the repo in order to modify issue due dates * Ui improvements * Added issue comments creation when adding/modifying/removing a due date * Show due date in issue list * Added api support for issue due dates * Fixed lint suggestions * Added deadline to sdk * Updated css * Added support for adding/modifiying deadlines for pull requests via api * Fixed comments not created when updating or removing a deadline * update sdk (will do properly once go-gitea/go-sdk#103 is merged) * enhanced updateIssueDeadline * Removed unnessecary Issue.DeadlineString * UI improvements * Small improvments to comment creation + ui & validation improvements * Check if an issue is overdue is now a seperate function * Updated go-sdk with govendor as it was merged * Simplified isOverdue method * removed unessecary deadline to 0 set * Update swagger definitions * Added missing return * Added an explanary comment * Improved updateIssueDeadline method so it'll only update `deadline_unix` * Small changes and improvements * no need to explicitly load the issue when updating a deadline, just use whats already there * small optimisations * Added check if a deadline was modified before updating it * Moved comment creating logic into its own function * Code cleanup for creating deadline comment * locale improvement * When modifying a deadline, the old deadline is saved with the comment * small improvments to xorm session handling when updating an issue deadline + style nitpicks * style nitpicks * Moved checking for if the user has write acces to middleware
7 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
9 years ago
9 years ago
9 years ago
9 years ago
10 years ago
10 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
Pull request review/approval and comment on code (#3748) * Initial ui components for pull request review * Add Review Add IssueComment types Signed-off-by: Jonas Franz <info@jonasfranz.software> (cherry picked from commit 2b4daab) Signed-off-by: Jonas Franz <info@jonasfranz.software> * Replace ReviewComment with Content Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add load functions Add ReviewID to findComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add create review comment implementation Add migration for review Other small changes Signed-off-by: Jonas Franz <info@jonasfranz.software> * Simplified create and find functions for review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved "Pending" to first position Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add GetCurrentReview to simplify fetching current review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Preview for listing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Move new comment form to its own file Signed-off-by: Jonas Franz <info@jonasfranz.software> * Implement Review form Show Review comments on comment stream Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for single comments Showing buttons in context Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add pending tag to pending review comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add unit tests for Review Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fetch all review ids at once Add unit tests Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improved comment rendering in "Files" view by adding Comments to DiffLine Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for invalidating comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Switched back to code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Moved review migration from v64 to v65 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Rebuild css Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Improve translations Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix unit tests by updating fixtures and updating outdated test Signed-off-by: Jonas Franz <info@jonasfranz.software> * Comments will be shown at the right place now Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for deleting CodeComments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems caused by files in subdirectories Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for showing code comments of reviews in conversation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for "Show/Hide outdated" Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update code.gitea.io/git Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add support for new webhooks Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update comparison Signed-off-by: Jonas Franz <info@jonasfranz.software> * Resolve conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Minor UI improvements * update code.gitea.io/git * Fix ui bug reported by @lunny causing wrong position of add button Add functionality to "Cancel" button Add scale effects to add button Hide "Cancel" button for existing comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Prepare solving conflicts Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show add button only if no comments already exist for the line Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add missing vendor files Signed-off-by: Jonas Franz <info@jonasfranz.software> * Check if reviewer is nil Signed-off-by: Jonas Franz <info@jonasfranz.software> * Show forms only to users who are logged in Signed-off-by: Jonas Franz <info@jonasfranz.software> * Revert "Show forms only to users who are logged in" This reverts commit c083682 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Save patch in comment Render patch for code comments Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add link to comment in code Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add reply form to comment list Show forms only to signed in users Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add 'Reply' as translatable Add CODE_COMMENT_LINES setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * gofmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix problems introduced by checking for singed in user Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add v70 Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update generated stylesheet Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix preview Beginn with new review comment patch system Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add new algo to generate diff for line range Remove old algo used for cutting big diffs (it was very buggy) * Add documentation and example for CutDiffAroundLine * Fix example of CutDiffAroundLine * Fix some comment UI rendering bugs * Add code comment edit mode * Send notifications / actions to users until review gets published Fix diff generation bug Fix wrong hashtag * Fix vet errors * Send notifications also for single comments * Fix some notification bugs, fix link * Fix: add comment icon is only shown on code lines * Add lint comment * Add unit tests for git diff * Add more error messages * Regenerated css Signed-off-by: Jonas Franz <info@jonasfranz.software> * fmt Signed-off-by: Jonas Franz <info@jonasfranz.software> * Regenerated CSS with latest less version Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix test by updating comment type to new ID Signed-off-by: Jonas Franz <info@jonasfranz.software> * Introducing CodeComments as type for map[string]map[int64][]*Comment Other minor code improvements Signed-off-by: Jonas Franz <info@jonasfranz.software> * Fix data-tab issues Signed-off-by: Jonas Franz <info@jonasfranz.software> * Remove unnecessary change Signed-off-by: Jonas Franz <info@jonasfranz.software> * refactored checkForInvalidation Signed-off-by: Jonas Franz <info@jonasfranz.software> * Append comments instead of setting Signed-off-by: Jonas Franz <info@jonasfranz.software> * Use HeadRepo instead of BaseRepo Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update migration Signed-off-by: Jonas Franz <info@jonasfranz.de> * Regenerated CSS Signed-off-by: Jonas Franz <info@jonasfranz.software> * Add copyright Signed-off-by: Jonas Franz <info@jonasfranz.software> * Update index.css Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347
  1. // Copyright 2015 The Gogs Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package models
  5. import (
  6. "fmt"
  7. "io/ioutil"
  8. "os"
  9. "path"
  10. "path/filepath"
  11. "strconv"
  12. "strings"
  13. "time"
  14. "code.gitea.io/git"
  15. "code.gitea.io/gitea/modules/base"
  16. "code.gitea.io/gitea/modules/cache"
  17. "code.gitea.io/gitea/modules/log"
  18. "code.gitea.io/gitea/modules/process"
  19. "code.gitea.io/gitea/modules/setting"
  20. "code.gitea.io/gitea/modules/sync"
  21. "code.gitea.io/gitea/modules/util"
  22. api "code.gitea.io/sdk/gitea"
  23. "github.com/Unknwon/com"
  24. "github.com/go-xorm/xorm"
  25. )
  26. var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
  27. // PullRequestType defines pull request type
  28. type PullRequestType int
  29. // Enumerate all the pull request types
  30. const (
  31. PullRequestGitea PullRequestType = iota
  32. PullRequestGit
  33. )
  34. // PullRequestStatus defines pull request status
  35. type PullRequestStatus int
  36. // Enumerate all the pull request status
  37. const (
  38. PullRequestStatusConflict PullRequestStatus = iota
  39. PullRequestStatusChecking
  40. PullRequestStatusMergeable
  41. PullRequestStatusManuallyMerged
  42. )
  43. // PullRequest represents relation between pull request and repositories.
  44. type PullRequest struct {
  45. ID int64 `xorm:"pk autoincr"`
  46. Type PullRequestType
  47. Status PullRequestStatus
  48. IssueID int64 `xorm:"INDEX"`
  49. Issue *Issue `xorm:"-"`
  50. Index int64
  51. HeadRepoID int64 `xorm:"INDEX"`
  52. HeadRepo *Repository `xorm:"-"`
  53. BaseRepoID int64 `xorm:"INDEX"`
  54. BaseRepo *Repository `xorm:"-"`
  55. HeadUserName string
  56. HeadBranch string
  57. BaseBranch string
  58. ProtectedBranch *ProtectedBranch `xorm:"-"`
  59. MergeBase string `xorm:"VARCHAR(40)"`
  60. HasMerged bool `xorm:"INDEX"`
  61. MergedCommitID string `xorm:"VARCHAR(40)"`
  62. MergerID int64 `xorm:"INDEX"`
  63. Merger *User `xorm:"-"`
  64. MergedUnix util.TimeStamp `xorm:"updated INDEX"`
  65. }
  66. // Note: don't try to get Issue because will end up recursive querying.
  67. func (pr *PullRequest) loadAttributes(e Engine) (err error) {
  68. if pr.HasMerged && pr.Merger == nil {
  69. pr.Merger, err = getUserByID(e, pr.MergerID)
  70. if IsErrUserNotExist(err) {
  71. pr.MergerID = -1
  72. pr.Merger = NewGhostUser()
  73. } else if err != nil {
  74. return fmt.Errorf("getUserByID [%d]: %v", pr.MergerID, err)
  75. }
  76. }
  77. return nil
  78. }
  79. // LoadAttributes loads pull request attributes from database
  80. func (pr *PullRequest) LoadAttributes() error {
  81. return pr.loadAttributes(x)
  82. }
  83. // LoadIssue loads issue information from database
  84. func (pr *PullRequest) LoadIssue() (err error) {
  85. return pr.loadIssue(x)
  86. }
  87. func (pr *PullRequest) loadIssue(e Engine) (err error) {
  88. if pr.Issue != nil {
  89. return nil
  90. }
  91. pr.Issue, err = getIssueByID(e, pr.IssueID)
  92. return err
  93. }
  94. // LoadProtectedBranch loads the protected branch of the base branch
  95. func (pr *PullRequest) LoadProtectedBranch() (err error) {
  96. pr.ProtectedBranch, err = GetProtectedBranchBy(pr.BaseRepo.ID, pr.BaseBranch)
  97. return
  98. }
  99. // GetDefaultMergeMessage returns default message used when merging pull request
  100. func (pr *PullRequest) GetDefaultMergeMessage() string {
  101. if pr.HeadRepo == nil {
  102. var err error
  103. pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
  104. if err != nil {
  105. log.Error(4, "GetRepositoryById[%d]: %v", pr.HeadRepoID, err)
  106. return ""
  107. }
  108. }
  109. return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)
  110. }
  111. // GetDefaultSquashMessage returns default message used when squash and merging pull request
  112. func (pr *PullRequest) GetDefaultSquashMessage() string {
  113. if err := pr.LoadIssue(); err != nil {
  114. log.Error(4, "LoadIssue: %v", err)
  115. return ""
  116. }
  117. return fmt.Sprintf("%s (#%d)", pr.Issue.Title, pr.Issue.Index)
  118. }
  119. // GetGitRefName returns git ref for hidden pull request branch
  120. func (pr *PullRequest) GetGitRefName() string {
  121. return fmt.Sprintf("refs/pull/%d/head", pr.Index)
  122. }
  123. // APIFormat assumes following fields have been assigned with valid values:
  124. // Required - Issue
  125. // Optional - Merger
  126. func (pr *PullRequest) APIFormat() *api.PullRequest {
  127. var (
  128. baseBranch *Branch
  129. headBranch *Branch
  130. baseCommit *git.Commit
  131. headCommit *git.Commit
  132. err error
  133. )
  134. apiIssue := pr.Issue.APIFormat()
  135. if pr.BaseRepo == nil {
  136. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  137. if err != nil {
  138. log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
  139. return nil
  140. }
  141. }
  142. if pr.HeadRepo == nil {
  143. pr.HeadRepo, err = GetRepositoryByID(pr.HeadRepoID)
  144. if err != nil {
  145. log.Error(log.ERROR, "GetRepositoryById[%d]: %v", pr.ID, err)
  146. return nil
  147. }
  148. }
  149. if baseBranch, err = pr.BaseRepo.GetBranch(pr.BaseBranch); err != nil {
  150. return nil
  151. }
  152. if baseCommit, err = baseBranch.GetCommit(); err != nil {
  153. return nil
  154. }
  155. if headBranch, err = pr.HeadRepo.GetBranch(pr.HeadBranch); err != nil {
  156. return nil
  157. }
  158. if headCommit, err = headBranch.GetCommit(); err != nil {
  159. return nil
  160. }
  161. apiBaseBranchInfo := &api.PRBranchInfo{
  162. Name: pr.BaseBranch,
  163. Ref: pr.BaseBranch,
  164. Sha: baseCommit.ID.String(),
  165. RepoID: pr.BaseRepoID,
  166. Repository: pr.BaseRepo.APIFormat(AccessModeNone),
  167. }
  168. apiHeadBranchInfo := &api.PRBranchInfo{
  169. Name: pr.HeadBranch,
  170. Ref: pr.HeadBranch,
  171. Sha: headCommit.ID.String(),
  172. RepoID: pr.HeadRepoID,
  173. Repository: pr.HeadRepo.APIFormat(AccessModeNone),
  174. }
  175. apiPullRequest := &api.PullRequest{
  176. ID: pr.ID,
  177. Index: pr.Index,
  178. Poster: apiIssue.Poster,
  179. Title: apiIssue.Title,
  180. Body: apiIssue.Body,
  181. Labels: apiIssue.Labels,
  182. Milestone: apiIssue.Milestone,
  183. Assignee: apiIssue.Assignee,
  184. Assignees: apiIssue.Assignees,
  185. State: apiIssue.State,
  186. Comments: apiIssue.Comments,
  187. HTMLURL: pr.Issue.HTMLURL(),
  188. DiffURL: pr.Issue.DiffURL(),
  189. PatchURL: pr.Issue.PatchURL(),
  190. HasMerged: pr.HasMerged,
  191. Base: apiBaseBranchInfo,
  192. Head: apiHeadBranchInfo,
  193. MergeBase: pr.MergeBase,
  194. Deadline: apiIssue.Deadline,
  195. Created: pr.Issue.CreatedUnix.AsTimePtr(),
  196. Updated: pr.Issue.UpdatedUnix.AsTimePtr(),
  197. }
  198. if pr.Status != PullRequestStatusChecking {
  199. mergeable := pr.Status != PullRequestStatusConflict && !pr.IsWorkInProgress()
  200. apiPullRequest.Mergeable = mergeable
  201. }
  202. if pr.HasMerged {
  203. apiPullRequest.Merged = pr.MergedUnix.AsTimePtr()
  204. apiPullRequest.MergedCommitID = &pr.MergedCommitID
  205. apiPullRequest.MergedBy = pr.Merger.APIFormat()
  206. }
  207. return apiPullRequest
  208. }
  209. func (pr *PullRequest) getHeadRepo(e Engine) (err error) {
  210. pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
  211. if err != nil && !IsErrRepoNotExist(err) {
  212. return fmt.Errorf("getRepositoryByID(head): %v", err)
  213. }
  214. return nil
  215. }
  216. // GetHeadRepo loads the head repository
  217. func (pr *PullRequest) GetHeadRepo() error {
  218. return pr.getHeadRepo(x)
  219. }
  220. // GetBaseRepo loads the target repository
  221. func (pr *PullRequest) GetBaseRepo() (err error) {
  222. if pr.BaseRepo != nil {
  223. return nil
  224. }
  225. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  226. if err != nil {
  227. return fmt.Errorf("GetRepositoryByID(base): %v", err)
  228. }
  229. return nil
  230. }
  231. // IsChecking returns true if this pull request is still checking conflict.
  232. func (pr *PullRequest) IsChecking() bool {
  233. return pr.Status == PullRequestStatusChecking
  234. }
  235. // CanAutoMerge returns true if this pull request can be merged automatically.
  236. func (pr *PullRequest) CanAutoMerge() bool {
  237. return pr.Status == PullRequestStatusMergeable
  238. }
  239. // MergeStyle represents the approach to merge commits into base branch.
  240. type MergeStyle string
  241. const (
  242. // MergeStyleMerge create merge commit
  243. MergeStyleMerge MergeStyle = "merge"
  244. // MergeStyleRebase rebase before merging
  245. MergeStyleRebase MergeStyle = "rebase"
  246. // MergeStyleSquash squash commits into single commit before merging
  247. MergeStyleSquash MergeStyle = "squash"
  248. )
  249. // CheckUserAllowedToMerge checks whether the user is allowed to merge
  250. func (pr *PullRequest) CheckUserAllowedToMerge(doer *User) (err error) {
  251. if doer == nil {
  252. return ErrNotAllowedToMerge{
  253. "Not signed in",
  254. }
  255. }
  256. if pr.BaseRepo == nil {
  257. if err = pr.GetBaseRepo(); err != nil {
  258. return fmt.Errorf("GetBaseRepo: %v", err)
  259. }
  260. }
  261. if protected, err := pr.BaseRepo.IsProtectedBranchForMerging(pr, pr.BaseBranch, doer); err != nil {
  262. return fmt.Errorf("IsProtectedBranch: %v", err)
  263. } else if protected {
  264. return ErrNotAllowedToMerge{
  265. "The branch is protected",
  266. }
  267. }
  268. return nil
  269. }
  270. // Merge merges pull request to base repository.
  271. // FIXME: add repoWorkingPull make sure two merges does not happen at same time.
  272. func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle, message string) (err error) {
  273. if err = pr.GetHeadRepo(); err != nil {
  274. return fmt.Errorf("GetHeadRepo: %v", err)
  275. } else if err = pr.GetBaseRepo(); err != nil {
  276. return fmt.Errorf("GetBaseRepo: %v", err)
  277. }
  278. prUnit, err := pr.BaseRepo.GetUnit(UnitTypePullRequests)
  279. if err != nil {
  280. return err
  281. }
  282. prConfig := prUnit.PullRequestsConfig()
  283. if err := pr.CheckUserAllowedToMerge(doer); err != nil {
  284. return fmt.Errorf("CheckUserAllowedToMerge: %v", err)
  285. }
  286. // Check if merge style is correct and allowed
  287. if !prConfig.IsMergeStyleAllowed(mergeStyle) {
  288. return ErrInvalidMergeStyle{pr.BaseRepo.ID, mergeStyle}
  289. }
  290. defer func() {
  291. go HookQueue.Add(pr.BaseRepo.ID)
  292. go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false)
  293. }()
  294. headRepoPath := RepoPath(pr.HeadUserName, pr.HeadRepo.Name)
  295. // Clone base repo.
  296. tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git")
  297. if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil {
  298. return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err)
  299. }
  300. defer os.RemoveAll(path.Dir(tmpBasePath))
  301. var stderr string
  302. if _, stderr, err = process.GetManager().ExecTimeout(5*time.Minute,
  303. fmt.Sprintf("PullRequest.Merge (git clone): %s", tmpBasePath),
  304. "git", "clone", baseGitRepo.Path, tmpBasePath); err != nil {
  305. return fmt.Errorf("git clone: %s", stderr)
  306. }
  307. // Check out base branch.
  308. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  309. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  310. "git", "checkout", pr.BaseBranch); err != nil {
  311. return fmt.Errorf("git checkout: %s", stderr)
  312. }
  313. // Add head repo remote.
  314. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  315. fmt.Sprintf("PullRequest.Merge (git remote add): %s", tmpBasePath),
  316. "git", "remote", "add", "head_repo", headRepoPath); err != nil {
  317. return fmt.Errorf("git remote add [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  318. }
  319. // Merge commits.
  320. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  321. fmt.Sprintf("PullRequest.Merge (git fetch): %s", tmpBasePath),
  322. "git", "fetch", "head_repo"); err != nil {
  323. return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  324. }
  325. switch mergeStyle {
  326. case MergeStyleMerge:
  327. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  328. fmt.Sprintf("PullRequest.Merge (git merge --no-ff --no-commit): %s", tmpBasePath),
  329. "git", "merge", "--no-ff", "--no-commit", "head_repo/"+pr.HeadBranch); err != nil {
  330. return fmt.Errorf("git merge --no-ff --no-commit [%s]: %v - %s", tmpBasePath, err, stderr)
  331. }
  332. sig := doer.NewGitSig()
  333. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  334. fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath),
  335. "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
  336. "-m", message); err != nil {
  337. return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
  338. }
  339. case MergeStyleRebase:
  340. // Checkout head branch
  341. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  342. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  343. "git", "checkout", "-b", "head_repo_"+pr.HeadBranch, "head_repo/"+pr.HeadBranch); err != nil {
  344. return fmt.Errorf("git checkout: %s", stderr)
  345. }
  346. // Rebase before merging
  347. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  348. fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
  349. "git", "rebase", "-q", pr.BaseBranch); err != nil {
  350. return fmt.Errorf("git rebase [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  351. }
  352. // Checkout base branch again
  353. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  354. fmt.Sprintf("PullRequest.Merge (git checkout): %s", tmpBasePath),
  355. "git", "checkout", pr.BaseBranch); err != nil {
  356. return fmt.Errorf("git checkout: %s", stderr)
  357. }
  358. // Merge fast forward
  359. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  360. fmt.Sprintf("PullRequest.Merge (git rebase): %s", tmpBasePath),
  361. "git", "merge", "--ff-only", "-q", "head_repo_"+pr.HeadBranch); err != nil {
  362. return fmt.Errorf("git merge --ff-only [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  363. }
  364. case MergeStyleSquash:
  365. // Merge with squash
  366. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  367. fmt.Sprintf("PullRequest.Merge (git squash): %s", tmpBasePath),
  368. "git", "merge", "-q", "--squash", "head_repo/"+pr.HeadBranch); err != nil {
  369. return fmt.Errorf("git merge --squash [%s -> %s]: %s", headRepoPath, tmpBasePath, stderr)
  370. }
  371. sig := pr.Issue.Poster.NewGitSig()
  372. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  373. fmt.Sprintf("PullRequest.Merge (git squash): %s", tmpBasePath),
  374. "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email),
  375. "-m", message); err != nil {
  376. return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr)
  377. }
  378. default:
  379. return ErrInvalidMergeStyle{pr.BaseRepo.ID, mergeStyle}
  380. }
  381. // Push back to upstream.
  382. if _, stderr, err = process.GetManager().ExecDir(-1, tmpBasePath,
  383. fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
  384. "git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
  385. return fmt.Errorf("git push: %s", stderr)
  386. }
  387. pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
  388. if err != nil {
  389. return fmt.Errorf("GetBranchCommit: %v", err)
  390. }
  391. pr.MergedUnix = util.TimeStampNow()
  392. pr.Merger = doer
  393. pr.MergerID = doer.ID
  394. if err = pr.setMerged(); err != nil {
  395. log.Error(4, "setMerged [%d]: %v", pr.ID, err)
  396. }
  397. if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
  398. log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
  399. }
  400. // Reset cached commit count
  401. cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
  402. // Reload pull request information.
  403. if err = pr.LoadAttributes(); err != nil {
  404. log.Error(4, "LoadAttributes: %v", err)
  405. return nil
  406. }
  407. mode, _ := AccessLevel(doer, pr.Issue.Repo)
  408. if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
  409. Action: api.HookIssueClosed,
  410. Index: pr.Index,
  411. PullRequest: pr.APIFormat(),
  412. Repository: pr.Issue.Repo.APIFormat(mode),
  413. Sender: doer.APIFormat(),
  414. }); err != nil {
  415. log.Error(4, "PrepareWebhooks: %v", err)
  416. } else {
  417. go HookQueue.Add(pr.Issue.Repo.ID)
  418. }
  419. l, err := baseGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
  420. if err != nil {
  421. log.Error(4, "CommitsBetweenIDs: %v", err)
  422. return nil
  423. }
  424. // It is possible that head branch is not fully sync with base branch for merge commits,
  425. // so we need to get latest head commit and append merge commit manually
  426. // to avoid strange diff commits produced.
  427. mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
  428. if err != nil {
  429. log.Error(4, "GetBranchCommit: %v", err)
  430. return nil
  431. }
  432. if mergeStyle == MergeStyleMerge {
  433. l.PushFront(mergeCommit)
  434. }
  435. p := &api.PushPayload{
  436. Ref: git.BranchPrefix + pr.BaseBranch,
  437. Before: pr.MergeBase,
  438. After: mergeCommit.ID.String(),
  439. CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
  440. Commits: ListToPushCommits(l).ToAPIPayloadCommits(pr.BaseRepo.HTMLURL()),
  441. Repo: pr.BaseRepo.APIFormat(mode),
  442. Pusher: pr.HeadRepo.MustOwner().APIFormat(),
  443. Sender: doer.APIFormat(),
  444. }
  445. if err = PrepareWebhooks(pr.BaseRepo, HookEventPush, p); err != nil {
  446. log.Error(4, "PrepareWebhooks: %v", err)
  447. } else {
  448. go HookQueue.Add(pr.BaseRepo.ID)
  449. }
  450. return nil
  451. }
  452. // setMerged sets a pull request to merged and closes the corresponding issue
  453. func (pr *PullRequest) setMerged() (err error) {
  454. if pr.HasMerged {
  455. return fmt.Errorf("PullRequest[%d] already merged", pr.Index)
  456. }
  457. if pr.MergedCommitID == "" || pr.MergedUnix == 0 || pr.Merger == nil {
  458. return fmt.Errorf("Unable to merge PullRequest[%d], some required fields are empty", pr.Index)
  459. }
  460. pr.HasMerged = true
  461. sess := x.NewSession()
  462. defer sess.Close()
  463. if err = sess.Begin(); err != nil {
  464. return err
  465. }
  466. if err = pr.loadIssue(sess); err != nil {
  467. return err
  468. }
  469. if err = pr.Issue.loadRepo(sess); err != nil {
  470. return err
  471. }
  472. if err = pr.Issue.Repo.getOwner(sess); err != nil {
  473. return err
  474. }
  475. if err = pr.Issue.changeStatus(sess, pr.Merger, pr.Issue.Repo, true); err != nil {
  476. return fmt.Errorf("Issue.changeStatus: %v", err)
  477. }
  478. if _, err = sess.ID(pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
  479. return fmt.Errorf("update pull request: %v", err)
  480. }
  481. if err = sess.Commit(); err != nil {
  482. return fmt.Errorf("Commit: %v", err)
  483. }
  484. return nil
  485. }
  486. // manuallyMerged checks if a pull request got manually merged
  487. // When a pull request got manually merged mark the pull request as merged
  488. func (pr *PullRequest) manuallyMerged() bool {
  489. commit, err := pr.getMergeCommit()
  490. if err != nil {
  491. log.Error(4, "PullRequest[%d].getMergeCommit: %v", pr.ID, err)
  492. return false
  493. }
  494. if commit != nil {
  495. pr.MergedCommitID = commit.ID.String()
  496. pr.MergedUnix = util.TimeStamp(commit.Author.When.Unix())
  497. pr.Status = PullRequestStatusManuallyMerged
  498. merger, _ := GetUserByEmail(commit.Author.Email)
  499. // When the commit author is unknown set the BaseRepo owner as merger
  500. if merger == nil {
  501. if pr.BaseRepo.Owner == nil {
  502. if err = pr.BaseRepo.getOwner(x); err != nil {
  503. log.Error(4, "BaseRepo.getOwner[%d]: %v", pr.ID, err)
  504. return false
  505. }
  506. }
  507. merger = pr.BaseRepo.Owner
  508. }
  509. pr.Merger = merger
  510. pr.MergerID = merger.ID
  511. if err = pr.setMerged(); err != nil {
  512. log.Error(4, "PullRequest[%d].setMerged : %v", pr.ID, err)
  513. return false
  514. }
  515. log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String())
  516. return true
  517. }
  518. return false
  519. }
  520. // getMergeCommit checks if a pull request got merged
  521. // Returns the git.Commit of the pull request if merged
  522. func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
  523. if pr.BaseRepo == nil {
  524. var err error
  525. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  526. if err != nil {
  527. return nil, fmt.Errorf("GetRepositoryByID: %v", err)
  528. }
  529. }
  530. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  531. defer os.Remove(indexTmpPath)
  532. headFile := pr.GetGitRefName()
  533. // Check if a pull request is merged into BaseBranch
  534. _, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git merge-base --is-ancestor): %d", pr.BaseRepo.ID),
  535. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  536. "git", "merge-base", "--is-ancestor", headFile, pr.BaseBranch)
  537. if err != nil {
  538. // Errors are signaled by a non-zero status that is not 1
  539. if strings.Contains(err.Error(), "exit status 1") {
  540. return nil, nil
  541. }
  542. return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err)
  543. }
  544. commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
  545. if err != nil {
  546. return nil, fmt.Errorf("ReadFile(%s): %v", headFile, err)
  547. }
  548. commitID := string(commitIDBytes)
  549. if len(commitID) < 40 {
  550. return nil, fmt.Errorf(`ReadFile(%s): invalid commit-ID "%s"`, headFile, commitID)
  551. }
  552. cmd := commitID[:40] + ".." + pr.BaseBranch
  553. // Get the commit from BaseBranch where the pull request got merged
  554. mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID),
  555. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  556. "git", "rev-list", "--ancestry-path", "--merges", "--reverse", cmd)
  557. if err != nil {
  558. return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err)
  559. } else if len(mergeCommit) < 40 {
  560. // PR was fast-forwarded, so just use last commit of PR
  561. mergeCommit = commitID[:40]
  562. }
  563. gitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
  564. if err != nil {
  565. return nil, fmt.Errorf("OpenRepository: %v", err)
  566. }
  567. commit, err := gitRepo.GetCommit(mergeCommit[:40])
  568. if err != nil {
  569. return nil, fmt.Errorf("GetCommit: %v", err)
  570. }
  571. return commit, nil
  572. }
  573. // patchConflicts is a list of conflict description from Git.
  574. var patchConflicts = []string{
  575. "patch does not apply",
  576. "already exists in working directory",
  577. "unrecognized input",
  578. "error:",
  579. }
  580. // testPatch checks if patch can be merged to base repository without conflict.
  581. func (pr *PullRequest) testPatch() (err error) {
  582. if pr.BaseRepo == nil {
  583. pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID)
  584. if err != nil {
  585. return fmt.Errorf("GetRepositoryByID: %v", err)
  586. }
  587. }
  588. patchPath, err := pr.BaseRepo.PatchPath(pr.Index)
  589. if err != nil {
  590. return fmt.Errorf("BaseRepo.PatchPath: %v", err)
  591. }
  592. // Fast fail if patch does not exist, this assumes data is corrupted.
  593. if !com.IsFile(patchPath) {
  594. log.Trace("PullRequest[%d].testPatch: ignored corrupted data", pr.ID)
  595. return nil
  596. }
  597. repoWorkingPool.CheckIn(com.ToStr(pr.BaseRepoID))
  598. defer repoWorkingPool.CheckOut(com.ToStr(pr.BaseRepoID))
  599. log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
  600. pr.Status = PullRequestStatusChecking
  601. indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
  602. defer os.Remove(indexTmpPath)
  603. var stderr string
  604. _, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git read-tree): %d", pr.BaseRepo.ID),
  605. []string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath},
  606. "git", "read-tree", pr.BaseBranch)
  607. if err != nil {
  608. return fmt.Errorf("git read-tree --index-output=%s %s: %v - %s", indexTmpPath, pr.BaseBranch, err, stderr)
  609. }
  610. prUnit, err := pr.BaseRepo.GetUnit(UnitTypePullRequests)
  611. if err != nil {
  612. return err
  613. }
  614. prConfig := prUnit.PullRequestsConfig()
  615. args := []string{"apply", "--check", "--cached"}
  616. if prConfig.IgnoreWhitespaceConflicts {
  617. args = append(args, "--ignore-whitespace")
  618. }
  619. args = append(args, patchPath)
  620. _, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
  621. []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
  622. "git", args...)
  623. if err != nil {
  624. for i := range patchConflicts {
  625. if strings.Contains(stderr, patchConflicts[i]) {
  626. log.Trace("PullRequest[%d].testPatch (apply): has conflict", pr.ID)
  627. fmt.Println(stderr)
  628. pr.Status = PullRequestStatusConflict
  629. return nil
  630. }
  631. }
  632. return fmt.Errorf("git apply --check: %v - %s", err, stderr)
  633. }
  634. return nil
  635. }
  636. // NewPullRequest creates new pull request with labels for repository.
  637. func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []string, pr *PullRequest, patch []byte, assigneeIDs []int64) (err error) {
  638. sess := x.NewSession()
  639. defer sess.Close()
  640. if err = sess.Begin(); err != nil {
  641. return err
  642. }
  643. if err = newIssue(sess, pull.Poster, NewIssueOptions{
  644. Repo: repo,
  645. Issue: pull,
  646. LabelIDs: labelIDs,
  647. Attachments: uuids,
  648. IsPull: true,
  649. AssigneeIDs: assigneeIDs,
  650. }); err != nil {
  651. if IsErrUserDoesNotHaveAccessToRepo(err) {
  652. return err
  653. }
  654. return fmt.Errorf("newIssue: %v", err)
  655. }
  656. pr.Index = pull.Index
  657. if err = repo.SavePatch(pr.Index, patch); err != nil {
  658. return fmt.Errorf("SavePatch: %v", err)
  659. }
  660. pr.BaseRepo = repo
  661. if err = pr.testPatch(); err != nil {
  662. return fmt.Errorf("testPatch: %v", err)
  663. }
  664. // No conflict appears after test means mergeable.
  665. if pr.Status == PullRequestStatusChecking {
  666. pr.Status = PullRequestStatusMergeable
  667. }
  668. pr.IssueID = pull.ID
  669. if _, err = sess.Insert(pr); err != nil {
  670. return fmt.Errorf("insert pull repo: %v", err)
  671. }
  672. if err = sess.Commit(); err != nil {
  673. return fmt.Errorf("Commit: %v", err)
  674. }
  675. UpdateIssueIndexer(pull.ID)
  676. if err = NotifyWatchers(&Action{
  677. ActUserID: pull.Poster.ID,
  678. ActUser: pull.Poster,
  679. OpType: ActionCreatePullRequest,
  680. Content: fmt.Sprintf("%d|%s", pull.Index, pull.Title),
  681. RepoID: repo.ID,
  682. Repo: repo,
  683. IsPrivate: repo.IsPrivate,
  684. }); err != nil {
  685. log.Error(4, "NotifyWatchers: %v", err)
  686. } else if err = pull.MailParticipants(); err != nil {
  687. log.Error(4, "MailParticipants: %v", err)
  688. }
  689. pr.Issue = pull
  690. pull.PullRequest = pr
  691. mode, _ := AccessLevel(pull.Poster, repo)
  692. if err = PrepareWebhooks(repo, HookEventPullRequest, &api.PullRequestPayload{
  693. Action: api.HookIssueOpened,
  694. Index: pull.Index,
  695. PullRequest: pr.APIFormat(),
  696. Repository: repo.APIFormat(mode),
  697. Sender: pull.Poster.APIFormat(),
  698. }); err != nil {
  699. log.Error(4, "PrepareWebhooks: %v", err)
  700. } else {
  701. go HookQueue.Add(repo.ID)
  702. }
  703. return nil
  704. }
  705. // PullRequestsOptions holds the options for PRs
  706. type PullRequestsOptions struct {
  707. Page int
  708. State string
  709. SortType string
  710. Labels []string
  711. MilestoneID int64
  712. }
  713. func listPullRequestStatement(baseRepoID int64, opts *PullRequestsOptions) (*xorm.Session, error) {
  714. sess := x.Where("pull_request.base_repo_id=?", baseRepoID)
  715. sess.Join("INNER", "issue", "pull_request.issue_id = issue.id")
  716. switch opts.State {
  717. case "closed", "open":
  718. sess.And("issue.is_closed=?", opts.State == "closed")
  719. }
  720. if labelIDs, err := base.StringsToInt64s(opts.Labels); err != nil {
  721. return nil, err
  722. } else if len(labelIDs) > 0 {
  723. sess.Join("INNER", "issue_label", "issue.id = issue_label.issue_id").
  724. In("issue_label.label_id", labelIDs)
  725. }
  726. if opts.MilestoneID > 0 {
  727. sess.And("issue.milestone_id=?", opts.MilestoneID)
  728. }
  729. return sess, nil
  730. }
  731. // PullRequests returns all pull requests for a base Repo by the given conditions
  732. func PullRequests(baseRepoID int64, opts *PullRequestsOptions) ([]*PullRequest, int64, error) {
  733. if opts.Page <= 0 {
  734. opts.Page = 1
  735. }
  736. countSession, err := listPullRequestStatement(baseRepoID, opts)
  737. if err != nil {
  738. log.Error(4, "listPullRequestStatement", err)
  739. return nil, 0, err
  740. }
  741. maxResults, err := countSession.Count(new(PullRequest))
  742. if err != nil {
  743. log.Error(4, "Count PRs", err)
  744. return nil, maxResults, err
  745. }
  746. prs := make([]*PullRequest, 0, ItemsPerPage)
  747. findSession, err := listPullRequestStatement(baseRepoID, opts)
  748. sortIssuesSession(findSession, opts.SortType)
  749. if err != nil {
  750. log.Error(4, "listPullRequestStatement", err)
  751. return nil, maxResults, err
  752. }
  753. findSession.Limit(ItemsPerPage, (opts.Page-1)*ItemsPerPage)
  754. return prs, maxResults, findSession.Find(&prs)
  755. }
  756. // GetUnmergedPullRequest returns a pull request that is open and has not been merged
  757. // by given head/base and repo/branch.
  758. func GetUnmergedPullRequest(headRepoID, baseRepoID int64, headBranch, baseBranch string) (*PullRequest, error) {
  759. pr := new(PullRequest)
  760. has, err := x.
  761. Where("head_repo_id=? AND head_branch=? AND base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  762. headRepoID, headBranch, baseRepoID, baseBranch, false, false).
  763. Join("INNER", "issue", "issue.id=pull_request.issue_id").
  764. Get(pr)
  765. if err != nil {
  766. return nil, err
  767. } else if !has {
  768. return nil, ErrPullRequestNotExist{0, 0, headRepoID, baseRepoID, headBranch, baseBranch}
  769. }
  770. return pr, nil
  771. }
  772. // GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged
  773. // by given head information (repo and branch).
  774. func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) {
  775. prs := make([]*PullRequest, 0, 2)
  776. return prs, x.
  777. Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ?",
  778. repoID, branch, false, false).
  779. Join("INNER", "issue", "issue.id = pull_request.issue_id").
  780. Find(&prs)
  781. }
  782. // GetUnmergedPullRequestsByBaseInfo returns all pull requests that are open and has not been merged
  783. // by given base information (repo and branch).
  784. func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequest, error) {
  785. prs := make([]*PullRequest, 0, 2)
  786. return prs, x.
  787. Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?",
  788. repoID, branch, false, false).
  789. Join("INNER", "issue", "issue.id=pull_request.issue_id").
  790. Find(&prs)
  791. }
  792. // GetPullRequestByIndex returns a pull request by the given index
  793. func GetPullRequestByIndex(repoID int64, index int64) (*PullRequest, error) {
  794. pr := &PullRequest{
  795. BaseRepoID: repoID,
  796. Index: index,
  797. }
  798. has, err := x.Get(pr)
  799. if err != nil {
  800. return nil, err
  801. } else if !has {
  802. return nil, ErrPullRequestNotExist{0, 0, 0, repoID, "", ""}
  803. }
  804. if err = pr.LoadAttributes(); err != nil {
  805. return nil, err
  806. }
  807. if err = pr.LoadIssue(); err != nil {
  808. return nil, err
  809. }
  810. return pr, nil
  811. }
  812. func getPullRequestByID(e Engine, id int64) (*PullRequest, error) {
  813. pr := new(PullRequest)
  814. has, err := e.ID(id).Get(pr)
  815. if err != nil {
  816. return nil, err
  817. } else if !has {
  818. return nil, ErrPullRequestNotExist{id, 0, 0, 0, "", ""}
  819. }
  820. return pr, pr.loadAttributes(e)
  821. }
  822. // GetPullRequestByID returns a pull request by given ID.
  823. func GetPullRequestByID(id int64) (*PullRequest, error) {
  824. return getPullRequestByID(x, id)
  825. }
  826. func getPullRequestByIssueID(e Engine, issueID int64) (*PullRequest, error) {
  827. pr := &PullRequest{
  828. IssueID: issueID,
  829. }
  830. has, err := e.Get(pr)
  831. if err != nil {
  832. return nil, err
  833. } else if !has {
  834. return nil, ErrPullRequestNotExist{0, issueID, 0, 0, "", ""}
  835. }
  836. return pr, pr.loadAttributes(e)
  837. }
  838. // GetPullRequestByIssueID returns pull request by given issue ID.
  839. func GetPullRequestByIssueID(issueID int64) (*PullRequest, error) {
  840. return getPullRequestByIssueID(x, issueID)
  841. }
  842. // Update updates all fields of pull request.
  843. func (pr *PullRequest) Update() error {
  844. _, err := x.ID(pr.ID).AllCols().Update(pr)
  845. return err
  846. }
  847. // UpdateCols updates specific fields of pull request.
  848. func (pr *PullRequest) UpdateCols(cols ...string) error {
  849. _, err := x.ID(pr.ID).Cols(cols...).Update(pr)
  850. return err
  851. }
  852. // UpdatePatch generates and saves a new patch.
  853. func (pr *PullRequest) UpdatePatch() (err error) {
  854. if err = pr.GetHeadRepo(); err != nil {
  855. return fmt.Errorf("GetHeadRepo: %v", err)
  856. } else if pr.HeadRepo == nil {
  857. log.Trace("PullRequest[%d].UpdatePatch: ignored cruppted data", pr.ID)
  858. return nil
  859. }
  860. if err = pr.GetBaseRepo(); err != nil {
  861. return fmt.Errorf("GetBaseRepo: %v", err)
  862. }
  863. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  864. if err != nil {
  865. return fmt.Errorf("OpenRepository: %v", err)
  866. }
  867. // Add a temporary remote.
  868. tmpRemote := com.ToStr(time.Now().UnixNano())
  869. if err = headGitRepo.AddRemote(tmpRemote, RepoPath(pr.BaseRepo.MustOwner().Name, pr.BaseRepo.Name), true); err != nil {
  870. return fmt.Errorf("AddRemote: %v", err)
  871. }
  872. defer func() {
  873. headGitRepo.RemoveRemote(tmpRemote)
  874. }()
  875. remoteBranch := "remotes/" + tmpRemote + "/" + pr.BaseBranch
  876. pr.MergeBase, err = headGitRepo.GetMergeBase(remoteBranch, pr.HeadBranch)
  877. if err != nil {
  878. return fmt.Errorf("GetMergeBase: %v", err)
  879. } else if err = pr.Update(); err != nil {
  880. return fmt.Errorf("Update: %v", err)
  881. }
  882. patch, err := headGitRepo.GetPatch(pr.MergeBase, pr.HeadBranch)
  883. if err != nil {
  884. return fmt.Errorf("GetPatch: %v", err)
  885. }
  886. if err = pr.BaseRepo.SavePatch(pr.Index, patch); err != nil {
  887. return fmt.Errorf("BaseRepo.SavePatch: %v", err)
  888. }
  889. return nil
  890. }
  891. // PushToBaseRepo pushes commits from branches of head repository to
  892. // corresponding branches of base repository.
  893. // FIXME: Only push branches that are actually updates?
  894. func (pr *PullRequest) PushToBaseRepo() (err error) {
  895. log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName())
  896. headRepoPath := pr.HeadRepo.RepoPath()
  897. headGitRepo, err := git.OpenRepository(headRepoPath)
  898. if err != nil {
  899. return fmt.Errorf("OpenRepository: %v", err)
  900. }
  901. tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
  902. if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
  903. return fmt.Errorf("headGitRepo.AddRemote: %v", err)
  904. }
  905. // Make sure to remove the remote even if the push fails
  906. defer headGitRepo.RemoveRemote(tmpRemoteName)
  907. headFile := pr.GetGitRefName()
  908. // Remove head in case there is a conflict.
  909. file := path.Join(pr.BaseRepo.RepoPath(), headFile)
  910. _ = os.Remove(file)
  911. if err = git.Push(headRepoPath, git.PushOptions{
  912. Remote: tmpRemoteName,
  913. Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
  914. Force: true,
  915. }); err != nil {
  916. return fmt.Errorf("Push: %v", err)
  917. }
  918. return nil
  919. }
  920. // AddToTaskQueue adds itself to pull request test task queue.
  921. func (pr *PullRequest) AddToTaskQueue() {
  922. go pullRequestQueue.AddFunc(pr.ID, func() {
  923. pr.Status = PullRequestStatusChecking
  924. if err := pr.UpdateCols("status"); err != nil {
  925. log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
  926. }
  927. })
  928. }
  929. // PullRequestList defines a list of pull requests
  930. type PullRequestList []*PullRequest
  931. func (prs PullRequestList) loadAttributes(e Engine) error {
  932. if len(prs) == 0 {
  933. return nil
  934. }
  935. // Load issues.
  936. issueIDs := prs.getIssueIDs()
  937. issues := make([]*Issue, 0, len(issueIDs))
  938. if err := e.
  939. Where("id > 0").
  940. In("id", issueIDs).
  941. Find(&issues); err != nil {
  942. return fmt.Errorf("find issues: %v", err)
  943. }
  944. set := make(map[int64]*Issue)
  945. for i := range issues {
  946. set[issues[i].ID] = issues[i]
  947. }
  948. for i := range prs {
  949. prs[i].Issue = set[prs[i].IssueID]
  950. }
  951. return nil
  952. }
  953. func (prs PullRequestList) getIssueIDs() []int64 {
  954. issueIDs := make([]int64, 0, len(prs))
  955. for i := range prs {
  956. issueIDs = append(issueIDs, prs[i].IssueID)
  957. }
  958. return issueIDs
  959. }
  960. // LoadAttributes load all the prs attributes
  961. func (prs PullRequestList) LoadAttributes() error {
  962. return prs.loadAttributes(x)
  963. }
  964. func (prs PullRequestList) invalidateCodeComments(e Engine, doer *User, repo *git.Repository, branch string) error {
  965. if len(prs) == 0 {
  966. return nil
  967. }
  968. issueIDs := prs.getIssueIDs()
  969. var codeComments []*Comment
  970. if err := e.
  971. Where("type = ? and invalidated = ?", CommentTypeCode, false).
  972. In("issue_id", issueIDs).
  973. Find(&codeComments); err != nil {
  974. return fmt.Errorf("find code comments: %v", err)
  975. }
  976. for _, comment := range codeComments {
  977. if err := comment.CheckInvalidation(repo, doer, branch); err != nil {
  978. return err
  979. }
  980. }
  981. return nil
  982. }
  983. // InvalidateCodeComments will lookup the prs for code comments which got invalidated by change
  984. func (prs PullRequestList) InvalidateCodeComments(doer *User, repo *git.Repository, branch string) error {
  985. return prs.invalidateCodeComments(x, doer, repo, branch)
  986. }
  987. func addHeadRepoTasks(prs []*PullRequest) {
  988. for _, pr := range prs {
  989. log.Trace("addHeadRepoTasks[%d]: composing new test task", pr.ID)
  990. if err := pr.UpdatePatch(); err != nil {
  991. log.Error(4, "UpdatePatch: %v", err)
  992. continue
  993. } else if err := pr.PushToBaseRepo(); err != nil {
  994. log.Error(4, "PushToBaseRepo: %v", err)
  995. continue
  996. }
  997. pr.AddToTaskQueue()
  998. }
  999. }
  1000. // AddTestPullRequestTask adds new test tasks by given head/base repository and head/base branch,
  1001. // and generate new patch for testing as needed.
  1002. func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool) {
  1003. log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
  1004. prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
  1005. if err != nil {
  1006. log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
  1007. return
  1008. }
  1009. if isSync {
  1010. requests := PullRequestList(prs)
  1011. if err = requests.LoadAttributes(); err != nil {
  1012. log.Error(4, "PullRequestList.LoadAttributes: %v", err)
  1013. }
  1014. if invalidationErr := checkForInvalidation(requests, repoID, doer, branch); invalidationErr != nil {
  1015. log.Error(4, "checkForInvalidation: %v", invalidationErr)
  1016. }
  1017. if err == nil {
  1018. for _, pr := range prs {
  1019. pr.Issue.PullRequest = pr
  1020. if err = pr.Issue.LoadAttributes(); err != nil {
  1021. log.Error(4, "LoadAttributes: %v", err)
  1022. continue
  1023. }
  1024. if err = PrepareWebhooks(pr.Issue.Repo, HookEventPullRequest, &api.PullRequestPayload{
  1025. Action: api.HookIssueSynchronized,
  1026. Index: pr.Issue.Index,
  1027. PullRequest: pr.Issue.PullRequest.APIFormat(),
  1028. Repository: pr.Issue.Repo.APIFormat(AccessModeNone),
  1029. Sender: doer.APIFormat(),
  1030. }); err != nil {
  1031. log.Error(4, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
  1032. continue
  1033. }
  1034. go HookQueue.Add(pr.Issue.Repo.ID)
  1035. }
  1036. }
  1037. }
  1038. addHeadRepoTasks(prs)
  1039. log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
  1040. prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
  1041. if err != nil {
  1042. log.Error(4, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
  1043. return
  1044. }
  1045. for _, pr := range prs {
  1046. pr.AddToTaskQueue()
  1047. }
  1048. }
  1049. func checkForInvalidation(requests PullRequestList, repoID int64, doer *User, branch string) error {
  1050. repo, err := GetRepositoryByID(repoID)
  1051. if err != nil {
  1052. return fmt.Errorf("GetRepositoryByID: %v", err)
  1053. }
  1054. gitRepo, err := git.OpenRepository(repo.RepoPath())
  1055. if err != nil {
  1056. return fmt.Errorf("git.OpenRepository: %v", err)
  1057. }
  1058. go func() {
  1059. err := requests.InvalidateCodeComments(doer, gitRepo, branch)
  1060. if err != nil {
  1061. log.Error(4, "PullRequestList.InvalidateCodeComments: %v", err)
  1062. }
  1063. }()
  1064. return nil
  1065. }
  1066. // ChangeUsernameInPullRequests changes the name of head_user_name
  1067. func ChangeUsernameInPullRequests(oldUserName, newUserName string) error {
  1068. pr := PullRequest{
  1069. HeadUserName: strings.ToLower(newUserName),
  1070. }
  1071. _, err := x.
  1072. Cols("head_user_name").
  1073. Where("head_user_name = ?", strings.ToLower(oldUserName)).
  1074. Update(pr)
  1075. return err
  1076. }
  1077. // checkAndUpdateStatus checks if pull request is possible to leaving checking status,
  1078. // and set to be either conflict or mergeable.
  1079. func (pr *PullRequest) checkAndUpdateStatus() {
  1080. // Status is not changed to conflict means mergeable.
  1081. if pr.Status == PullRequestStatusChecking {
  1082. pr.Status = PullRequestStatusMergeable
  1083. }
  1084. // Make sure there is no waiting test to process before leaving the checking status.
  1085. if !pullRequestQueue.Exist(pr.ID) {
  1086. if err := pr.UpdateCols("status"); err != nil {
  1087. log.Error(4, "Update[%d]: %v", pr.ID, err)
  1088. }
  1089. }
  1090. }
  1091. // IsWorkInProgress determine if the Pull Request is a Work In Progress by its title
  1092. func (pr *PullRequest) IsWorkInProgress() bool {
  1093. if err := pr.LoadIssue(); err != nil {
  1094. log.Error(4, "LoadIssue: %v", err)
  1095. return false
  1096. }
  1097. for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
  1098. if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
  1099. return true
  1100. }
  1101. }
  1102. return false
  1103. }
  1104. // GetWorkInProgressPrefix returns the prefix used to mark the pull request as a work in progress.
  1105. // It returns an empty string when none were found
  1106. func (pr *PullRequest) GetWorkInProgressPrefix() string {
  1107. if err := pr.LoadIssue(); err != nil {
  1108. log.Error(4, "LoadIssue: %v", err)
  1109. return ""
  1110. }
  1111. for _, prefix := range setting.Repository.PullRequest.WorkInProgressPrefixes {
  1112. if strings.HasPrefix(strings.ToUpper(pr.Issue.Title), prefix) {
  1113. return pr.Issue.Title[0:len(prefix)]
  1114. }
  1115. }
  1116. return ""
  1117. }
  1118. // TestPullRequests checks and tests untested patches of pull requests.
  1119. // TODO: test more pull requests at same time.
  1120. func TestPullRequests() {
  1121. prs := make([]*PullRequest, 0, 10)
  1122. err := x.Where("status = ?", PullRequestStatusChecking).Find(&prs)
  1123. if err != nil {
  1124. log.Error(3, "Find Checking PRs", err)
  1125. return
  1126. }
  1127. var checkedPRs = make(map[int64]struct{})
  1128. // Update pull request status.
  1129. for _, pr := range prs {
  1130. checkedPRs[pr.ID] = struct{}{}
  1131. if err := pr.GetBaseRepo(); err != nil {
  1132. log.Error(3, "GetBaseRepo: %v", err)
  1133. continue
  1134. }
  1135. if pr.manuallyMerged() {
  1136. continue
  1137. }
  1138. if err := pr.testPatch(); err != nil {
  1139. log.Error(3, "testPatch: %v", err)
  1140. continue
  1141. }
  1142. pr.checkAndUpdateStatus()
  1143. }
  1144. // Start listening on new test requests.
  1145. for prID := range pullRequestQueue.Queue() {
  1146. log.Trace("TestPullRequests[%v]: processing test task", prID)
  1147. pullRequestQueue.Remove(prID)
  1148. id := com.StrTo(prID).MustInt64()
  1149. if _, ok := checkedPRs[id]; ok {
  1150. continue
  1151. }
  1152. pr, err := GetPullRequestByID(id)
  1153. if err != nil {
  1154. log.Error(4, "GetPullRequestByID[%s]: %v", prID, err)
  1155. continue
  1156. } else if pr.manuallyMerged() {
  1157. continue
  1158. } else if err = pr.testPatch(); err != nil {
  1159. log.Error(4, "testPatch[%d]: %v", pr.ID, err)
  1160. continue
  1161. }
  1162. pr.checkAndUpdateStatus()
  1163. }
  1164. }
  1165. // InitTestPullRequests runs the task to test all the checking status pull requests
  1166. func InitTestPullRequests() {
  1167. go TestPullRequests()
  1168. }