Migrate to dep (#3972)

* Update makefile to use dep

* Migrate to dep

* Fix some deps

* Try to find a better version for golang.org/x/net

* Try to find a better version for golang.org/x/oauth2

6 files changed, 15 insertions, 213 deletions

diff --git a/vendor/code.gitea.io/git/CONTRIBUTING.md b/vendor/code.gitea.io/git/CONTRIBUTING.md
deleted file mode 100644
index 3ce81e0adc..0000000000
--- a/vendor/code.gitea.io/git/CONTRIBUTING.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Contribution Guidelines
-
-## Introduction
-
-This document explains how to contribute changes to the Gitea project. It assumes you have followed the [installation instructions](https://github.com/go-gitea/docs/tree/master/en-US/installation). Sensitive security-related issues should be reported to [security@gitea.io](mailto:security@gitea.io).
-
-## Bug reports
-
-Please search the issues on the issue tracker with a variety of keywords to ensure your bug is not already reported.
-
-If unique, [open an issue](https://github.com/go-gitea/gitea/issues/new) and answer the questions so we can understand and reproduce the problematic behavior.
-
-To show us that the issue you are having is in Gitea itself, please write clear, concise instructions so we can reproduce the behavior (even if it seems obvious). The more detailed and specific you are, the faster we can fix the issue. Check out [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/~sgtatham/bugs.html).
-
-Please be kind, remember that Gitea comes at no cost to you, and you're getting free help.
-
-## Discuss your design
-
-The project welcomes submissions but please let everyone know what you're working on if you want to change or add something to the Gitea repositories.
-
-Before starting to write something new for the Gitea project, please [file an issue](https://github.com/go-gitea/gitea/issues/new). Significant changes must go through the [change proposal process](https://github.com/go-gitea/proposals) before they can be accepted.
-
-This process gives everyone a chance to validate the design, helps prevent duplication of effort, and ensures that the idea fits inside the goals for the project and tools. It also checks that the design is sound before code is written; the code review tool is not the place for high-level discussions.
-
-## Testing redux
-
-Before sending code out for review, run all the tests for the whole tree to make sure the changes don't break other usage and keep the compatibility on upgrade. To make sure you are running the test suite exactly like we do, you should install the CLI for [Drone CI](https://github.com/drone/drone), as we are using the server for continous testing, following [these instructions](http://readme.drone.io/0.5/install/cli/). After that you can simply call `drone exec` within your working directory and it will try to run the test suite locally.
-
-## Code review
-
-Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if it is an owner or a maintainer. We use GitHub's pull request workflow to do that and we also use [LGTM](http://lgtm.co) to ensure every PR is reviewed by at least 2 maintainers.
-
-Please try to make your pull request easy to review for us. Please read the "[How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md)" guide, it has lots of useful tips for any project you may want to contribute. Some of the key points:
-
-* Make small pull requests. The smaller, the faster to review and the more likely it will be merged soon.
-* Don't make changes unrelated to your PR. Maybe there are typos on some comments, maybe refactoring would be welcome on a function... but if that is not related to your PR, please make *another* PR for that.
-* Split big pull requests into multiple small ones. An incremental change will be faster to review than a huge PR.
-
-## Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the patch or otherwise have the right to pass it on as an open-source patch. The rules are pretty simple: If you can certify [DCO](DCO), then you just add a line to every git commit message:
-
-```
-Signed-off-by: Joe Smith <joe.smith@email.com>
-```
-
-Please use your real name, we really dislike pseudonyms or anonymous contributions. We are in the open-source world without secrets. If you set your `user.name` and `user.email` git configs, you can sign your commit automatically with `git commit -s`.
-
-## Maintainers
-
-To make sure every PR is checked, we have [team maintainers](https://github.com/orgs/go-gitea/teams/maintainers). Every PR **MUST** be reviewed by at least two maintainers (or owners) before it can get merged. A maintainer should be a contributor of Gitea (or Gogs) and contributed at least 4 accepted PRs. A contributor should apply as a maintainer in the [Discord #develop channel](https://discord.gg/NsatcWJ). The owners or the team maintainers may invite the contributor. A maintainer should spend some time on code reviews. If a maintainer has no time to do that, they should apply to leave the maintainers team and we will give them the honor of being a member of the [advisors team](https://github.com/orgs/go-gitea/teams/advisors). Of course, if an advisor has time to code review, we will gladly welcome them back to the maintainers team. If a maintainer is inactive for more than 3 months and forgets to leave the maintainers team, the owners may move him or her from the maintainers team to the advisors team.
-
-## Owners
-
-Since Gitea is a pure community organization without any company support, to keep the development healthy we will elect three owners every year. All contributors may vote to elect up to three candidates, one of which will be the main owner, and the other two the assistant owners. When the new owners have been elected, the old owners will give up ownership to the newly elected owners. If an owner is unable to do so, the other owners will assist in ceding ownership to the newly elected owners.
-
-After the election, the new owners should proactively agree with our [CONTRIBUTING](CONTRIBUTING.md) requirements on the [Discord #general channel](https://discord.gg/NsatcWJ). Below are the words to speak:
-
-```
-I'm honored to having been elected an owner of Gitea, I agree with [CONTRIBUTING](CONTRIBUTING.md). I will spend part of my time on Gitea and lead the development of Gitea.
-```
-
-To honor the past owners, here's the history of the owners and the time they served:
-
-* 2016-11-04 ~ 2017-12-31
-  * [Lunny Xiao](https://github.com/lunny) <xiaolunwen@gmail.com>
-  * [Thomas Boerger](https://github.com/tboerger) <thomas@webhippie.de>
-  * [Kim Carlbäcker](https://github.com/bkcsoft) <kim.carlbacker@gmail.com>
-
-## Versions
-
-Gitea has the `master` branch as a tip branch and has version branches such as `v0.9`. `v0.9` is a release branch and we will tag `v0.9.0` for binary download. If `v0.9.0` has bugs, we will accept pull requests on the `v0.9` branch and publish a `v0.9.1` tag, after bringing the bug fix also to the master branch.
-
-Since the `master` branch is a tip version, if you wish to use Gitea in production, please download the latest release tag version. All the branches will be protected via GitHub, all the PRs to every branch must be reviewed by two maintainers and must pass the automatic tests.
-
-## Copyright
-
-Code that you contribute should use the standard copyright header:
-
-```
-// Copyright 2017 The Gitea Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-```
-
-Files in the repository contain copyright from the year they are added to the year they are last changed. If the copyright author is changed, just paste the header below the old one.
diff --git a/vendor/code.gitea.io/git/DCO b/vendor/code.gitea.io/git/DCO
deleted file mode 100644
index 716561d5d2..0000000000
--- a/vendor/code.gitea.io/git/DCO
+++ /dev/null
@@ -1,36 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/vendor/code.gitea.io/git/MAINTAINERS b/vendor/code.gitea.io/git/MAINTAINERS
deleted file mode 100644
index 8c8a4947dd..0000000000
--- a/vendor/code.gitea.io/git/MAINTAINERS
+++ /dev/null
@@ -1,21 +0,0 @@
-Alexey Makhov <amakhov@avito.ru> (@makhov)
-Andrey Nering <andrey.nering@gmail.com> (@andreynering)
-Bo-Yi Wu <appleboy.tw@gmail.com> (@appleboy)
-Ethan Koenig <ethantkoenig@gmail.com> (@ethantkoenig)
-Kees de Vries <bouwko@gmail.com> (@Bwko)
-Kim Carlbäcker <kim.carlbacker@gmail.com> (@bkcsoft)
-LefsFlare <nobody@nobody.tld> (@LefsFlarey)
-Lunny Xiao <xiaolunwen@gmail.com> (@lunny)
-Matthias Loibl <mail@matthiasloibl.com> (@metalmatze)
-Morgan Bazalgette <the@howl.moe> (@thehowl)
-Rachid Zarouali <nobody@nobody.tld> (@xinity)
-Rémy Boulanouar <admin@dblk.org> (@DblK)
-Sandro Santilli <strk@kbt.io> (@strk)
-Thibault Meyer <meyer.thibault@gmail.com> (@0xbaadf00d)
-Thomas Boerger <thomas@webhippie.de> (@tboerger)
-Lauris Bukšis-Haberkorns <lauris@nix.lv> (@lafriks)
-Antoine Girard <sapk@sapk.fr> (@sapk)
-Jonas Östanbäck <jonas.ostanback@gmail.com> (@cez81)
-David Schneiderbauer <dschneiderbauer@gmail.com> (@daviian)
-Peter Žeby <morlinest@gmail.com> (@morlinest)
-Jonas Franz <info@jonasfranz.software> (@JonasFranzDEV)
diff --git a/vendor/code.gitea.io/git/Makefile b/vendor/code.gitea.io/git/Makefile
deleted file mode 100644
index 9aa6ebdcf5..0000000000
--- a/vendor/code.gitea.io/git/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-IMPORT := code.gitea.io/git
-
-PACKAGES ?= $(shell go list -e ./... | grep -v /vendor/ | grep -v /benchmark/)
-GENERATE ?= code.gitea.io/git
-
-.PHONY: all
-all: clean test build
-
-.PHONY: clean
-clean:
-	go clean -i ./...
-
-generate:
-	@which mockery > /dev/null; if [ $$? -ne 0 ]; then \
-		go get -u github.com/vektra/mockery/...; \
-	fi
-	go generate $(GENERATE)
-
-.PHONY: fmt
-fmt:
-	find . -name "*.go" -type f ! -path "./vendor/*" ! -path "./benchmark/*" | xargs gofmt -s -w
-
-.PHONY: vet
-vet:
-	go vet $(PACKAGES)
-
-.PHONY: lint
-lint:
-	@which golint > /dev/null; if [ $$? -ne 0 ]; then \
-		go get -u github.com/golang/lint/golint; \
-	fi
-	for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done;
-
-.PHONY: test
-test:
-	for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
-
-.PHONY: bench
-bench:
-	go test -run=XXXXXX -benchtime=10s -bench=. || exit 1
-
-.PHONY: build
-build:
-	go build .
diff --git a/vendor/code.gitea.io/git/README.md b/vendor/code.gitea.io/git/README.md
deleted file mode 100644
index e27603b0f2..0000000000
--- a/vendor/code.gitea.io/git/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Git Shell
-
-[![Build Status](http://drone.gitea.io/api/badges/go-gitea/git/status.svg)](http://drone.gitea.io/go-gitea/git)
-[![Join the chat at https://img.shields.io/discord/322538954119184384.svg](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ)
-[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
-[![Coverage Status](https://coverage.gitea.io/badges/go-gitea/git/coverage.svg)](https://coverage.gitea.io/go-gitea/git)
-[![Go Report Card](https://goreportcard.com/badge/code.gitea.io/git)](https://goreportcard.com/report/code.gitea.io/git)
-[![GoDoc](https://godoc.org/code.gitea.io/git?status.svg)](https://godoc.org/code.gitea.io/git)
-
-This project is a Go module to access Git through shell commands. For further
-informations take a look at the current [documentation](https://godoc.org/code.gitea.io/git).
-
-## Contributing
-
-Fork -> Patch -> Push -> Pull Request
-
-## Authors
-
-* [Maintainers](https://github.com/orgs/go-gitea/people)
-* [Contributors](https://github.com/go-gitea/git/graphs/contributors)
-
-## License
-
-This project is under the MIT License. See the [LICENSE](LICENSE) file for the
-full license text.
diff --git a/vendor/code.gitea.io/git/repo_blame.go b/vendor/code.gitea.io/git/repo_blame.go
index b48cbeea6c..80ec50e472 100644
--- a/vendor/code.gitea.io/git/repo_blame.go
+++ b/vendor/code.gitea.io/git/repo_blame.go
@@ -4,7 +4,21 @@
 
 package git
 
+import "fmt"
+
 // FileBlame return the Blame object of file
 func (repo *Repository) FileBlame(revision, path, file string) ([]byte, error) {
-	return NewCommand("blame", "--root", file).RunInDirBytes(path)
+	return NewCommand("blame", "--root", "--", file).RunInDirBytes(path)
+}
+
+// LineBlame returns the latest commit at the given line
+func (repo *Repository) LineBlame(revision, path, file string, line uint) (*Commit, error) {
+	res, err := NewCommand("blame", fmt.Sprintf("-L %d,%d", line, line), "-p", revision, "--", file).RunInDir(path)
+	if err != nil {
+		return nil, err
+	}
+	if len(res) < 40 {
+		return nil, fmt.Errorf("invalid result of blame: %s", res)
+	}
+	return repo.GetCommit(string(res[:40]))
 }