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 27 kB

11 years ago
10 years ago
11 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
10 years ago
10 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
10 years ago
10 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
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
10 years ago
Adds side-by-side diff for images (#6784) * Adds side-by-side diff for images Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Explain blank imports Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use complete word for width and height labels on image compare Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Update index.css from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Moves ImageInfo to git commit file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Assign ImageInfo function for template and sets correct target for BeforeSourcePath Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adds missing comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Return error if ImageInfo failed Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Avoid template panic when ImageInfo failed for some reason Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show file size on image diff Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes unused helper function Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Reverts copyright year change Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Close file reader Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Update commit.go Sets correct data key * Moves reader.Close() up a few lines * Updates index.css * Updates CSS file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers adjustments for image compare to compare.go file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts variable name Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Apply lesshint recommendations Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Do not show old image on image compare if it is not in index of base commit Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Change file size text Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
6 years ago
10 years ago
10 years ago
10 years ago
Adds side-by-side diff for images (#6784) * Adds side-by-side diff for images Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Explain blank imports Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use complete word for width and height labels on image compare Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Update index.css from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Moves ImageInfo to git commit file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Assign ImageInfo function for template and sets correct target for BeforeSourcePath Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adds missing comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Return error if ImageInfo failed Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Avoid template panic when ImageInfo failed for some reason Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show file size on image diff Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes unused helper function Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Reverts copyright year change Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Close file reader Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Update commit.go Sets correct data key * Moves reader.Close() up a few lines * Updates index.css * Updates CSS file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers adjustments for image compare to compare.go file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts variable name Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Apply lesshint recommendations Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Do not show old image on image compare if it is not in index of base commit Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Change file size text Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
6 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
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
10 years ago
Squashed commit of the following: commit 0afcb843d7ffd596991c4885cab768273a6eb42c Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit 7ecd73ff5535612d79d471409173ee7f1fcfa157 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit 23af384c53206a8a40e11e45bf49d7a149c4adcd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9 Merge: 7fc8a89 991ce42 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn <richard_mahn@wycliffeassociates.org> Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files
9 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
Compare branches, commits and tags with each other (#6991) * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
6 years ago
11 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
6 years ago
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019
  1. // Copyright 2018 The Gitea Authors.
  2. // Copyright 2014 The Gogs Authors.
  3. // All rights reserved.
  4. // Use of this source code is governed by a MIT-style
  5. // license that can be found in the LICENSE file.
  6. package repo
  7. import (
  8. "container/list"
  9. "crypto/subtle"
  10. "fmt"
  11. "io"
  12. "path"
  13. "strings"
  14. "code.gitea.io/gitea/models"
  15. "code.gitea.io/gitea/modules/auth"
  16. "code.gitea.io/gitea/modules/base"
  17. "code.gitea.io/gitea/modules/context"
  18. "code.gitea.io/gitea/modules/git"
  19. "code.gitea.io/gitea/modules/log"
  20. "code.gitea.io/gitea/modules/notification"
  21. "code.gitea.io/gitea/modules/setting"
  22. "code.gitea.io/gitea/modules/util"
  23. "code.gitea.io/gitea/services/gitdiff"
  24. pull_service "code.gitea.io/gitea/services/pull"
  25. "github.com/unknwon/com"
  26. )
  27. const (
  28. tplFork base.TplName = "repo/pulls/fork"
  29. tplCompareDiff base.TplName = "repo/diff/compare"
  30. tplPullCommits base.TplName = "repo/pulls/commits"
  31. tplPullFiles base.TplName = "repo/pulls/files"
  32. pullRequestTemplateKey = "PullRequestTemplate"
  33. )
  34. var (
  35. pullRequestTemplateCandidates = []string{
  36. "PULL_REQUEST_TEMPLATE.md",
  37. "pull_request_template.md",
  38. ".gitea/PULL_REQUEST_TEMPLATE.md",
  39. ".gitea/pull_request_template.md",
  40. ".github/PULL_REQUEST_TEMPLATE.md",
  41. ".github/pull_request_template.md",
  42. }
  43. )
  44. func getForkRepository(ctx *context.Context) *models.Repository {
  45. forkRepo, err := models.GetRepositoryByID(ctx.ParamsInt64(":repoid"))
  46. if err != nil {
  47. if models.IsErrRepoNotExist(err) {
  48. ctx.NotFound("GetRepositoryByID", nil)
  49. } else {
  50. ctx.ServerError("GetRepositoryByID", err)
  51. }
  52. return nil
  53. }
  54. perm, err := models.GetUserRepoPermission(forkRepo, ctx.User)
  55. if err != nil {
  56. ctx.ServerError("GetUserRepoPermission", err)
  57. return nil
  58. }
  59. if forkRepo.IsEmpty || !perm.CanRead(models.UnitTypeCode) {
  60. if log.IsTrace() {
  61. if forkRepo.IsEmpty {
  62. log.Trace("Empty fork repository %-v", forkRepo)
  63. } else {
  64. log.Trace("Permission Denied: User %-v cannot read %-v of forkRepo %-v\n"+
  65. "User in forkRepo has Permissions: %-+v",
  66. ctx.User,
  67. models.UnitTypeCode,
  68. ctx.Repo,
  69. perm)
  70. }
  71. }
  72. ctx.NotFound("getForkRepository", nil)
  73. return nil
  74. }
  75. ctx.Data["repo_name"] = forkRepo.Name
  76. ctx.Data["description"] = forkRepo.Description
  77. ctx.Data["IsPrivate"] = forkRepo.IsPrivate
  78. canForkToUser := forkRepo.OwnerID != ctx.User.ID && !ctx.User.HasForkedRepo(forkRepo.ID)
  79. if err = forkRepo.GetOwner(); err != nil {
  80. ctx.ServerError("GetOwner", err)
  81. return nil
  82. }
  83. ctx.Data["ForkFrom"] = forkRepo.Owner.Name + "/" + forkRepo.Name
  84. ctx.Data["ForkFromOwnerID"] = forkRepo.Owner.ID
  85. if err := ctx.User.GetOwnedOrganizations(); err != nil {
  86. ctx.ServerError("GetOwnedOrganizations", err)
  87. return nil
  88. }
  89. var orgs []*models.User
  90. for _, org := range ctx.User.OwnedOrgs {
  91. if forkRepo.OwnerID != org.ID && !org.HasForkedRepo(forkRepo.ID) {
  92. orgs = append(orgs, org)
  93. }
  94. }
  95. var traverseParentRepo = forkRepo
  96. for {
  97. if ctx.User.ID == traverseParentRepo.OwnerID {
  98. canForkToUser = false
  99. } else {
  100. for i, org := range orgs {
  101. if org.ID == traverseParentRepo.OwnerID {
  102. orgs = append(orgs[:i], orgs[i+1:]...)
  103. break
  104. }
  105. }
  106. }
  107. if !traverseParentRepo.IsFork {
  108. break
  109. }
  110. traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
  111. if err != nil {
  112. ctx.ServerError("GetRepositoryByID", err)
  113. return nil
  114. }
  115. }
  116. ctx.Data["CanForkToUser"] = canForkToUser
  117. ctx.Data["Orgs"] = orgs
  118. if canForkToUser {
  119. ctx.Data["ContextUser"] = ctx.User
  120. } else if len(orgs) > 0 {
  121. ctx.Data["ContextUser"] = orgs[0]
  122. }
  123. return forkRepo
  124. }
  125. // Fork render repository fork page
  126. func Fork(ctx *context.Context) {
  127. ctx.Data["Title"] = ctx.Tr("new_fork")
  128. getForkRepository(ctx)
  129. if ctx.Written() {
  130. return
  131. }
  132. ctx.HTML(200, tplFork)
  133. }
  134. // ForkPost response for forking a repository
  135. func ForkPost(ctx *context.Context, form auth.CreateRepoForm) {
  136. ctx.Data["Title"] = ctx.Tr("new_fork")
  137. ctxUser := checkContextUser(ctx, form.UID)
  138. if ctx.Written() {
  139. return
  140. }
  141. forkRepo := getForkRepository(ctx)
  142. if ctx.Written() {
  143. return
  144. }
  145. ctx.Data["ContextUser"] = ctxUser
  146. if ctx.HasError() {
  147. ctx.HTML(200, tplFork)
  148. return
  149. }
  150. var err error
  151. var traverseParentRepo = forkRepo
  152. for {
  153. if ctxUser.ID == traverseParentRepo.OwnerID {
  154. ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
  155. return
  156. }
  157. repo, has := models.HasForkedRepo(ctxUser.ID, traverseParentRepo.ID)
  158. if has {
  159. ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
  160. return
  161. }
  162. if !traverseParentRepo.IsFork {
  163. break
  164. }
  165. traverseParentRepo, err = models.GetRepositoryByID(traverseParentRepo.ForkID)
  166. if err != nil {
  167. ctx.ServerError("GetRepositoryByID", err)
  168. return
  169. }
  170. }
  171. // Check ownership of organization.
  172. if ctxUser.IsOrganization() {
  173. isOwner, err := ctxUser.IsOwnedBy(ctx.User.ID)
  174. if err != nil {
  175. ctx.ServerError("IsOwnedBy", err)
  176. return
  177. } else if !isOwner {
  178. ctx.Error(403)
  179. return
  180. }
  181. }
  182. repo, err := models.ForkRepository(ctx.User, ctxUser, forkRepo, form.RepoName, form.Description)
  183. if err != nil {
  184. ctx.Data["Err_RepoName"] = true
  185. switch {
  186. case models.IsErrRepoAlreadyExist(err):
  187. ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), tplFork, &form)
  188. case models.IsErrNameReserved(err):
  189. ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tplFork, &form)
  190. case models.IsErrNamePatternNotAllowed(err):
  191. ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tplFork, &form)
  192. default:
  193. ctx.ServerError("ForkPost", err)
  194. }
  195. return
  196. }
  197. log.Trace("Repository forked[%d]: %s/%s", forkRepo.ID, ctxUser.Name, repo.Name)
  198. ctx.Redirect(setting.AppSubURL + "/" + ctxUser.Name + "/" + repo.Name)
  199. }
  200. func checkPullInfo(ctx *context.Context) *models.Issue {
  201. issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  202. if err != nil {
  203. if models.IsErrIssueNotExist(err) {
  204. ctx.NotFound("GetIssueByIndex", err)
  205. } else {
  206. ctx.ServerError("GetIssueByIndex", err)
  207. }
  208. return nil
  209. }
  210. if err = issue.LoadPoster(); err != nil {
  211. ctx.ServerError("LoadPoster", err)
  212. return nil
  213. }
  214. ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, issue.Title)
  215. ctx.Data["Issue"] = issue
  216. if !issue.IsPull {
  217. ctx.NotFound("ViewPullCommits", nil)
  218. return nil
  219. }
  220. if err = issue.LoadPullRequest(); err != nil {
  221. ctx.ServerError("LoadPullRequest", err)
  222. return nil
  223. }
  224. if err = issue.PullRequest.GetHeadRepo(); err != nil {
  225. ctx.ServerError("GetHeadRepo", err)
  226. return nil
  227. }
  228. if ctx.IsSigned {
  229. // Update issue-user.
  230. if err = issue.ReadBy(ctx.User.ID); err != nil {
  231. ctx.ServerError("ReadBy", err)
  232. return nil
  233. }
  234. }
  235. return issue
  236. }
  237. func setMergeTarget(ctx *context.Context, pull *models.PullRequest) {
  238. if ctx.Repo.Owner.Name == pull.MustHeadUserName() {
  239. ctx.Data["HeadTarget"] = pull.HeadBranch
  240. } else if pull.HeadRepo == nil {
  241. ctx.Data["HeadTarget"] = pull.MustHeadUserName() + ":" + pull.HeadBranch
  242. } else {
  243. ctx.Data["HeadTarget"] = pull.MustHeadUserName() + "/" + pull.HeadRepo.Name + ":" + pull.HeadBranch
  244. }
  245. ctx.Data["BaseTarget"] = pull.BaseBranch
  246. }
  247. // PrepareMergedViewPullInfo show meta information for a merged pull request view page
  248. func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) *git.CompareInfo {
  249. pull := issue.PullRequest
  250. setMergeTarget(ctx, pull)
  251. ctx.Data["HasMerged"] = true
  252. compareInfo, err := ctx.Repo.GitRepo.GetCompareInfo(ctx.Repo.Repository.RepoPath(),
  253. pull.MergeBase, pull.GetGitRefName())
  254. if err != nil {
  255. if strings.Contains(err.Error(), "fatal: Not a valid object name") {
  256. ctx.Data["IsPullRequestBroken"] = true
  257. ctx.Data["BaseTarget"] = "deleted"
  258. ctx.Data["NumCommits"] = 0
  259. ctx.Data["NumFiles"] = 0
  260. return nil
  261. }
  262. ctx.ServerError("GetCompareInfo", err)
  263. return nil
  264. }
  265. ctx.Data["NumCommits"] = compareInfo.Commits.Len()
  266. ctx.Data["NumFiles"] = compareInfo.NumFiles
  267. return compareInfo
  268. }
  269. // PrepareViewPullInfo show meta information for a pull request preview page
  270. func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.CompareInfo {
  271. repo := ctx.Repo.Repository
  272. pull := issue.PullRequest
  273. var err error
  274. if err = pull.GetHeadRepo(); err != nil {
  275. ctx.ServerError("GetHeadRepo", err)
  276. return nil
  277. }
  278. setMergeTarget(ctx, pull)
  279. if err = pull.LoadProtectedBranch(); err != nil {
  280. ctx.ServerError("GetLatestCommitStatus", err)
  281. return nil
  282. }
  283. ctx.Data["EnableStatusCheck"] = pull.ProtectedBranch != nil && pull.ProtectedBranch.EnableStatusCheck
  284. var headGitRepo *git.Repository
  285. var headBranchExist bool
  286. // HeadRepo may be missing
  287. if pull.HeadRepo != nil {
  288. headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
  289. if err != nil {
  290. ctx.ServerError("OpenRepository", err)
  291. return nil
  292. }
  293. headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
  294. if headBranchExist {
  295. sha, err := headGitRepo.GetBranchCommitID(pull.HeadBranch)
  296. if err != nil {
  297. ctx.ServerError("GetBranchCommitID", err)
  298. return nil
  299. }
  300. commitStatuses, err := models.GetLatestCommitStatus(repo, sha, 0)
  301. if err != nil {
  302. ctx.ServerError("GetLatestCommitStatus", err)
  303. return nil
  304. }
  305. if len(commitStatuses) > 0 {
  306. ctx.Data["LatestCommitStatuses"] = commitStatuses
  307. ctx.Data["LatestCommitStatus"] = models.CalcCommitStatus(commitStatuses)
  308. }
  309. if pull.ProtectedBranch != nil && pull.ProtectedBranch.EnableStatusCheck {
  310. ctx.Data["is_context_required"] = func(context string) bool {
  311. for _, c := range pull.ProtectedBranch.StatusCheckContexts {
  312. if c == context {
  313. return true
  314. }
  315. }
  316. return false
  317. }
  318. ctx.Data["IsRequiredStatusCheckSuccess"] = pull_service.IsCommitStatusContextSuccess(commitStatuses, pull.ProtectedBranch.StatusCheckContexts)
  319. }
  320. }
  321. }
  322. if pull.HeadRepo == nil || !headBranchExist {
  323. ctx.Data["IsPullRequestBroken"] = true
  324. ctx.Data["HeadTarget"] = "deleted"
  325. ctx.Data["NumCommits"] = 0
  326. ctx.Data["NumFiles"] = 0
  327. return nil
  328. }
  329. compareInfo, err := headGitRepo.GetCompareInfo(models.RepoPath(repo.Owner.Name, repo.Name),
  330. pull.BaseBranch, pull.HeadBranch)
  331. if err != nil {
  332. if strings.Contains(err.Error(), "fatal: Not a valid object name") {
  333. ctx.Data["IsPullRequestBroken"] = true
  334. ctx.Data["BaseTarget"] = "deleted"
  335. ctx.Data["NumCommits"] = 0
  336. ctx.Data["NumFiles"] = 0
  337. return nil
  338. }
  339. ctx.ServerError("GetCompareInfo", err)
  340. return nil
  341. }
  342. if pull.IsWorkInProgress() {
  343. ctx.Data["IsPullWorkInProgress"] = true
  344. ctx.Data["WorkInProgressPrefix"] = pull.GetWorkInProgressPrefix()
  345. }
  346. if pull.IsFilesConflicted() {
  347. ctx.Data["IsPullFilesConflicted"] = true
  348. ctx.Data["ConflictedFiles"] = pull.ConflictedFiles
  349. }
  350. ctx.Data["NumCommits"] = compareInfo.Commits.Len()
  351. ctx.Data["NumFiles"] = compareInfo.NumFiles
  352. return compareInfo
  353. }
  354. // ViewPullCommits show commits for a pull request
  355. func ViewPullCommits(ctx *context.Context) {
  356. ctx.Data["PageIsPullList"] = true
  357. ctx.Data["PageIsPullCommits"] = true
  358. issue := checkPullInfo(ctx)
  359. if ctx.Written() {
  360. return
  361. }
  362. pull := issue.PullRequest
  363. var commits *list.List
  364. if pull.HasMerged {
  365. prInfo := PrepareMergedViewPullInfo(ctx, issue)
  366. if ctx.Written() {
  367. return
  368. } else if prInfo == nil {
  369. ctx.NotFound("ViewPullCommits", nil)
  370. return
  371. }
  372. ctx.Data["Username"] = ctx.Repo.Owner.Name
  373. ctx.Data["Reponame"] = ctx.Repo.Repository.Name
  374. commits = prInfo.Commits
  375. } else {
  376. prInfo := PrepareViewPullInfo(ctx, issue)
  377. if ctx.Written() {
  378. return
  379. } else if prInfo == nil {
  380. ctx.NotFound("ViewPullCommits", nil)
  381. return
  382. }
  383. ctx.Data["Username"] = pull.MustHeadUserName()
  384. ctx.Data["Reponame"] = pull.HeadRepo.Name
  385. commits = prInfo.Commits
  386. }
  387. commits = models.ValidateCommitsWithEmails(commits)
  388. commits = models.ParseCommitsWithSignature(commits)
  389. commits = models.ParseCommitsWithStatus(commits, ctx.Repo.Repository)
  390. ctx.Data["Commits"] = commits
  391. ctx.Data["CommitCount"] = commits.Len()
  392. ctx.HTML(200, tplPullCommits)
  393. }
  394. // ViewPullFiles render pull request changed files list page
  395. func ViewPullFiles(ctx *context.Context) {
  396. ctx.Data["PageIsPullList"] = true
  397. ctx.Data["PageIsPullFiles"] = true
  398. issue := checkPullInfo(ctx)
  399. if ctx.Written() {
  400. return
  401. }
  402. pull := issue.PullRequest
  403. whitespaceFlags := map[string]string{
  404. "ignore-all": "-w",
  405. "ignore-change": "-b",
  406. "ignore-eol": "--ignore-space-at-eol",
  407. "": ""}
  408. var (
  409. diffRepoPath string
  410. startCommitID string
  411. endCommitID string
  412. gitRepo *git.Repository
  413. )
  414. var headTarget string
  415. if pull.HasMerged {
  416. prInfo := PrepareMergedViewPullInfo(ctx, issue)
  417. if ctx.Written() {
  418. return
  419. } else if prInfo == nil {
  420. ctx.NotFound("ViewPullFiles", nil)
  421. return
  422. }
  423. diffRepoPath = ctx.Repo.GitRepo.Path
  424. gitRepo = ctx.Repo.GitRepo
  425. headCommitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())
  426. if err != nil {
  427. ctx.ServerError("GetRefCommitID", err)
  428. return
  429. }
  430. startCommitID = prInfo.MergeBase
  431. endCommitID = headCommitID
  432. headTarget = path.Join(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
  433. ctx.Data["Username"] = ctx.Repo.Owner.Name
  434. ctx.Data["Reponame"] = ctx.Repo.Repository.Name
  435. } else {
  436. prInfo := PrepareViewPullInfo(ctx, issue)
  437. if ctx.Written() {
  438. return
  439. } else if prInfo == nil {
  440. ctx.NotFound("ViewPullFiles", nil)
  441. return
  442. }
  443. headRepoPath := pull.HeadRepo.RepoPath()
  444. headGitRepo, err := git.OpenRepository(headRepoPath)
  445. if err != nil {
  446. ctx.ServerError("OpenRepository", err)
  447. return
  448. }
  449. headCommitID, err := headGitRepo.GetBranchCommitID(pull.HeadBranch)
  450. if err != nil {
  451. ctx.ServerError("GetBranchCommitID", err)
  452. return
  453. }
  454. diffRepoPath = headRepoPath
  455. startCommitID = prInfo.MergeBase
  456. endCommitID = headCommitID
  457. gitRepo = headGitRepo
  458. headTarget = path.Join(pull.MustHeadUserName(), pull.HeadRepo.Name)
  459. ctx.Data["Username"] = pull.MustHeadUserName()
  460. ctx.Data["Reponame"] = pull.HeadRepo.Name
  461. }
  462. diff, err := gitdiff.GetDiffRangeWithWhitespaceBehavior(diffRepoPath,
  463. startCommitID, endCommitID, setting.Git.MaxGitDiffLines,
  464. setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles,
  465. whitespaceFlags[ctx.Data["WhitespaceBehavior"].(string)])
  466. if err != nil {
  467. ctx.ServerError("GetDiffRangeWithWhitespaceBehavior", err)
  468. return
  469. }
  470. if err = diff.LoadComments(issue, ctx.User); err != nil {
  471. ctx.ServerError("LoadComments", err)
  472. return
  473. }
  474. ctx.Data["Diff"] = diff
  475. ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
  476. baseCommit, err := ctx.Repo.GitRepo.GetCommit(startCommitID)
  477. if err != nil {
  478. ctx.ServerError("GetCommit", err)
  479. return
  480. }
  481. commit, err := gitRepo.GetCommit(endCommitID)
  482. if err != nil {
  483. ctx.ServerError("GetCommit", err)
  484. return
  485. }
  486. setImageCompareContext(ctx, baseCommit, commit)
  487. setPathsCompareContext(ctx, baseCommit, commit, headTarget)
  488. ctx.Data["RequireHighlightJS"] = true
  489. ctx.Data["RequireTribute"] = true
  490. if ctx.Data["Assignees"], err = ctx.Repo.Repository.GetAssignees(); err != nil {
  491. ctx.ServerError("GetAssignees", err)
  492. return
  493. }
  494. ctx.Data["CurrentReview"], err = models.GetCurrentReview(ctx.User, issue)
  495. if err != nil && !models.IsErrReviewNotExist(err) {
  496. ctx.ServerError("GetCurrentReview", err)
  497. return
  498. }
  499. ctx.HTML(200, tplPullFiles)
  500. }
  501. // MergePullRequest response for merging pull request
  502. func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
  503. issue := checkPullInfo(ctx)
  504. if ctx.Written() {
  505. return
  506. }
  507. if issue.IsClosed {
  508. ctx.NotFound("MergePullRequest", nil)
  509. return
  510. }
  511. pr := issue.PullRequest
  512. if !pr.CanAutoMerge() || pr.HasMerged {
  513. ctx.NotFound("MergePullRequest", nil)
  514. return
  515. }
  516. if pr.IsWorkInProgress() {
  517. ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_wip"))
  518. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  519. return
  520. }
  521. isPass, err := pull_service.IsPullCommitStatusPass(pr)
  522. if err != nil {
  523. ctx.ServerError("IsPullCommitStatusPass", err)
  524. return
  525. }
  526. if !isPass && !ctx.IsUserRepoAdmin() {
  527. ctx.Flash.Error(ctx.Tr("repo.pulls.no_merge_status_check"))
  528. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  529. return
  530. }
  531. if ctx.HasError() {
  532. ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
  533. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  534. return
  535. }
  536. message := strings.TrimSpace(form.MergeTitleField)
  537. if len(message) == 0 {
  538. if models.MergeStyle(form.Do) == models.MergeStyleMerge {
  539. message = pr.GetDefaultMergeMessage()
  540. }
  541. if models.MergeStyle(form.Do) == models.MergeStyleRebaseMerge {
  542. message = pr.GetDefaultMergeMessage()
  543. }
  544. if models.MergeStyle(form.Do) == models.MergeStyleSquash {
  545. message = pr.GetDefaultSquashMessage()
  546. }
  547. }
  548. form.MergeMessageField = strings.TrimSpace(form.MergeMessageField)
  549. if len(form.MergeMessageField) > 0 {
  550. message += "\n\n" + form.MergeMessageField
  551. }
  552. pr.Issue = issue
  553. pr.Issue.Repo = ctx.Repo.Repository
  554. noDeps, err := models.IssueNoDependenciesLeft(issue)
  555. if err != nil {
  556. return
  557. }
  558. if !noDeps {
  559. ctx.Flash.Error(ctx.Tr("repo.issues.dependency.pr_close_blocked"))
  560. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  561. return
  562. }
  563. if err = pull_service.Merge(pr, ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil {
  564. if models.IsErrInvalidMergeStyle(err) {
  565. ctx.Flash.Error(ctx.Tr("repo.pulls.invalid_merge_option"))
  566. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  567. return
  568. }
  569. ctx.ServerError("Merge", err)
  570. return
  571. }
  572. if err := stopTimerIfAvailable(ctx.User, issue); err != nil {
  573. ctx.ServerError("CreateOrStopIssueStopwatch", err)
  574. return
  575. }
  576. notification.NotifyMergePullRequest(pr, ctx.User, ctx.Repo.GitRepo)
  577. log.Trace("Pull request merged: %d", pr.ID)
  578. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index))
  579. }
  580. func stopTimerIfAvailable(user *models.User, issue *models.Issue) error {
  581. if models.StopwatchExists(user.ID, issue.ID) {
  582. if err := models.CreateOrStopIssueStopwatch(user, issue); err != nil {
  583. return err
  584. }
  585. }
  586. return nil
  587. }
  588. // CompareAndPullRequestPost response for creating pull request
  589. func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) {
  590. ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes")
  591. ctx.Data["PageIsComparePull"] = true
  592. ctx.Data["IsDiffCompare"] = true
  593. ctx.Data["RequireHighlightJS"] = true
  594. ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
  595. renderAttachmentSettings(ctx)
  596. var (
  597. repo = ctx.Repo.Repository
  598. attachments []string
  599. )
  600. headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
  601. if ctx.Written() {
  602. return
  603. }
  604. labelIDs, assigneeIDs, milestoneID := ValidateRepoMetas(ctx, form, true)
  605. if ctx.Written() {
  606. return
  607. }
  608. if setting.AttachmentEnabled {
  609. attachments = form.Files
  610. }
  611. if ctx.HasError() {
  612. auth.AssignForm(form, ctx.Data)
  613. // This stage is already stop creating new pull request, so it does not matter if it has
  614. // something to compare or not.
  615. PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
  616. if ctx.Written() {
  617. return
  618. }
  619. ctx.HTML(200, tplCompareDiff)
  620. return
  621. }
  622. if util.IsEmptyString(form.Title) {
  623. PrepareCompareDiff(ctx, headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch)
  624. if ctx.Written() {
  625. return
  626. }
  627. ctx.RenderWithErr(ctx.Tr("repo.issues.new.title_empty"), tplCompareDiff, form)
  628. return
  629. }
  630. patch, err := headGitRepo.GetPatch(prInfo.MergeBase, headBranch)
  631. if err != nil {
  632. ctx.ServerError("GetPatch", err)
  633. return
  634. }
  635. pullIssue := &models.Issue{
  636. RepoID: repo.ID,
  637. Title: form.Title,
  638. PosterID: ctx.User.ID,
  639. Poster: ctx.User,
  640. MilestoneID: milestoneID,
  641. IsPull: true,
  642. Content: form.Content,
  643. }
  644. pullRequest := &models.PullRequest{
  645. HeadRepoID: headRepo.ID,
  646. BaseRepoID: repo.ID,
  647. HeadBranch: headBranch,
  648. BaseBranch: baseBranch,
  649. HeadRepo: headRepo,
  650. BaseRepo: repo,
  651. MergeBase: prInfo.MergeBase,
  652. Type: models.PullRequestGitea,
  653. }
  654. // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt
  655. // instead of 500.
  656. if err := pull_service.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch, assigneeIDs); err != nil {
  657. if models.IsErrUserDoesNotHaveAccessToRepo(err) {
  658. ctx.Error(400, "UserDoesNotHaveAccessToRepo", err.Error())
  659. return
  660. }
  661. ctx.ServerError("NewPullRequest", err)
  662. return
  663. } else if err := pullRequest.PushToBaseRepo(); err != nil {
  664. ctx.ServerError("PushToBaseRepo", err)
  665. return
  666. }
  667. notification.NotifyNewPullRequest(pullRequest)
  668. log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID)
  669. ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index))
  670. }
  671. // TriggerTask response for a trigger task request
  672. func TriggerTask(ctx *context.Context) {
  673. pusherID := ctx.QueryInt64("pusher")
  674. branch := ctx.Query("branch")
  675. secret := ctx.Query("secret")
  676. if len(branch) == 0 || len(secret) == 0 || pusherID <= 0 {
  677. ctx.Error(404)
  678. log.Trace("TriggerTask: branch or secret is empty, or pusher ID is not valid")
  679. return
  680. }
  681. owner, repo := parseOwnerAndRepo(ctx)
  682. if ctx.Written() {
  683. return
  684. }
  685. got := []byte(base.EncodeMD5(owner.Salt))
  686. want := []byte(secret)
  687. if subtle.ConstantTimeCompare(got, want) != 1 {
  688. ctx.Error(404)
  689. log.Trace("TriggerTask [%s/%s]: invalid secret", owner.Name, repo.Name)
  690. return
  691. }
  692. pusher, err := models.GetUserByID(pusherID)
  693. if err != nil {
  694. if models.IsErrUserNotExist(err) {
  695. ctx.Error(404)
  696. } else {
  697. ctx.ServerError("GetUserByID", err)
  698. }
  699. return
  700. }
  701. log.Trace("TriggerTask '%s/%s' by %s", repo.Name, branch, pusher.Name)
  702. go models.HookQueue.Add(repo.ID)
  703. go pull_service.AddTestPullRequestTask(pusher, repo.ID, branch, true)
  704. ctx.Status(202)
  705. }
  706. // CleanUpPullRequest responses for delete merged branch when PR has been merged
  707. func CleanUpPullRequest(ctx *context.Context) {
  708. issue := checkPullInfo(ctx)
  709. if ctx.Written() {
  710. return
  711. }
  712. pr := issue.PullRequest
  713. // Don't cleanup unmerged and unclosed PRs
  714. if !pr.HasMerged && !issue.IsClosed {
  715. ctx.NotFound("CleanUpPullRequest", nil)
  716. return
  717. }
  718. if err := pr.GetHeadRepo(); err != nil {
  719. ctx.ServerError("GetHeadRepo", err)
  720. return
  721. } else if pr.HeadRepo == nil {
  722. // Forked repository has already been deleted
  723. ctx.NotFound("CleanUpPullRequest", nil)
  724. return
  725. } else if err = pr.GetBaseRepo(); err != nil {
  726. ctx.ServerError("GetBaseRepo", err)
  727. return
  728. } else if err = pr.HeadRepo.GetOwner(); err != nil {
  729. ctx.ServerError("HeadRepo.GetOwner", err)
  730. return
  731. }
  732. perm, err := models.GetUserRepoPermission(pr.HeadRepo, ctx.User)
  733. if err != nil {
  734. ctx.ServerError("GetUserRepoPermission", err)
  735. return
  736. }
  737. if !perm.CanWrite(models.UnitTypeCode) {
  738. ctx.NotFound("CleanUpPullRequest", nil)
  739. return
  740. }
  741. fullBranchName := pr.HeadRepo.Owner.Name + "/" + pr.HeadBranch
  742. gitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  743. if err != nil {
  744. ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.HeadRepo.RepoPath()), err)
  745. return
  746. }
  747. gitBaseRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
  748. if err != nil {
  749. ctx.ServerError(fmt.Sprintf("OpenRepository[%s]", pr.BaseRepo.RepoPath()), err)
  750. return
  751. }
  752. defer func() {
  753. ctx.JSON(200, map[string]interface{}{
  754. "redirect": pr.BaseRepo.Link() + "/pulls/" + com.ToStr(issue.Index),
  755. })
  756. }()
  757. if pr.HeadBranch == pr.HeadRepo.DefaultBranch || !gitRepo.IsBranchExist(pr.HeadBranch) {
  758. ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
  759. return
  760. }
  761. // Check if branch is not protected
  762. if protected, err := pr.HeadRepo.IsProtectedBranch(pr.HeadBranch, ctx.User); err != nil || protected {
  763. if err != nil {
  764. log.Error("HeadRepo.IsProtectedBranch: %v", err)
  765. }
  766. ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
  767. return
  768. }
  769. // Check if branch has no new commits
  770. headCommitID, err := gitBaseRepo.GetRefCommitID(pr.GetGitRefName())
  771. if err != nil {
  772. log.Error("GetRefCommitID: %v", err)
  773. ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
  774. return
  775. }
  776. branchCommitID, err := gitRepo.GetBranchCommitID(pr.HeadBranch)
  777. if err != nil {
  778. log.Error("GetBranchCommitID: %v", err)
  779. ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
  780. return
  781. }
  782. if headCommitID != branchCommitID {
  783. ctx.Flash.Error(ctx.Tr("repo.branch.delete_branch_has_new_commits", fullBranchName))
  784. return
  785. }
  786. if err := gitRepo.DeleteBranch(pr.HeadBranch, git.DeleteBranchOptions{
  787. Force: true,
  788. }); err != nil {
  789. log.Error("DeleteBranch: %v", err)
  790. ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
  791. return
  792. }
  793. if err := models.AddDeletePRBranchComment(ctx.User, pr.BaseRepo, issue.ID, pr.HeadBranch); err != nil {
  794. // Do not fail here as branch has already been deleted
  795. log.Error("DeleteBranch: %v", err)
  796. }
  797. ctx.Flash.Success(ctx.Tr("repo.branch.deletion_success", fullBranchName))
  798. }
  799. // DownloadPullDiff render a pull's raw diff
  800. func DownloadPullDiff(ctx *context.Context) {
  801. issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  802. if err != nil {
  803. if models.IsErrIssueNotExist(err) {
  804. ctx.NotFound("GetIssueByIndex", err)
  805. } else {
  806. ctx.ServerError("GetIssueByIndex", err)
  807. }
  808. return
  809. }
  810. // Return not found if it's not a pull request
  811. if !issue.IsPull {
  812. ctx.NotFound("DownloadPullDiff",
  813. fmt.Errorf("Issue is not a pull request"))
  814. return
  815. }
  816. if err = issue.LoadPullRequest(); err != nil {
  817. ctx.ServerError("LoadPullRequest", err)
  818. return
  819. }
  820. pr := issue.PullRequest
  821. if err = pr.GetBaseRepo(); err != nil {
  822. ctx.ServerError("GetBaseRepo", err)
  823. return
  824. }
  825. patch, err := pr.BaseRepo.PatchPath(pr.Index)
  826. if err != nil {
  827. ctx.ServerError("PatchPath", err)
  828. return
  829. }
  830. ctx.ServeFileContent(patch)
  831. }
  832. // DownloadPullPatch render a pull's raw patch
  833. func DownloadPullPatch(ctx *context.Context) {
  834. issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
  835. if err != nil {
  836. if models.IsErrIssueNotExist(err) {
  837. ctx.NotFound("GetIssueByIndex", err)
  838. } else {
  839. ctx.ServerError("GetIssueByIndex", err)
  840. }
  841. return
  842. }
  843. // Return not found if it's not a pull request
  844. if !issue.IsPull {
  845. ctx.NotFound("DownloadPullDiff",
  846. fmt.Errorf("Issue is not a pull request"))
  847. return
  848. }
  849. if err = issue.LoadPullRequest(); err != nil {
  850. ctx.ServerError("LoadPullRequest", err)
  851. return
  852. }
  853. pr := issue.PullRequest
  854. if err = pr.GetHeadRepo(); err != nil {
  855. ctx.ServerError("GetHeadRepo", err)
  856. return
  857. }
  858. headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
  859. if err != nil {
  860. ctx.ServerError("OpenRepository", err)
  861. return
  862. }
  863. patch, err := headGitRepo.GetFormatPatch(pr.MergeBase, pr.HeadBranch)
  864. if err != nil {
  865. ctx.ServerError("GetFormatPatch", err)
  866. return
  867. }
  868. _, err = io.Copy(ctx, patch)
  869. if err != nil {
  870. ctx.ServerError("io.Copy", err)
  871. return
  872. }
  873. }