mirror of
				https://gitea.com/gitea/tea.git
				synced 2025-10-31 09:15:26 +01:00 
			
		
		
		
	migrate src-d/go-git -> go-git/go-git (#128)
Merge branch 'master' into vendor-migrate-go-git Merge branch 'master' into vendor-migrate-go-git migrate src-d/go-git -> go-git/go-git Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitea/tea/pulls/128 Reviewed-by: techknowlogick <techknowlogick@gitea.io> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
		| @@ -13,9 +13,9 @@ import ( | ||||
| 	local_git "code.gitea.io/tea/modules/git" | ||||
|  | ||||
| 	"code.gitea.io/sdk/gitea" | ||||
| 	"github.com/go-git/go-git/v5" | ||||
| 	git_config "github.com/go-git/go-git/v5/config" | ||||
| 	"github.com/urfave/cli/v2" | ||||
| 	"gopkg.in/src-d/go-git.v4" | ||||
| 	git_config "gopkg.in/src-d/go-git.v4/config" | ||||
| ) | ||||
|  | ||||
| // CmdPulls is the main command to operate on PRs | ||||
|   | ||||
							
								
								
									
										4
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								go.mod
									
									
									
									
									
								
							| @@ -7,12 +7,12 @@ require ( | ||||
| 	gitea.com/jolheiser/gitea-vet v0.1.0 | ||||
| 	github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195 | ||||
| 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect | ||||
| 	github.com/go-git/go-git/v5 v5.0.0 | ||||
| 	github.com/mattn/go-runewidth v0.0.4 // indirect | ||||
| 	github.com/olekukonko/tablewriter v0.0.1 | ||||
| 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 | ||||
| 	github.com/stretchr/testify v1.4.0 | ||||
| 	github.com/urfave/cli/v2 v2.1.1 | ||||
| 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 | ||||
| 	gopkg.in/src-d/go-git.v4 v4.13.1 | ||||
| 	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 | ||||
| 	gopkg.in/yaml.v2 v2.2.8 | ||||
| ) | ||||
|   | ||||
							
								
								
									
										53
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										53
									
								
								go.sum
									
									
									
									
									
								
							| @@ -15,7 +15,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY | ||||
| github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= | ||||
| github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= | ||||
| github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= | ||||
| github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= | ||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | ||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| @@ -25,6 +25,14 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjr | ||||
| github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= | ||||
| github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= | ||||
| github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= | ||||
| github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= | ||||
| github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= | ||||
| github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= | ||||
| github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= | ||||
| github.com/go-git/go-git-fixtures/v4 v4.0.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp/pqnefH+Bc= | ||||
| github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= | ||||
| github.com/go-git/go-git/v5 v5.0.0 h1:k5RWPm4iJwYtfWoxIJy4wJX9ON7ihPeZZYC1fLYDnpg= | ||||
| github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmClfZwtUVA= | ||||
| github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= | ||||
| github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | ||||
| github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= | ||||
| @@ -37,35 +45,31 @@ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT | ||||
| github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= | ||||
| github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= | ||||
| github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||
| github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= | ||||
| github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | ||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||
| github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= | ||||
| github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= | ||||
| github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= | ||||
| github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= | ||||
| github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= | ||||
| github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= | ||||
| github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= | ||||
| github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= | ||||
| github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= | ||||
| github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | ||||
| github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= | ||||
| github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= | ||||
| github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= | ||||
| github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= | ||||
| github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= | ||||
| github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= | ||||
| github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= | ||||
| github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= | ||||
| github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= | ||||
| github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= | ||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||
| github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= | ||||
| github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= | ||||
| github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= | ||||
| github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | ||||
| github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= | ||||
| github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= | ||||
| github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k= | ||||
| @@ -75,30 +79,27 @@ github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0B | ||||
| github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= | ||||
| golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= | ||||
| golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= | ||||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||
| golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= | ||||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= | ||||
| golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= | ||||
| golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= | ||||
| golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0= | ||||
| golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= | ||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= | ||||
| golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | ||||
| golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224 h1:azwY/v0y0K4mFHVsg5+UrTgchqALYWpqVo6vL5OmkmI= | ||||
| golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= | ||||
| @@ -107,17 +108,13 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T | ||||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= | ||||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= | ||||
| gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= | ||||
| gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= | ||||
| gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= | ||||
| gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= | ||||
| gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= | ||||
| gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= | ||||
| gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= | ||||
| gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
| gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
| gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= | ||||
| gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
|   | ||||
| @@ -14,11 +14,11 @@ import ( | ||||
| 	"path/filepath" | ||||
| 	"strings" | ||||
|  | ||||
| 	git_transport "github.com/go-git/go-git/v5/plumbing/transport" | ||||
| 	gogit_http "github.com/go-git/go-git/v5/plumbing/transport/http" | ||||
| 	gogit_ssh "github.com/go-git/go-git/v5/plumbing/transport/ssh" | ||||
| 	"golang.org/x/crypto/ssh" | ||||
| 	"golang.org/x/crypto/ssh/terminal" | ||||
| 	git_transport "gopkg.in/src-d/go-git.v4/plumbing/transport" | ||||
| 	gogit_http "gopkg.in/src-d/go-git.v4/plumbing/transport/http" | ||||
| 	gogit_ssh "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh" | ||||
| ) | ||||
|  | ||||
| // GetAuthForURL returns the appropriate AuthMethod to be used in Push() / Pull() | ||||
|   | ||||
| @@ -8,10 +8,10 @@ import ( | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
|  | ||||
| 	"gopkg.in/src-d/go-git.v4" | ||||
| 	git_config "gopkg.in/src-d/go-git.v4/config" | ||||
| 	git_plumbing "gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	git_transport "gopkg.in/src-d/go-git.v4/plumbing/transport" | ||||
| 	"github.com/go-git/go-git/v5" | ||||
| 	git_config "github.com/go-git/go-git/v5/config" | ||||
| 	git_plumbing "github.com/go-git/go-git/v5/plumbing" | ||||
| 	git_transport "github.com/go-git/go-git/v5/plumbing/transport" | ||||
| ) | ||||
|  | ||||
| // TeaCreateBranch creates a new branch in the repo, tracking from another branch. | ||||
|   | ||||
| @@ -8,8 +8,8 @@ import ( | ||||
| 	"fmt" | ||||
| 	"net/url" | ||||
|  | ||||
| 	"gopkg.in/src-d/go-git.v4" | ||||
| 	git_config "gopkg.in/src-d/go-git.v4/config" | ||||
| 	"github.com/go-git/go-git/v5" | ||||
| 	git_config "github.com/go-git/go-git/v5/config" | ||||
| ) | ||||
|  | ||||
| // GetRemote tries to match a Remote of the repo via the given URL. | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
| package git | ||||
|  | ||||
| import ( | ||||
| 	"gopkg.in/src-d/go-git.v4" | ||||
| 	"github.com/go-git/go-git/v5" | ||||
| ) | ||||
|  | ||||
| // TeaRepo is a go-git Repository, with an extended high level interface. | ||||
|   | ||||
							
								
								
									
										0
									
								
								vendor/github.com/src-d/gcfg/LICENSE → vendor/github.com/go-git/gcfg/LICENSE
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/github.com/src-d/gcfg/LICENSE → vendor/github.com/go-git/gcfg/LICENSE
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										0
									
								
								vendor/github.com/src-d/gcfg/README → vendor/github.com/go-git/gcfg/README
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/github.com/src-d/gcfg/README → vendor/github.com/go-git/gcfg/README
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										2
									
								
								vendor/github.com/src-d/gcfg/doc.go → vendor/github.com/go-git/gcfg/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/src-d/gcfg/doc.go → vendor/github.com/go-git/gcfg/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -142,4 +142,4 @@ | ||||
| //    - make error context accessible programmatically? | ||||
| //    - limit input size? | ||||
| // | ||||
| package gcfg // import "github.com/src-d/gcfg" | ||||
| package gcfg // import "github.com/go-git/gcfg" | ||||
							
								
								
									
										0
									
								
								vendor/github.com/src-d/gcfg/errors.go → vendor/github.com/go-git/gcfg/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/github.com/src-d/gcfg/errors.go → vendor/github.com/go-git/gcfg/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										0
									
								
								vendor/github.com/src-d/gcfg/go1_0.go → vendor/github.com/go-git/gcfg/go1_0.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/github.com/src-d/gcfg/go1_0.go → vendor/github.com/go-git/gcfg/go1_0.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										0
									
								
								vendor/github.com/src-d/gcfg/go1_2.go → vendor/github.com/go-git/gcfg/go1_2.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/github.com/src-d/gcfg/go1_2.go → vendor/github.com/go-git/gcfg/go1_2.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										4
									
								
								vendor/github.com/src-d/gcfg/read.go → vendor/github.com/go-git/gcfg/read.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/src-d/gcfg/read.go → vendor/github.com/go-git/gcfg/read.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -7,8 +7,8 @@ import ( | ||||
| 	"os" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"github.com/src-d/gcfg/scanner" | ||||
| 	"github.com/src-d/gcfg/token" | ||||
| 	"github.com/go-git/gcfg/scanner" | ||||
| 	"github.com/go-git/gcfg/token" | ||||
| 	"gopkg.in/warnings.v0" | ||||
| ) | ||||
| 
 | ||||
| @@ -11,7 +11,7 @@ import ( | ||||
| ) | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/src-d/gcfg/token" | ||||
| 	"github.com/go-git/gcfg/token" | ||||
| ) | ||||
| 
 | ||||
| // In an ErrorList, an error is represented by an *Error. | ||||
| @@ -19,7 +19,7 @@ import ( | ||||
| ) | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/src-d/gcfg/token" | ||||
| 	"github.com/go-git/gcfg/token" | ||||
| ) | ||||
| 
 | ||||
| // An ErrorHandler may be provided to Scanner.Init. If a syntax error is | ||||
							
								
								
									
										2
									
								
								vendor/github.com/src-d/gcfg/set.go → vendor/github.com/go-git/gcfg/set.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/src-d/gcfg/set.go → vendor/github.com/go-git/gcfg/set.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -10,7 +10,7 @@ import ( | ||||
| 	"unicode" | ||||
| 	"unicode/utf8" | ||||
| 
 | ||||
| 	"github.com/src-d/gcfg/types" | ||||
| 	"github.com/go-git/gcfg/types" | ||||
| 	"gopkg.in/warnings.v0" | ||||
| ) | ||||
| 
 | ||||
| @@ -1,20 +1,21 @@ | ||||
| # go-billy [](https://godoc.org/gopkg.in/src-d/go-billy.v4) [](https://travis-ci.com/src-d/go-billy) [](https://ci.appveyor.com/project/mcuadros/go-billy) [](https://codecov.io/gh/src-d/go-billy) | ||||
| # go-billy [](https://pkg.go.dev/github.com/go-git/go-billy) [](https://github.com/go-git/go-billy/actions?query=workflow%3ATest) | ||||
| 
 | ||||
| The missing interface filesystem abstraction for Go. | ||||
| Billy implements an interface based on the `os` standard library, allowing to develop applications without dependency on the underlying storage. Makes it virtually free to implement mocks and testing over filesystem operations. | ||||
| 
 | ||||
| Billy was born as part of [src-d/go-git](https://github.com/src-d/go-git) project. | ||||
| Billy was born as part of [go-git/go-git](https://github.com/go-git/go-git) project. | ||||
| 
 | ||||
| ## Installation | ||||
| 
 | ||||
| ```go | ||||
| go get -u gopkg.in/src-d/go-billy.v4/... | ||||
| import "github.com/go-git/go-billy/v5" // with go modules enabled (GO111MODULE=on or outside GOPATH) | ||||
| import "github.com/go-git/go-billy" // with go modules disabled | ||||
| ``` | ||||
| 
 | ||||
| ## Usage | ||||
| 
 | ||||
| Billy exposes filesystems using the | ||||
| [`Filesystem` interface](https://godoc.org/github.com/src-d/go-billy#Filesystem). | ||||
| [`Filesystem` interface](https://pkg.go.dev/github.com/go-git/go-billy/v5?tab=doc#Filesystem). | ||||
| Each filesystem implementation gives you a `New` method, whose arguments depend on | ||||
| the implementation itself, that returns a new `Filesystem`. | ||||
| 
 | ||||
							
								
								
									
										0
									
								
								vendor/gopkg.in/src-d/go-billy.v4/fs.go → vendor/github.com/go-git/go-billy/v5/fs.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/gopkg.in/src-d/go-billy.v4/fs.go → vendor/github.com/go-git/go-billy/v5/fs.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										10
									
								
								vendor/github.com/go-git/go-billy/v5/go.mod
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/go-git/go-billy/v5/go.mod
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| module github.com/go-git/go-billy/v5 | ||||
|  | ||||
| require ( | ||||
| 	github.com/kr/text v0.2.0 // indirect | ||||
| 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect | ||||
| 	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 | ||||
| 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f | ||||
| ) | ||||
|  | ||||
| go 1.13 | ||||
							
								
								
									
										14
									
								
								vendor/github.com/go-git/go-billy/v5/go.sum
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								vendor/github.com/go-git/go-billy/v5/go.sum
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||
| github.com/go-git/go-billy v1.0.0 h1:bXR6Zu3opPSg0R4dDxqaLglY4rxw7ja7wS16qSpOKL4= | ||||
| github.com/go-git/go-billy v3.1.0+incompatible h1:dwrJ8G2Jt1srYgIJs+lRjA36qBY68O2Lg5idKG8ef5M= | ||||
| github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||
| github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | ||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| @@ -5,8 +5,8 @@ import ( | ||||
| 	"path/filepath" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"gopkg.in/src-d/go-billy.v4/helper/polyfill" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| 	"github.com/go-git/go-billy/v5/helper/polyfill" | ||||
| ) | ||||
| 
 | ||||
| // ChrootHelper is a helper to implement billy.Chroot. | ||||
| @@ -4,7 +4,7 @@ import ( | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| ) | ||||
| 
 | ||||
| // Polyfill is a helper that implements all missing method from billy.Filesystem. | ||||
| @@ -1,5 +1,5 @@ | ||||
| // Package osfs provides a billy filesystem for the OS. | ||||
| package osfs // import "gopkg.in/src-d/go-billy.v4/osfs" | ||||
| package osfs // import "github.com/go-git/go-billy/v5/osfs" | ||||
| 
 | ||||
| import ( | ||||
| 	"io/ioutil" | ||||
| @@ -7,8 +7,8 @@ import ( | ||||
| 	"path/filepath" | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"gopkg.in/src-d/go-billy.v4/helper/chroot" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| 	"github.com/go-git/go-billy/v5/helper/chroot" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -72,7 +72,7 @@ func (fs *OS) Rename(from, to string) error { | ||||
| 		return err | ||||
| 	} | ||||
| 
 | ||||
| 	return os.Rename(from, to) | ||||
| 	return rename(from, to) | ||||
| } | ||||
| 
 | ||||
| func (fs *OS) MkdirAll(path string, perm os.FileMode) error { | ||||
							
								
								
									
										83
									
								
								vendor/github.com/go-git/go-billy/v5/osfs/os_plan9.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								vendor/github.com/go-git/go-billy/v5/osfs/os_plan9.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,83 @@ | ||||
| package osfs | ||||
|  | ||||
| import ( | ||||
| 	"io" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 	"syscall" | ||||
| ) | ||||
|  | ||||
| func (f *file) Lock() error { | ||||
| 	// Plan 9 uses a mode bit instead of explicit lock/unlock syscalls. | ||||
| 	// | ||||
| 	// Per http://man.cat-v.org/plan_9/5/stat: “Exclusive use files may be open | ||||
| 	// for I/O by only one fid at a time across all clients of the server. If a | ||||
| 	// second open is attempted, it draws an error.” | ||||
| 	// | ||||
| 	// There is no obvious way to implement this function using the exclusive use bit. | ||||
| 	// See https://golang.org/src/cmd/go/internal/lockedfile/lockedfile_plan9.go | ||||
| 	// for how file locking is done by the go tool on Plan 9. | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (f *file) Unlock() error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func rename(from, to string) error { | ||||
| 	// If from and to are in different directories, copy the file | ||||
| 	// since Plan 9 does not support cross-directory rename. | ||||
| 	if filepath.Dir(from) != filepath.Dir(to) { | ||||
| 		fi, err := os.Stat(from) | ||||
| 		if err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
| 		if fi.Mode().IsDir() { | ||||
| 			return &os.LinkError{"rename", from, to, syscall.EISDIR} | ||||
| 		} | ||||
| 		fromFile, err := os.Open(from) | ||||
| 		if err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
| 		toFile, err := os.OpenFile(to, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode()) | ||||
| 		if err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
| 		_, err = io.Copy(toFile, fromFile) | ||||
| 		if err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
|  | ||||
| 		// Copy mtime and mode from original file. | ||||
| 		// We need only one syscall if we avoid os.Chmod and os.Chtimes. | ||||
| 		dir := fi.Sys().(*syscall.Dir) | ||||
| 		var d syscall.Dir | ||||
| 		d.Null() | ||||
| 		d.Mtime = dir.Mtime | ||||
| 		d.Mode = dir.Mode | ||||
| 		if err = dirwstat(to, &d); err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
|  | ||||
| 		// Remove original file. | ||||
| 		err = os.Remove(from) | ||||
| 		if err != nil { | ||||
| 			return &os.LinkError{"rename", from, to, err} | ||||
| 		} | ||||
| 		return nil | ||||
| 	} | ||||
| 	return os.Rename(from, to) | ||||
| } | ||||
|  | ||||
| func dirwstat(name string, d *syscall.Dir) error { | ||||
| 	var buf [syscall.STATFIXLEN]byte | ||||
|  | ||||
| 	n, err := d.Marshal(buf[:]) | ||||
| 	if err != nil { | ||||
| 		return &os.PathError{"dirwstat", name, err} | ||||
| 	} | ||||
| 	if err = syscall.Wstat(name, buf[:n]); err != nil { | ||||
| 		return &os.PathError{"dirwstat", name, err} | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
| @@ -1,8 +1,10 @@ | ||||
| // +build !windows | ||||
| // +build !plan9,!windows | ||||
| 
 | ||||
| package osfs | ||||
| 
 | ||||
| import ( | ||||
| 	"os" | ||||
| 
 | ||||
| 	"golang.org/x/sys/unix" | ||||
| ) | ||||
| 
 | ||||
| @@ -19,3 +21,7 @@ func (f *file) Unlock() error { | ||||
| 
 | ||||
| 	return unix.Flock(int(f.File.Fd()), unix.LOCK_UN) | ||||
| } | ||||
| 
 | ||||
| func rename(from, to string) error { | ||||
| 	return os.Rename(from, to) | ||||
| } | ||||
| @@ -55,3 +55,7 @@ func (f *file) Unlock() error { | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
| 
 | ||||
| func rename(from, to string) error { | ||||
| 	return os.Rename(from, to) | ||||
| } | ||||
| @@ -5,7 +5,7 @@ import ( | ||||
| 	"sort" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| ) | ||||
| 
 | ||||
| // Glob returns the names of all files matching pattern or nil | ||||
| @@ -8,7 +8,7 @@ import ( | ||||
| 	"sync" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| ) | ||||
| 
 | ||||
| // RemoveAll removes path and any children it contains. It removes everything it | ||||
| @@ -12,7 +12,7 @@ is supported by go-git. | ||||
| | init                                  | ✔ | Plain init and `--bare` are supported. Flags `--template`, `--separate-git-dir` and `--shared` are not. | | ||||
| | clone                                 | ✔ | Plain clone and equivalents to `--progress`,  `--single-branch`, `--depth`, `--origin`, `--recurse-submodules` are supported. Others are not. | | ||||
| | **basic snapshotting** | | ||||
| | add                                   | ✔ | Plain add is supported. Any other flag aren't supported | | ||||
| | add                                   | ✔ | Plain add is supported. Any other flags aren't supported | | ||||
| | status                                | ✔ | | ||||
| | commit                                | ✔ | | ||||
| | reset                                 | ✔ | | ||||
| @@ -5,25 +5,12 @@ contributions via GitHub pull requests.  This document outlines some of the | ||||
| conventions on development workflow, commit message formatting, contact points, | ||||
| and other resources to make it easier to get your contribution accepted. | ||||
| 
 | ||||
| ## Certificate of Origin | ||||
| 
 | ||||
| By contributing to this project you agree to the [Developer Certificate of | ||||
| Origin (DCO)](DCO). This document was created by the Linux Kernel community and is a | ||||
| simple statement that you, as a contributor, have the legal right to make the | ||||
| contribution. | ||||
| 
 | ||||
| In order to show your agreement with the DCO you should include at the end of commit message, | ||||
| the following line: `Signed-off-by: John Doe <john.doe@example.com>`, using your real name. | ||||
| 
 | ||||
| This can be done easily using the [`-s`](https://github.com/git/git/blob/b2c150d3aa82f6583b9aadfecc5f8fa1c74aca09/Documentation/git-commit.txt#L154-L161) flag on the `git commit`. | ||||
| 
 | ||||
| ## Support Channels | ||||
| 
 | ||||
| The official support channels, for both users and contributors, are: | ||||
| 
 | ||||
| - [StackOverflow go-git tag](https://stackoverflow.com/questions/tagged/go-git) for user questions. | ||||
| - GitHub [Issues](https://github.com/src-d/go-git/issues)* for bug reports and feature requests. | ||||
| - Slack: #go-git room in the [source{d} Slack](https://join.slack.com/t/sourced-community/shared_invite/enQtMjc4Njk5MzEyNzM2LTFjNzY4NjEwZGEwMzRiNTM4MzRlMzQ4MmIzZjkwZmZlM2NjODUxZmJjNDI1OTcxNDAyMmZlNmFjODZlNTg0YWM) | ||||
| 
 | ||||
| *Before opening a new issue or submitting a new pull request, it's helpful to | ||||
| search the project - it's likely that another user has already reported the | ||||
| @@ -42,7 +29,7 @@ In order for a PR to be accepted it needs to pass a list of requirements: | ||||
| - They should in general include tests, and those shall pass. | ||||
| - If the PR is a bug fix, it has to include a suite of unit tests for the new functionality. | ||||
| - If the PR is a new feature, it has to come with a suite of unit tests, that tests the new functionality. | ||||
| - In any case, all the PRs have to pass the personal evaluation of at least one of the [maintainers](MAINTAINERS) of go-git. | ||||
| - In any case, all the PRs have to pass the personal evaluation of at least one of the maintainers of go-git. | ||||
| 
 | ||||
| ### Format of the commit message | ||||
| 
 | ||||
							
								
								
									
										0
									
								
								vendor/gopkg.in/src-d/go-git.v4/LICENSE → vendor/github.com/go-git/go-git/v5/LICENSE
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										0
									
								
								vendor/gopkg.in/src-d/go-git.v4/LICENSE → vendor/github.com/go-git/go-git/v5/LICENSE
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
								
								
									
										38
									
								
								vendor/github.com/go-git/go-git/v5/Makefile
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										38
									
								
								vendor/github.com/go-git/go-git/v5/Makefile
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,38 @@ | ||||
| # General | ||||
| WORKDIR = $(PWD) | ||||
|  | ||||
| # Go parameters | ||||
| GOCMD = go | ||||
| GOTEST = $(GOCMD) test  | ||||
|  | ||||
| # Git config | ||||
| GIT_VERSION ?= | ||||
| GIT_DIST_PATH ?= $(PWD)/.git-dist | ||||
| GIT_REPOSITORY = http://github.com/git/git.git | ||||
|  | ||||
| # Coverage | ||||
| COVERAGE_REPORT = coverage.out | ||||
| COVERAGE_MODE = count | ||||
|  | ||||
| build-git: | ||||
| 	@if [ -f $(GIT_DIST_PATH)/git ]; then \ | ||||
| 		echo "nothing to do, using cache $(GIT_DIST_PATH)"; \ | ||||
| 	else \ | ||||
| 		git clone $(GIT_REPOSITORY) -b $(GIT_VERSION) --depth 1 --single-branch $(GIT_DIST_PATH); \ | ||||
| 		cd $(GIT_DIST_PATH); \ | ||||
| 		make configure; \ | ||||
| 		./configure; \ | ||||
| 		make all; \ | ||||
| 	fi | ||||
|  | ||||
| test: | ||||
| 	@echo "running against `git version`"; \ | ||||
| 	$(GOTEST) ./... | ||||
|  | ||||
| test-coverage: | ||||
| 	@echo "running against `git version`"; \ | ||||
| 	echo "" > $(COVERAGE_REPORT); \ | ||||
| 	$(GOTEST) -coverprofile=$(COVERAGE_REPORT) -coverpkg=./... -covermode=$(COVERAGE_MODE) ./... | ||||
|  | ||||
| clean: | ||||
| 	rm -rf $(GIT_DIST_PATH) | ||||
							
								
								
									
										30
									
								
								vendor/gopkg.in/src-d/go-git.v4/README.md → vendor/github.com/go-git/go-git/v5/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								vendor/gopkg.in/src-d/go-git.v4/README.md → vendor/github.com/go-git/go-git/v5/README.md
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,11 +1,19 @@ | ||||
|  | ||||
| [](https://godoc.org/github.com/src-d/go-git) [](https://travis-ci.org/src-d/go-git) [](https://ci.appveyor.com/project/mcuadros/go-git) [](https://codecov.io/github/src-d/go-git) [](https://goreportcard.com/report/github.com/src-d/go-git) | ||||
| [](https://godoc.org/github.com/src-d/go-git) [](https://github.com/go-git/go-git/actions) [](https://goreportcard.com/report/github.com/src-d/go-git) | ||||
| 
 | ||||
| *go-git* is a highly extensible git implementation library written in **pure Go**. | ||||
| 
 | ||||
| It can be used to manipulate git repositories at low level *(plumbing)* or high level *(porcelain)*, through an idiomatic Go API. It also supports several types of storage, such as in-memory filesystems, or custom implementations thanks to the [`Storer`](https://godoc.org/gopkg.in/src-d/go-git.v4/plumbing/storer) interface. | ||||
| It can be used to manipulate git repositories at low level *(plumbing)* or high level *(porcelain)*, through an idiomatic Go API. It also supports several types of storage, such as in-memory filesystems, or custom implementations, thanks to the [`Storer`](https://godoc.org/github.com/go-git/go-git/v5/plumbing/storer) interface. | ||||
| 
 | ||||
| It's being actively developed since 2015 and is being used extensively by [Keybase](https://keybase.io/blog/encrypted-git-for-everyone), [Gitea](https://gitea.io/en-us/) or [Pulumi](https://github.com/search?q=org%3Apulumi+go-git&type=Code), and by many other libraries and tools. | ||||
| 
 | ||||
| Project Status | ||||
| -------------- | ||||
| 
 | ||||
| After the legal issues with the [`src-d`](https://github.com/src-d) organization, the lack of update for four months and the requirement to make a hard fork, the project is **now back to normality**. | ||||
| 
 | ||||
| The project is currently actively maintained by individual contributors, including several of the original authors, but also backed by a new company `gitsigth` where `go-git` is a critical component used at scale. | ||||
| 
 | ||||
| It's being actively developed since 2015 and is being used extensively by [source{d}](https://sourced.tech/) and [Keybase](https://keybase.io/blog/encrypted-git-for-everyone), and by many other libraries and tools. | ||||
| 
 | ||||
| Comparison with git | ||||
| ------------------- | ||||
| @@ -20,11 +28,11 @@ Installation | ||||
| 
 | ||||
| The recommended way to install *go-git* is: | ||||
| 
 | ||||
| ``` | ||||
| go get -u gopkg.in/src-d/go-git.v4/... | ||||
| ```go | ||||
| import "github.com/go-git/go-git/v5" // with go modules enabled (GO111MODULE=on or outside GOPATH) | ||||
| import "github.com/go-git/go-git" // with go modules disabled | ||||
| ``` | ||||
| 
 | ||||
| > We use [gopkg.in](http://labix.org/gopkg.in) to version the API, this means that when `go get` clones the package, it's the latest tag matching `v4.*` that is cloned and not the master branch. | ||||
| 
 | ||||
| Examples | ||||
| -------- | ||||
| @@ -38,10 +46,10 @@ A basic example that mimics the standard `git clone` command | ||||
| 
 | ||||
| ```go | ||||
| // Clone the given repository to the given directory | ||||
| Info("git clone https://github.com/src-d/go-git") | ||||
| Info("git clone https://github.com/go-git/go-git") | ||||
| 
 | ||||
| _, err := git.PlainClone("/tmp/foo", false, &git.CloneOptions{ | ||||
|     URL:      "https://github.com/src-d/go-git", | ||||
|     URL:      "https://github.com/go-git/go-git", | ||||
|     Progress: os.Stdout, | ||||
| }) | ||||
| 
 | ||||
| @@ -63,10 +71,10 @@ Cloning a repository into memory and printing the history of HEAD, just like `gi | ||||
| ```go | ||||
| // Clones the given repository in memory, creating the remote, the local | ||||
| // branches and fetching the objects, exactly as: | ||||
| Info("git clone https://github.com/src-d/go-siva") | ||||
| Info("git clone https://github.com/go-git/go-billy") | ||||
| 
 | ||||
| r, err := git.Clone(memory.NewStorage(), nil, &git.CloneOptions{ | ||||
|     URL: "https://github.com/src-d/go-siva", | ||||
|     URL: "https://github.com/go-git/go-billy", | ||||
| }) | ||||
| 
 | ||||
| CheckIfError(err) | ||||
| @@ -115,7 +123,7 @@ You can find this [example](_examples/log/main.go) and many others in the [examp | ||||
| Contribute | ||||
| ---------- | ||||
| 
 | ||||
| [Contributions](https://github.com/src-d/go-git/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) are more than welcome, if you are interested please take a look to | ||||
| [Contributions](https://github.com/go-git/go-git/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) are more than welcome, if you are interested please take a look to | ||||
| our [Contributing Guidelines](CONTRIBUTING.md). | ||||
| 
 | ||||
| License | ||||
| @@ -9,9 +9,9 @@ import ( | ||||
| 	"time" | ||||
| 	"unicode/utf8" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/object" | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/diff" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/object" | ||||
| 	"github.com/go-git/go-git/v5/utils/diff" | ||||
| ) | ||||
| 
 | ||||
| // BlameResult represents the result of a Blame operation. | ||||
| @@ -3,8 +3,8 @@ package config | ||||
| import ( | ||||
| 	"errors" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	format "gopkg.in/src-d/go-git.v4/plumbing/format/config" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	format "github.com/go-git/go-git/v5/plumbing/format/config" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -8,8 +8,8 @@ import ( | ||||
| 	"sort" | ||||
| 	"strconv" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/internal/url" | ||||
| 	format "gopkg.in/src-d/go-git.v4/plumbing/format/config" | ||||
| 	"github.com/go-git/go-git/v5/internal/url" | ||||
| 	format "github.com/go-git/go-git/v5/plumbing/format/config" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -33,7 +33,7 @@ var ( | ||||
| ) | ||||
| 
 | ||||
| // Config contains the repository configuration | ||||
| // ftp://www.kernel.org/pub/software/scm/git/docs/git-config.html#FILES | ||||
| // https://www.kernel.org/pub/software/scm/git/docs/git-config.html#FILES | ||||
| type Config struct { | ||||
| 	Core struct { | ||||
| 		// IsBare if true this repository is assumed to be bare and has no | ||||
| @@ -5,7 +5,7 @@ import ( | ||||
| 	"errors" | ||||
| 	"regexp" | ||||
| 
 | ||||
| 	format "gopkg.in/src-d/go-git.v4/plumbing/format/config" | ||||
| 	format "github.com/go-git/go-git/v5/plumbing/format/config" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -4,7 +4,7 @@ import ( | ||||
| 	"errors" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
							
								
								
									
										2
									
								
								vendor/gopkg.in/src-d/go-git.v4/doc.go → vendor/github.com/go-git/go-git/v5/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/gopkg.in/src-d/go-git.v4/doc.go → vendor/github.com/go-git/go-git/v5/doc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -7,4 +7,4 @@ | ||||
| // It is highly extensible, we have been following the open/close principle in | ||||
| // its design to facilitate extensions, mainly focusing the efforts on the | ||||
| // persistence of the objects. | ||||
| package git // import "gopkg.in/src-d/go-git.v4" | ||||
| package git | ||||
							
								
								
									
										22
									
								
								vendor/gopkg.in/src-d/go-git.v4/go.mod → vendor/github.com/go-git/go-git/v5/go.mod
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								vendor/gopkg.in/src-d/go-git.v4/go.mod → vendor/github.com/go-git/go-git/v5/go.mod
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,29 +1,27 @@ | ||||
| module gopkg.in/src-d/go-git.v4 | ||||
| module github.com/go-git/go-git/v5 | ||||
| 
 | ||||
| require ( | ||||
| 	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect | ||||
| 	github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect | ||||
| 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 | ||||
| 	github.com/emirpasic/gods v1.12.0 | ||||
| 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect | ||||
| 	github.com/gliderlabs/ssh v0.2.2 | ||||
| 	github.com/go-git/gcfg v1.5.0 | ||||
| 	github.com/go-git/go-billy/v5 v5.0.0 | ||||
| 	github.com/go-git/go-git-fixtures/v4 v4.0.1 | ||||
| 	github.com/google/go-cmp v0.3.0 | ||||
| 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 | ||||
| 	github.com/jessevdk/go-flags v1.4.0 | ||||
| 	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd | ||||
| 	github.com/mitchellh/go-homedir v1.1.0 | ||||
| 	github.com/pelletier/go-buffruneio v0.2.0 // indirect | ||||
| 	github.com/pkg/errors v0.8.1 // indirect | ||||
| 	github.com/sergi/go-diff v1.0.0 | ||||
| 	github.com/src-d/gcfg v1.4.0 | ||||
| 	github.com/stretchr/objx v0.2.0 // indirect | ||||
| 	github.com/sergi/go-diff v1.1.0 | ||||
| 	github.com/xanzy/ssh-agent v0.2.1 | ||||
| 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 | ||||
| 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 | ||||
| 	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 | ||||
| 	golang.org/x/net v0.0.0-20200301022130-244492dfa37a | ||||
| 	golang.org/x/text v0.3.2 | ||||
| 	golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a // indirect | ||||
| 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 | ||||
| 	gopkg.in/src-d/go-billy.v4 v4.3.2 | ||||
| 	gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 | ||||
| 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f | ||||
| 	gopkg.in/warnings.v0 v0.1.2 // indirect | ||||
| ) | ||||
| 
 | ||||
| go 1.13 | ||||
							
								
								
									
										74
									
								
								vendor/gopkg.in/src-d/go-git.v4/go.sum → vendor/github.com/go-git/go-git/v5/go.sum
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										74
									
								
								vendor/gopkg.in/src-d/go-git.v4/go.sum → vendor/github.com/go-git/go-git/v5/go.sum
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -4,7 +4,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo | ||||
| github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= | ||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= | ||||
| github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= | ||||
| github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= | ||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | ||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| @@ -12,81 +12,67 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg | ||||
| github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= | ||||
| github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= | ||||
| github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= | ||||
| github.com/gliderlabs/ssh v0.1.3 h1:cBU46h1lYQk5f2Z+jZbewFKy+1zzE2aUX/ilcPDAm9M= | ||||
| github.com/gliderlabs/ssh v0.1.3/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= | ||||
| github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= | ||||
| github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= | ||||
| github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= | ||||
| github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= | ||||
| github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= | ||||
| github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= | ||||
| github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= | ||||
| github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= | ||||
| github.com/go-git/go-git-fixtures/v4 v4.0.1 h1:q+IFMfLx200Q3scvt2hN79JsEzy4AmBTp/pqnefH+Bc= | ||||
| github.com/go-git/go-git-fixtures/v4 v4.0.1/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= | ||||
| github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= | ||||
| github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= | ||||
| github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= | ||||
| github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= | ||||
| github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= | ||||
| github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= | ||||
| github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= | ||||
| github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= | ||||
| github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= | ||||
| github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= | ||||
| github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= | ||||
| github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= | ||||
| github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||
| github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= | ||||
| github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= | ||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||
| github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= | ||||
| github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= | ||||
| github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= | ||||
| github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= | ||||
| github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= | ||||
| github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= | ||||
| github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= | ||||
| github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= | ||||
| github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= | ||||
| github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= | ||||
| github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= | ||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||
| github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= | ||||
| github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= | ||||
| github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | ||||
| github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= | ||||
| github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= | ||||
| github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= | ||||
| github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= | ||||
| golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd h1:sMHc2rZHuzQmrbVoSpt9HgerkXPyIeCSO6k0zUMGfFk= | ||||
| golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= | ||||
| golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E= | ||||
| golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190502183928-7f726cade0ab h1:9RfW3ktsOZxgo9YNbBAjq1FWzc/igwEcUzZz8IXgSbk= | ||||
| golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= | ||||
| golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9 h1:lkiLiLBHGoH3XnqSLUIaBsilGMUjI+Uy2Xu2JLUtTas= | ||||
| golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= | ||||
| golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= | ||||
| golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0= | ||||
| golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= | ||||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= | ||||
| golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.0 h1:KtlZ4c1OWbIs4jCv5ZXrTqG8EQocr0g/d4DjNg70aek= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= | ||||
| gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= | ||||
| gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= | ||||
| gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= | ||||
| gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= | ||||
| gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
| gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= | ||||
| gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | ||||
| @@ -1,5 +1,5 @@ | ||||
| // Package revision extracts git revision from string | ||||
| // More informations about revision : https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html | ||||
| // More information about revision : https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html | ||||
| package revision | ||||
| 
 | ||||
| import ( | ||||
| @@ -10,7 +10,7 @@ import ( | ||||
| // validates it belongs to a rune category | ||||
| type runeCategoryValidator func(r rune) bool | ||||
| 
 | ||||
| // tokenizeExpression aggegates a series of runes matching check predicate into a single | ||||
| // tokenizeExpression aggregates a series of runes matching check predicate into a single | ||||
| // string and provides given tokenType as token type | ||||
| func tokenizeExpression(ch rune, tokenType token, check runeCategoryValidator, r *bufio.Reader) (token, string, error) { | ||||
| 	var data []rune | ||||
| @@ -6,7 +6,7 @@ import ( | ||||
| 
 | ||||
| var ( | ||||
| 	isSchemeRegExp   = regexp.MustCompile(`^[^:]+://`) | ||||
| 	scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P<user>[^@]+)@)?(?P<host>[^:\s]+):(?:(?P<port>[0-9]{1,5})/)?(?P<path>[^\\].*)$`) | ||||
| 	scpLikeUrlRegExp = regexp.MustCompile(`^(?:(?P<user>[^@]+)@)?(?P<host>[^:\s]+):(?:(?P<port>[0-9]{1,5})(?:\/|:))?(?P<path>[^\\].*\/[^\\].*)$`) | ||||
| ) | ||||
| 
 | ||||
| // MatchesScheme returns true if the given string matches a URL-like | ||||
| @@ -3,10 +3,10 @@ package git | ||||
| import ( | ||||
| 	"fmt" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/filemode" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/object" | ||||
| 	"gopkg.in/src-d/go-git.v4/storage" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/filemode" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/object" | ||||
| 	"github.com/go-git/go-git/v5/storage" | ||||
| ) | ||||
| 
 | ||||
| type objectWalker struct { | ||||
| @@ -21,7 +21,7 @@ func newObjectWalker(s storage.Storer) *objectWalker { | ||||
| 	return &objectWalker{s, map[plumbing.Hash]struct{}{}} | ||||
| } | ||||
| 
 | ||||
| // walkAllRefs walks all (hash) refererences from the repo. | ||||
| // walkAllRefs walks all (hash) references from the repo. | ||||
| func (p *objectWalker) walkAllRefs() error { | ||||
| 	// Walk over all the references in the repo. | ||||
| 	it, err := p.Storer.IterReferences() | ||||
| @@ -4,13 +4,14 @@ import ( | ||||
| 	"errors" | ||||
| 	"regexp" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"golang.org/x/crypto/openpgp" | ||||
| 	"gopkg.in/src-d/go-git.v4/config" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/object" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/transport" | ||||
| 	"github.com/go-git/go-git/v5/config" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/object" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/protocol/packp/sideband" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/transport" | ||||
| ) | ||||
| 
 | ||||
| // SubmoduleRescursivity defines how depth will affect any submodule recursive | ||||
| @@ -342,12 +343,27 @@ type LogOptions struct { | ||||
| 
 | ||||
| 	// Show only those commits in which the specified file was inserted/updated. | ||||
| 	// It is equivalent to running `git log -- <file-name>`. | ||||
| 	// this field is kept for compatility, it can be replaced with PathFilter | ||||
| 	FileName *string | ||||
| 
 | ||||
| 	// Filter commits based on the path of files that are updated | ||||
| 	// takes file path as argument and should return true if the file is desired | ||||
| 	// It can be used to implement `git log -- <path>` | ||||
| 	// either <path> is a file path, or directory path, or a regexp of file/directory path | ||||
| 	PathFilter func(string) bool | ||||
| 
 | ||||
| 	// Pretend as if all the refs in refs/, along with HEAD, are listed on the command line as <commit>. | ||||
| 	// It is equivalent to running `git log --all`. | ||||
| 	// If set on true, the From option will be ignored. | ||||
| 	All bool | ||||
| 
 | ||||
| 	// Show commits more recent than a specific date. | ||||
| 	// It is equivalent to running `git log --since <date>` or `git log --after <date>`. | ||||
| 	Since *time.Time | ||||
| 
 | ||||
| 	// Show commits older than a specific date. | ||||
| 	// It is equivalent to running `git log --until <date>` or `git log --before <date>`. | ||||
| 	Until *time.Time | ||||
| } | ||||
| 
 | ||||
| var ( | ||||
| @@ -1,6 +1,6 @@ | ||||
| package cache | ||||
| 
 | ||||
| import "gopkg.in/src-d/go-git.v4/plumbing" | ||||
| import "github.com/go-git/go-git/v5/plumbing" | ||||
| 
 | ||||
| const ( | ||||
| 	Byte FileSize = 1 << (iota * 10) | ||||
| @@ -4,7 +4,7 @@ import ( | ||||
| 	"container/list" | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| // ObjectLRU implements an object cache with an LRU eviction policy and a | ||||
| @@ -32,10 +32,10 @@ const ( | ||||
| 	Regular FileMode = 0100644 | ||||
| 	// Deprecated represent non-executable files with the group writable | ||||
| 	// bit set.  This mode was supported by the first versions of git, | ||||
| 	// but it has been deprecatred nowadays.  This library uses them | ||||
| 	// but it has been deprecated nowadays.  This library uses them | ||||
| 	// internally, so you can read old packfiles, but will treat them as | ||||
| 	// Regulars when interfacing with the outside world.  This is the | ||||
| 	// standard git behaviuor. | ||||
| 	// standard git behaviour. | ||||
| 	Deprecated FileMode = 0100664 | ||||
| 	// Executable represents executable files. | ||||
| 	Executable FileMode = 0100755 | ||||
| @@ -152,7 +152,7 @@ func (m FileMode) IsRegular() bool { | ||||
| } | ||||
| 
 | ||||
| // IsFile returns if the FileMode represents that of a file, this is, | ||||
| // Regular, Deprecated, Excutable or Link. | ||||
| // Regular, Deprecated, Executable or Link. | ||||
| func (m FileMode) IsFile() bool { | ||||
| 	return m == Regular || | ||||
| 		m == Deprecated || | ||||
| @@ -3,7 +3,7 @@ package config | ||||
| import ( | ||||
| 	"io" | ||||
| 
 | ||||
| 	"github.com/src-d/gcfg" | ||||
| 	"github.com/go-git/gcfg" | ||||
| ) | ||||
| 
 | ||||
| // A Decoder reads and decodes config files from an input stream. | ||||
| @@ -1,8 +1,8 @@ | ||||
| package diff | ||||
| 
 | ||||
| import ( | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/filemode" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/filemode" | ||||
| ) | ||||
| 
 | ||||
| // Operation defines the operation of a diff item. | ||||
| @@ -4,9 +4,10 @@ import ( | ||||
| 	"bytes" | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 	"regexp" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -25,9 +26,10 @@ const ( | ||||
| 	tPath  = "+++ %s\n" | ||||
| 	binary = "Binary files %s and %s differ\n" | ||||
| 
 | ||||
| 	addLine    = "+%s\n" | ||||
| 	deleteLine = "-%s\n" | ||||
| 	equalLine  = " %s\n" | ||||
| 	addLine    = "+%s%s" | ||||
| 	deleteLine = "-%s%s" | ||||
| 	equalLine  = " %s%s" | ||||
| 	noNewLine  = "\n\\ No newline at end of file\n" | ||||
| 
 | ||||
| 	oldMode         = "old mode %o\n" | ||||
| 	newMode         = "new mode %o\n" | ||||
| @@ -216,7 +218,7 @@ func (c *hunksGenerator) processHunk(i int, op Operation) { | ||||
| 		linesBefore = c.ctxLines | ||||
| 	} | ||||
| 
 | ||||
| 	c.current = &hunk{ctxPrefix: ctxPrefix} | ||||
| 	c.current = &hunk{ctxPrefix: strings.TrimSuffix(ctxPrefix, "\n")} | ||||
| 	c.current.AddOp(Equal, c.beforeContext...) | ||||
| 
 | ||||
| 	switch op { | ||||
| @@ -279,12 +281,13 @@ func (c *hunksGenerator) processEqualsLines(ls []string, i int) { | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| var splitLinesRE = regexp.MustCompile(`[^\n]*(\n|$)`) | ||||
| 
 | ||||
| func splitLines(s string) []string { | ||||
| 	out := strings.Split(s, "\n") | ||||
| 	out := splitLinesRE.FindAllString(s, -1) | ||||
| 	if out[len(out)-1] == "" { | ||||
| 		out = out[:len(out)-1] | ||||
| 	} | ||||
| 
 | ||||
| 	return out | ||||
| } | ||||
| 
 | ||||
| @@ -346,7 +349,7 @@ type op struct { | ||||
| } | ||||
| 
 | ||||
| func (o *op) String() string { | ||||
| 	var prefix string | ||||
| 	var prefix, suffix string | ||||
| 	switch o.t { | ||||
| 	case Add: | ||||
| 		prefix = addLine | ||||
| @@ -355,6 +358,10 @@ func (o *op) String() string { | ||||
| 	case Equal: | ||||
| 		prefix = equalLine | ||||
| 	} | ||||
| 	n := len(o.text) | ||||
| 	if n > 0 && o.text[n-1] != '\n' { | ||||
| 		suffix = noNewLine | ||||
| 	} | ||||
| 
 | ||||
| 	return fmt.Sprintf(prefix, o.text) | ||||
| 	return fmt.Sprintf(prefix, o.text, suffix) | ||||
| } | ||||
| @@ -7,9 +7,9 @@ import ( | ||||
| 	"os/user" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-billy.v4" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/format/config" | ||||
| 	gioutil "gopkg.in/src-d/go-git.v4/utils/ioutil" | ||||
| 	"github.com/go-git/go-billy/v5" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/format/config" | ||||
| 	gioutil "github.com/go-git/go-git/v5/utils/ioutil" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -6,13 +6,13 @@ import ( | ||||
| 	"errors" | ||||
| 	"io" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| 	// ErrUnsupportedVersion is returned by Decode when the idx file version | ||||
| 	// is not supported. | ||||
| 	ErrUnsupportedVersion = errors.New("Unsuported version") | ||||
| 	ErrUnsupportedVersion = errors.New("Unsupported version") | ||||
| 	// ErrMalformedIdxFile is returned by Decode when the idx file is corrupted. | ||||
| 	ErrMalformedIdxFile = errors.New("Malformed IDX file") | ||||
| ) | ||||
| @@ -5,7 +5,7 @@ import ( | ||||
| 	"hash" | ||||
| 	"io" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| // Encoder writes MemoryIndex structs to an output stream. | ||||
| @@ -7,7 +7,7 @@ import ( | ||||
| 
 | ||||
| 	encbin "encoding/binary" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -7,8 +7,8 @@ import ( | ||||
| 	"sort" | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| // objects implements sort.Interface and uses hash as sorting key. | ||||
| @@ -11,8 +11,8 @@ import ( | ||||
| 	"strconv" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -9,7 +9,7 @@ import ( | ||||
| 	"sort" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -7,8 +7,8 @@ import ( | ||||
| 	"path/filepath" | ||||
| 	"time" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/filemode" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/filemode" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -6,8 +6,8 @@ import ( | ||||
| 	"io" | ||||
| 	"strconv" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/format/packfile" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/format/packfile" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -6,7 +6,7 @@ import ( | ||||
| 	"io" | ||||
| 	"strconv" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| var ( | ||||
| @@ -6,8 +6,8 @@ import ( | ||||
| 	"io" | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/storer" | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/ioutil" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/storer" | ||||
| 	"github.com/go-git/go-git/v5/utils/ioutil" | ||||
| ) | ||||
| 
 | ||||
| var signature = []byte{'P', 'A', 'C', 'K'} | ||||
| @@ -4,8 +4,8 @@ import ( | ||||
| 	"sort" | ||||
| 	"sync" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/storer" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/storer" | ||||
| ) | ||||
| 
 | ||||
| const ( | ||||
| @@ -3,7 +3,7 @@ package packfile | ||||
| import ( | ||||
| 	"bytes" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| // See https://github.com/jelmer/dulwich/blob/master/dulwich/pack.py and | ||||
| @@ -6,9 +6,9 @@ import ( | ||||
| 	"fmt" | ||||
| 	"io" | ||||
| 
 | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/storer" | ||||
| 	"gopkg.in/src-d/go-git.v4/utils/binary" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/storer" | ||||
| 	"github.com/go-git/go-git/v5/utils/binary" | ||||
| ) | ||||
| 
 | ||||
| // Encoder gets the data from the storage and write it into the writer in PACK | ||||
| @@ -3,10 +3,10 @@ package packfile | ||||
| import ( | ||||
| 	"io" | ||||
| 
 | ||||
| 	billy "gopkg.in/src-d/go-billy.v4" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/cache" | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" | ||||
| 	billy "github.com/go-git/go-billy/v5" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/cache" | ||||
| 	"github.com/go-git/go-git/v5/plumbing/format/idxfile" | ||||
| ) | ||||
| 
 | ||||
| // FSObject is an object from the packfile on the filesystem. | ||||
| @@ -1,7 +1,7 @@ | ||||
| package packfile | ||||
| 
 | ||||
| import ( | ||||
| 	"gopkg.in/src-d/go-git.v4/plumbing" | ||||
| 	"github.com/go-git/go-git/v5/plumbing" | ||||
| ) | ||||
| 
 | ||||
| // ObjectToPack is a representation of an object that is going to be into a | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	 6543
					6543