Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

Adding gps to dep #453

Merged
merged 994 commits into from
May 3, 2017
Merged

Adding gps to dep #453

merged 994 commits into from
May 3, 2017

Conversation

krisnova
Copy link
Contributor

@krisnova krisnova commented Apr 21, 2017

Moving a copy of gps at sdboyer/gps@da7569e to github.com/golang/dep/gps

Git history preservation

All git history from gps at sdboyer/gps@da7569e should be preserved.

With the exception of the following sed replacement in the git commit logs:

sed -e "s/ #/ sdboyer\/gps#/"
# git filter-branch -f --msg-filter 'sed -e "s/ #/ sdboyer\/gps#/"' 51d49055235c7e635439ac69c4650556714de37f..HEAD

Global Substitution

  • krisnova@122ade3
  • sed/g the following strings (somewhat blindly)
    • github.com/sdboyer/gps -> github.com/golang/go/gps
    • github.com/sdboyer/gps/internal -> github.com/golang/dep/gps/internal
    • github.com/sdboyer/gps/pkgtree -> github.com/golang/dep/gps/pkgtree
  • dep is now compiling with the gps no longer in vendor

Remove vendor/github.com/sdboyer/gps

Changes from code review here

ReSTARTR and others added 30 commits January 29, 2017 14:49
Ignore dirs/files with perms issues in ListPackages
Introduce monitoredCmd to wrap commands and be able to kill them if
no activity is detected in a certain amount of time.
1. Remove pipe
2. Indent inner messages over 2 spaces
3. s/3spaces/tab in getprei
Removing nested trace output from trace.go
Not covering this basic aspect of how real project roots actually work
allowed a windows bug to hide until real data came through - sdboyer/gps#146.
This was never used, because it wasn't actually needed.
@sdboyer
Copy link
Member

sdboyer commented Apr 29, 2017

I think we should be ready to proceed here now.

Copy link
Member

@sdboyer sdboyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohboyohboyohboyohboy

@@ -16,7 +20,8 @@ func TestSlowVcs(t *testing.T) {
t.Run("source-gateway", testSourceGateway)
t.Run("bzr-repo", testBzrRepo)
t.Run("bzr-source", testBzrSourceInteractions)
t.Run("svn-repo", testSvnRepo)
// TODO(kris-nova) re-enable syn-repo after gps is merged into dep
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why disable this one?

I'm not gonna hold up the PR for it, but noting it so we can make an issue 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh it was failing - let me open an issue with more info and I can get it cleaned up!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue: #504

@sdboyer sdboyer merged commit f291eab into golang:master May 3, 2017
@sdboyer
Copy link
Member

sdboyer commented May 3, 2017

WOOOOOOOOOOOOOO 🎉 🎉 🎉 🎉

ibrasho pushed a commit to ibrasho-forks/dep that referenced this pull request May 10, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.