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