mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-03 00:02:43 +02:00
work on PR conversation
This commit is contained in:
Unknwon committed
1 parent
63fecac537
commit
8c046073a8
20 files changed
+784
-303
No files matched your search
@@ -4364,7 +4364,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xfd\x72\xdc\x48\x8e\xe7\xff\x7c\x0a\xb6\x37\x7c\xee\x8e\x90\xcb\xd1\xdd\x71\x1f\xd1\x61\xbb\x4f\x96\xda\x1f\xb3\x96\xa5\xb5\xe4\x99\x9b\x73\x38\xd8\xac\x22\xab\x8a\xe3\x2a\xb2\x9a\x64\xb9\xac\xd9\xd8\x88\x7b\x8d\x7b\xbd\x7b\x92\x03\x7e\x00\xf2\x83\x64\xc9\xf6\xec\xc6\xdd\x3f\x12\x2b\x13\xf9\x85\x44\x22\x01\x24\x12\x99\xef\x76\x59\x51\x76\x8b\xf4\x49\x7a\x9a\xee\xf2\xaa\xde\x94\x5d\x97\x76\xe5\x66\xf9\x70\xdd\x74\x7d\x59\xa4\x2f\xaa\x9e\x7e\xb7\x9f\xaa\x45\x99\x24\xeb\x66\x5b\x12\xe8\x4b\xfa\x97\x14\x79\xb7\x9e\x37\x79\x5b\x50\xc2\xb9\x7d\x27\xe5\xe7\xdd\xa6\x69\x19\xe8\x37\xf9\x4a\xd6\xe5\x66\xc7\x65\xe8\x5f\xd2\x55\xab\x3a\xab\x6a\xfa\x79\x4d\x5f\xe9\xab\x3a\xe9\x9a\x45\x95\x6f\xb2\x20\x03\x09\x96\xff\x4b\xfa\x53\x5d\xa4\xd7\x7d\xb9\x4b\x1f\x77\xdb\x7c\xb3\x79\x9a\x77\x28\xd2\x97\x69\xbe\x58\x34\xfb\xba\x7f\xfc\x48\x32\xa4\xf2\x66\xdf\x5b\xed\x97\xfb\x5e\xd2\xf6\x3b\x4b\x7a\xb7\x4b\xda\x72\x55\xd1\xc0\x5a\x4a\x7a\xab\x9f\xc9\xa1\x9c\x77\x55\xcf\x9d\xfe\x8b\x7c\x25\x9f\xca\xb6\xab\x1a\xee\xcf\x9f\xe5\x2b\xd9\xe5\x2b\x06\xb8\xa2\x7f\x49\x5f\x6e\x77\x9b\x1c\x05\x6e\xf4\x33\xd9\xe4\xf5\x6a\x2f\x30\xaf\xf5\x33\x59\xb4\x25\x65\x65\x75\x79\xa0\xd4\x33\xfc\x48\xe9\xc7\x6c\x36\x4b\xf6\x84\xd3\x6c\xd7\x36\xcb\x6a\x53\x66\x79\x5d\x64\x5b\xc1\xda\x3b\x4a\x4f\x35\x3d\xa5\xf4\x94\xd3\x31\x8c\xb2\x20\x04\x65\x79\xa7\x63\xa1\xa9\x21\x7c\xe5\x5d\x82\xaa\xea\x7c\x6b\xa5\xf9\x33\x29\xb7\x79\xb5\xe1\x49\x78\xc8\x1f\xd4\xf9\xae\x3b\x34\x98\xaa\x2b\xfd\x24\x44\x64\xfd\xed\xae\x04\x1e\x1e\xde\xd0\x57\xb2\xc8\x77\xfd\x62\x9d\x73\x5f\xe5\x2b\x21\xa0\x5d\x43\x08\x69\xda\x5b\xc0\xd9\x8f\xa4\x69\x57\x79\x5d\xfd\x3d\xef\x05\x49\x97\xc1\xcf\x64\x5b\xb5\x6d\xc3\xf8\xbd\xc0\x47\x42\x23\xce\xb8\x1e\x4a\x79\x43\x98\x08\x6a\xe1\x9c\x6d\xb5\x6a\x05\x95\x9c\x79\x81\x5f\x5c\x0b\xe7\x2d\x9b\xf6\xa3\x66\x3c\xe7\xcf\x41\x51\xea\x84\xe6\xc6\xed\xe7\x35\x21\x5f\x73\x2f\xf0\x23\x02\xe8\x92\xbc\xd8\x12\x2a\x77\x79\x5d\x32\x8e\x4e\xf9\x17\xe1\x85\x7e\x25\x4a\x53\x59\x57\xf6\x7d\x55\xaf\x18\xd9\xa7\x92\x94\x5e\x6b\x52\x12\xe4\xb9\xb4\xdb\x66\xef\xa6\x93\xd2\xff\x4a\x3f\xd3\x2b\xf9\x29\x79\x41\x21\x64\xba\x92\x3c\x92\x2e\x5b\x96\x65\x21\x63\xe9\xd2\xe7\xf4\x9d\xec\xf6\x9b\x0d\x61\xed\x8f\x7d\xd9\xf5\x5c\xe8\x8a\x7e\xd3\xf8\xe5\x77\x52\x75\x1d\x7d\x50\xf2\x2b\x7c\x24\x34\x75\xf5\x02\x83\x39\xc3\x47\x92\xbc\xef\xca\xbc\x5d\xac\x3f\x24\xf2\x1f\x7d\xe5\x0f\xa6\xbd\x63\x93\xca\x84\xa4\x44\x24\x2d\x58\x03\xc9\xa2\x29\xf8\xc7\x19\xfd\xa3\xaa\xab\xba\xeb\x69\xc5\x7d\x48\xf4\x83\xc1\xe4\x4b\x26\xa0\xaf\x7a\x60\x41\x13\xb1\x7c\x3b\x9e\xc1\xf4\x79\xd5\x76\xfd\xc3\xbe\x22\x62\x7d\xbb\xaf\x13\x1e\x1f\xad\xb6\xac\x98\x1b\x13\x7a\xd1\x10\x8a\x90\xdc\xd2\xf8\x2e\x6e\xaf\xff\xe5\xf5\x49\x7a\x45\x9c\x68\xd5\x96\xf4\x9d\x52\x1d\xf4\x8f\xca\xfc\x3c\x4b\xa8\x94\xb5\x74\x9e\xf7\xf9\x3c\xef\x4a\x8f\x56\xce\x14\xea\x76\x79\xa0\x71\xe6\x6a\xe0\x60\x5d\x1f\x8d\x77\x6a\x85\x50\x1d\xba\xae\x5c\x1d\x6f\x78\x71\x51\x3a\x33\x35\x14\xbe\xda\x94\x9c\x4e\x55\xa5\xaf\xde\xbc\xb9\x3c\x7f\x96\x96\xf5\xaa\xaa\xcb\xf4\x50\xf5\xeb\x74\xdf\x2f\xff\x5b\xb6\x2a\xeb\xb2\x25\x1e\xb7\xa8\x52\x5a\x53\x2d\x51\x42\x4a\x84\x2d\x83\x9b\x25\x5d\xb7\xa1\xb5\x0f\xf4\x5e\x5f\xbf\x4e\x2f\x18\xc5\xbb\xbc\x5f\xa3\x23\xfd\x3a\xe9\xfe\xd8\x30\x8a\x5c\x83\x37\xeb\x32\x05\x95\x01\xa8\x59\x1a\x3e\xd2\x42\xfb\x38\x4b\xca\xb6\xcd\x88\x2d\xf5\xb7\x99\x16\xd6\xfa\x86\x90\x52\x05\x91\x4e\xdd\xf4\xe9\xbc\x4c\x51\x66\x96\x24\xd6\x61\xc3\xee\xe9\x6e\xb7\xa9\x16\xb2\xd6\x5f\x48\x9e\x47\x34\xef\x20\x8a\xa5\x10\x0e\x88\xb2\xbc\x00\x5d\xc4\x9e\x79\x3d\xa4\x11\x03\x41\xf9\x75\x49\x0c\x70\xbd\x5f\x09\xdb\xdb\x34\xfb\xe2\x3b\x50\xaa\xf5\xde\x13\x6a\xfa\xb6\xa1\x0e\x03\x3b\x0e\xc0\x37\x71\x4a\x14\xc7\x9b\x56\x5b\x6e\x1b\xe2\x2b\x8e\xd8\x2b\x22\xa8\x43\x45\x99\x34\xd2\x2e\xff\x44\xeb\xad\x6f\xd2\x7e\x5d\x75\x69\x41\xc4\xb6\xe0\x8a\x69\x69\xec\x69\xbb\x10\xb2\x20\x02\x15\xd2\xb0\xb4\x78\x0e\x00\xb5\xdd\x13\x35\xad\xa9\x32\xde\x8c\x78\xe7\xa4\x2a\xa7\xfa\x89\x21\x51\x3d\xa0\x6f\xa2\xdc\x86\xb8\x32\xf3\xcd\x73\x7c\xe8\xef\xb0\x7e\xea\x55\xbe\x5c\x52\xaf\x3a\xa2\x8a\x97\xe9\x62\xd3\x10\x49\xbd\x7b\xfb\xba\x63\x82\x59\x67\xbb\xa6\xc5\x36\x47\x59\x57\xf4\xe9\xd2\x02\x44\x33\x44\xbd\xdf\xce\xe9\xd7\x61\x5d\x11\x07\x00\xda\xb9\x04\xef\xe6\x94\x4a\x4d\xec\x3b\x9a\xc2\x93\x94\x48\x98\x46\x40\x28\x03\x01\xf0\x18\x8a\xaa\xcb\xe7\x34\xf7\x0c\xbe\xa4\x6d\x6b\xdf\x12\x59\xad\xfb\x7e\x67\x2d\xbf\xbc\xb9\xb9\x92\xa6\x5d\xea\x5d\x6d\xe7\x01\x65\x60\x0e\x36\xbc\xf1\xd6\x69\x53\xcf\x40\x24\xfb\x76\x33\xa0\x1f\x1a\xab\xe5\x1c\xc1\x0b\x77\xe1\x11\xff\xb9\xf6\xe8\x01\x9e\x3b\x92\x4e\x0e\xa0\x26\xc2\x71\x89\x0d\x90\x88\xba\xd9\x71\xbd\x01\x55\x5f\x6a\x82\x27\x65\x6c\x9a\x2e\x5f\xb6\x4e\xca\x85\xec\x13\xb0\xff\x2d\x0d\x58\xd9\xc8\xf5\x05\xa1\x01\xbc\x04\xa9\xcb\xb6\xd9\x52\xea\x73\xfa\xe7\x13\x7c\xf7\x2f\xb8\x3e\xc0\xe4\x45\x41\xfc\xad\x3b\x49\xdf\x3e\x3f\x4b\xff\xf3\xcf\x3f\xfd\x34\x4b\x5f\xf5\xbc\x12\x99\x38\xff\xc6\x44\x45\x9f\xb2\x87\x3b\x50\x62\x19\x3d\xd1\xdd\x3Line truncated
|
||||
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\x7d\xfd\x72\xdc\x48\x8e\xe7\xff\x7c\x0a\xb6\x37\x7c\xee\x8e\x90\xcb\xd1\xdd\x71\x1f\xd1\x61\xbb\x4f\x96\xda\x1f\xb3\x96\xa5\xb5\xe4\x99\x9b\x73\x38\xd8\xac\x22\xab\x8a\xe3\x2a\xb2\x9a\x64\xb9\xac\xd9\xd8\x88\x7b\x8d\x7b\xbd\x7b\x92\x03\x7e\x00\xf2\x83\x64\xc9\xf6\xec\xc6\xdd\x3f\x12\x2b\x13\xf9\x85\x44\x22\x01\x24\x12\x99\xef\x76\x59\x51\x76\x8b\xf4\x49\x7a\x9a\xee\xf2\xaa\xde\x94\x5d\x97\x76\xe5\x66\xf9\x70\xdd\x74\x7d\x59\xa4\x2f\xaa\x9e\x7e\xb7\x9f\xaa\x45\x99\x24\xeb\x66\x5b\x12\xe8\x4b\xfa\x97\x14\x79\xb7\x9e\x37\x79\x5b\x50\xc2\xb9\x7d\x27\xe5\xe7\xdd\xa6\x69\x19\xe8\x37\xf9\x4a\xd6\xe5\x66\xc7\x65\xe8\x5f\xd2\x55\xab\x3a\xab\x6a\xfa\x79\x4d\x5f\xe9\xab\x3a\xe9\x9a\x45\x95\x6f\xb2\x20\x03\x09\x96\xff\x4b\xfa\x53\x5d\xa4\xd7\x7d\xb9\x4b\x1f\x77\xdb\x7c\xb3\x79\x9a\x77\x28\xd2\x97\x69\xbe\x58\x34\xfb\xba\x7f\xfc\x48\x32\xa4\xf2\x66\xdf\x5b\xed\x97\xfb\x5e\xd2\xf6\x3b\x4b\x7a\xb7\x4b\xda\x72\x55\xd1\xc0\x5a\x4a\x7a\xab\x9f\xc9\xa1\x9c\x77\x55\xcf\x9d\xfe\x8b\x7c\x25\x9f\xca\xb6\xab\x1a\xee\xcf\x9f\xe5\x2b\xd9\xe5\x2b\x06\xb8\xa2\x7f\x49\x5f\x6e\x77\x9b\x1c\x05\x6e\xf4\x33\xd9\xe4\xf5\x6a\x2f\x30\xaf\xf5\x33\x59\xb4\x25\x65\x65\x75\x79\xa0\xd4\x33\xfc\x48\xe9\xc7\x6c\x36\x4b\xf6\x84\xd3\x6c\xd7\x36\xcb\x6a\x53\x66\x79\x5d\x64\x5b\xc1\xda\x3b\x4a\x4f\x35\x3d\xa5\xf4\x94\xd3\x31\x8c\xb2\x20\x04\x65\x79\xa7\x63\xa1\xa9\x21\x7c\xe5\x5d\x82\xaa\xea\x7c\x6b\xa5\xf9\x33\x29\xb7\x79\xb5\xe1\x49\x78\xc8\x1f\xd4\xf9\xae\x3b\x34\x98\xaa\x2b\xfd\x24\x44\x64\xfd\xed\xae\x04\x1e\x1e\xde\xd0\x57\xb2\xc8\x77\xfd\x62\x9d\x73\x5f\xe5\x2b\x21\xa0\x5d\x43\x08\x69\xda\x5b\xc0\xd9\x8f\xa4\x69\x57\x79\x5d\xfd\x3d\xef\x05\x49\x97\xc1\xcf\x64\x5b\xb5\x6d\xc3\xf8\xbd\xc0\x47\x42\x23\xce\xb8\x1e\x4a\x79\x43\x98\x08\x6a\xe1\x9c\x6d\xb5\x6a\x05\x95\x9c\x79\x81\x5f\x5c\x0b\xe7\x2d\x9b\xf6\xa3\x66\x3c\xe7\xcf\x41\x51\xea\x84\xe6\xc6\xed\xe7\x35\x21\x5f\x73\x2f\xf0\x23\x02\xe8\x92\xbc\xd8\x12\x2a\x77\x79\x5d\x32\x8e\x4e\xf9\x17\xe1\x85\x7e\x25\x4a\x53\x59\x57\xf6\x7d\x55\xaf\x18\xd9\xa7\x92\x94\x5e\x6b\x52\x12\xe4\xb9\xb4\xdb\x66\xef\xa6\x93\xd2\xff\x4a\x3f\xd3\x2b\xf9\x29\x79\x41\x21\x64\xba\x92\x3c\x92\x2e\x5b\x96\x65\x21\x63\xe9\xd2\xe7\xf4\x9d\xec\xf6\x9b\x0d\x61\xed\x8f\x7d\xd9\xf5\x5c\xe8\x8a\x7e\xd3\xf8\xe5\x77\x52\x75\x1d\x7d\x50\xf2\x2b\x7c\x24\x34\x75\xf5\x02\x83\x39\xc3\x47\x92\xbc\xef\xca\xbc\x5d\xac\x3f\x24\xf2\x1f\x7d\xe5\x0f\xa6\xbd\x63\x93\xca\x84\xa4\x44\x24\x2d\x58\x03\xc9\xa2\x29\xf8\xc7\x19\xfd\xa3\xaa\xab\xba\xeb\x69\xc5\x7d\x48\xf4\x83\xc1\xe4\x4b\x26\xa0\xaf\x7a\x60\x41\x13\xb1\x7c\x3b\x9e\xc1\xf4\x79\xd5\x76\xfd\xc3\xbe\x22\x62\x7d\xbb\xaf\x13\x1e\x1f\xad\xb6\xac\x98\x1b\x13\x7a\xd1\x10\x8a\x90\xdc\xd2\xf8\x2e\x6e\xaf\xff\xe5\xf5\x49\x7a\x45\x9c\x68\xd5\x96\xf4\x9d\x52\x1d\xf4\x8f\xca\xfc\x3c\x4b\xa8\x94\xb5\x74\x9e\xf7\xf9\x3c\xef\x4a\x8f\x56\xce\x14\xea\x76\x79\xa0\x71\xe6\x6a\xe0\x60\x5d\x1f\x8d\x77\x6a\x85\x50\x1d\xba\xae\x5c\x1d\x6f\x78\x71\x51\x3a\x33\x35\x14\xbe\xda\x94\x9c\x4e\x55\xa5\xaf\xde\xbc\xb9\x3c\x7f\x96\x96\xf5\xaa\xaa\xcb\xf4\x50\xf5\xeb\x74\xdf\x2f\xff\x5b\xb6\x2a\xeb\xb2\x25\x1e\xb7\xa8\x52\x5a\x53\x2d\x51\x42\x4a\x84\x2d\x83\x9b\x25\x5d\xb7\xa1\xb5\x0f\xf4\x5e\x5f\xbf\x4e\x2f\x18\xc5\xbb\xbc\x5f\xa3\x23\xfd\x3a\xe9\xfe\xd8\x30\x8a\x5c\x83\x37\xeb\x32\x05\x95\x01\xa8\x59\x1a\x3e\xd2\x42\xfb\x38\x4b\xca\xb6\xcd\x88\x2d\xf5\xb7\x99\x16\xd6\xfa\x86\x90\x52\x05\x91\x4e\xdd\xf4\xe9\xbc\x4c\x51\x66\x96\x24\xd6\x61\xc3\xee\xe9\x6e\xb7\xa9\x16\xb2\xd6\x5f\x48\x9e\x47\x34\xef\x20\x8a\xa5\x10\x0e\x88\xb2\xbc\x00\x5d\xc4\x9e\x79\x3d\xa4\x11\x03\x41\xf9\x75\x49\x0c\x70\xbd\x5f\x09\xdb\xdb\x34\xfb\xe2\x3b\x50\xaa\xf5\xde\x13\x6a\xfa\xb6\xa1\x0e\x03\x3b\x0e\xc0\x37\x71\x4a\x14\xc7\x9b\x56\x5b\x6e\x1b\xe2\x2b\x8e\xd8\x2b\x22\xa8\x43\x45\x99\x34\xd2\x2e\xff\x44\xeb\xad\x6f\xd2\x7e\x5d\x75\x69\x41\xc4\xb6\xe0\x8a\x69\x69\xec\x69\xbb\x10\xb2\x20\x02\x15\xd2\xb0\xb4\x78\x0e\x00\xb5\xdd\x13\x35\xad\xa9\x32\xde\x8c\x78\xe7\xa4\x2a\xa7\xfa\x89\x21\x51\x3d\xa0\x6f\xa2\xdc\x86\xb8\x32\xf3\xcd\x73\x7c\xe8\xef\xb0\x7e\xea\x55\xbe\x5c\x52\xaf\x3a\xa2\x8a\x97\xe9\x62\xd3\x10\x49\xbd\x7b\xfb\xba\x63\x82\x59\x67\xbb\xa6\xc5\x36\x47\x59\x57\xf4\xe9\xd2\x02\x44\x33\x44\xbd\xdf\xce\xe9\xd7\x61\x5d\x11\x07\x00\xda\xb9\x04\xef\xe6\x94\x4a\x4d\xec\x3b\x9a\xc2\x93\x94\x48\x98\x46\x40\x28\x03\x01\xf0\x18\x8a\xaa\xcb\xe7\x34\xf7\x0c\xbe\xa4\x6d\x6b\xdf\x12\x59\xad\xfb\x7e\x67\x2d\xbf\xbc\xb9\xb9\x92\xa6\x5d\xea\x5d\x6d\xe7\x01\x65\x60\x0e\x36\xbc\xf1\xd6\x69\x53\xcf\x40\x24\xfb\x76\x33\xa0\x1f\x1a\xab\xe5\x1c\xc1\x0b\x77\xe1\x11\xff\xb9\xf6\xe8\x01\x9e\x3b\x92\x4e\x0e\xa0\x26\xc2\x71\x89\x0d\x90\x88\xba\xd9\x71\xbd\x01\x55\x5f\x6a\x82\x27\x65\x6c\x9a\x2e\x5f\xb6\x4e\xca\x85\xec\x13\xb0\xff\x2d\x0d\x58\xd9\xc8\xf5\x05\xa1\x01\xbc\x04\xa9\xcb\xb6\xd9\x52\xea\x73\xfa\xe7\x13\x7c\xf7\x2f\xb8\x3e\xc0\xe4\x45\x41\xfc\xad\x3b\x49\xdf\x3e\x3f\x4b\xff\xf3\xcf\x3f\xfd\x34\x4b\x5f\xf5\xbc\x12\x99\x38\xff\xc6\x44\x45\x9f\xb2\x87\x3b\x50\x62\x19\x3d\xd1\xdd\x3Line truncated
|
||||
|
||||
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
@@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 40911, mode: os.FileMode(420), modTime: time.Unix(1441119631, 0)}
|
||||
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 41009, mode: os.FileMode(420), modTime: time.Unix(1441146568, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
// Copyright 2015 The Gogs Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package git
|
||||
|
||||
import (
|
||||
"container/list"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Unknwon/com"
|
||||
)
|
||||
|
||||
type PullRequestInfo struct {
|
||||
MergeBase string
|
||||
Commits *list.List
|
||||
// Diff *Diff
|
||||
NumFiles int
|
||||
}
|
||||
|
||||
// GetPullRequestInfo generates and returns pull request information
|
||||
// between base and head branches of repositories.
|
||||
func (repo *Repository) GetPullRequestInfo(basePath, baseBranch, headBranch string) (*PullRequestInfo, error) {
|
||||
// Add a temporary remote.
|
||||
tmpRemote := com.ToStr(time.Now().UnixNano())
|
||||
_, stderr, err := com.ExecCmdDir(repo.Path, "git", "remote", "add", "-f", tmpRemote, basePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("add base as remote: %v", concatenateError(err, stderr))
|
||||
}
|
||||
defer func() {
|
||||
com.ExecCmdDir(repo.Path, "git", "remote", "remove", tmpRemote)
|
||||
}()
|
||||
|
||||
prInfo := new(PullRequestInfo)
|
||||
|
||||
var stdout string
|
||||
remoteBranch := "remotes/" + tmpRemote + "/" + baseBranch
|
||||
// Get merge base commit.
|
||||
stdout, stderr, err = com.ExecCmdDir(repo.Path, "git", "merge-base", remoteBranch, headBranch)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("get merge base: %v", concatenateError(err, stderr))
|
||||
}
|
||||
prInfo.MergeBase = strings.TrimSpace(stdout)
|
||||
|
||||
stdout, stderr, err = com.ExecCmdDir(repo.Path, "git", "log", remoteBranch+"..."+headBranch, prettyLogFormat)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("list diff logs: %v", concatenateError(err, stderr))
|
||||
}
|
||||
prInfo.Commits, err = parsePrettyFormatLog(repo, []byte(stdout))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parsePrettyFormatLog: %v", err)
|
||||
}
|
||||
|
||||
// Count number of changed files.
|
||||
stdout, stderr, err = com.ExecCmdDir(repo.Path, "git", "diff", "--name-only", remoteBranch+"..."+headBranch)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("list changed files: %v", concatenateError(err, stderr))
|
||||
}
|
||||
prInfo.NumFiles = len(strings.Split(stdout, "\n")) - 1
|
||||
|
||||
return prInfo, nil
|
||||
}
|
||||
|
||||
// GetPatch generates and returns patch data between given branches.
|
||||
func (repo *Repository) GetPatch(basePath, baseBranch, headBranch string) ([]byte, error) {
|
||||
// Add a temporary remote.
|
||||
tmpRemote := com.ToStr(time.Now().UnixNano())
|
||||
_, stderr, err := com.ExecCmdDirBytes(repo.Path, "git", "remote", "add", "-f", tmpRemote, basePath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("add base as remote: %v", concatenateError(err, string(stderr)))
|
||||
}
|
||||
defer func() {
|
||||
com.ExecCmdDir(repo.Path, "git", "remote", "remove", tmpRemote)
|
||||
}()
|
||||
|
||||
var stdout []byte
|
||||
remoteBranch := "remotes/" + tmpRemote + "/" + baseBranch
|
||||
stdout, stderr, err = com.ExecCmdDirBytes(repo.Path, "git", "diff", "-p", remoteBranch, headBranch)
|
||||
if err != nil {
|
||||
return nil, concatenateError(err, string(stderr))
|
||||
}
|
||||
|
||||
return stdout, nil
|
||||
}
|
||||
Reference in new issue
Block a user