gitea

Commit Graph

Author	SHA1	Message	Date
zeripath	99a364a9dc	Generate Diff and Patch direct from Pull head (#10936 ) (#10938 ) Backport #10936 * Generate Diff and Patch direct from Pull head Fix #10932 Also fix "Empty Diff/Patch File when pull is merged" Closes #10934 * Add tests to ensure that diff does not change * Ensure diffs and pulls pages work if head branch is deleted too Signed-off-by: Andrew Thornton <art27@cantab.net>	5 years ago
zeripath	0d515474b8	Remove stray printf (#9631 )	5 years ago
zeripath	74179d1b5e	Remove SavePatch and generate patches on the fly (#9302 ) * Save patches to temporary files * Remove SavePatch and generate patches on the fly * Use ioutil.TempDir * fixup! Use ioutil.TempDir * fixup! fixup! Use ioutil.TempDir * RemoveAll LocalCopyPath() in initIntergrationTest * Default to status checking on PR creation * Remove unnecessary set to StatusChecking * Protect against unable to load repo * Handle conflicts * Restore original conflict setting * In TestPullRequests update status to StatusChecking before running TestPatch	5 years ago

Author

SHA1

Message

Date

zeripath

99a364a9dc

Generate Diff and Patch direct from Pull head (#10936 ) (#10938 )

Backport #10936

* Generate Diff and Patch direct from Pull head

Fix #10932
Also fix "Empty Diff/Patch File when pull is merged"

Closes #10934

* Add tests to ensure that diff does not change
* Ensure diffs and pulls pages work if head branch is deleted too

Signed-off-by: Andrew Thornton <art27@cantab.net>

5 years ago

zeripath

0d515474b8

Remove stray printf (#9631 )

5 years ago

zeripath

74179d1b5e

Remove SavePatch and generate patches on the fly (#9302 )

* Save patches to temporary files

* Remove SavePatch and generate patches on the fly

* Use ioutil.TempDir

* fixup! Use ioutil.TempDir

* fixup! fixup! Use ioutil.TempDir

* RemoveAll LocalCopyPath() in initIntergrationTest

* Default to status checking on PR creation

* Remove unnecessary set to StatusChecking

* Protect against unable to load repo

* Handle conflicts

* Restore original conflict setting

* In TestPullRequests update status to StatusChecking before running TestPatch

5 years ago

3 Commits (e11b3a10760aceb318a6c39042f30854d62d23ad)