non-vendor changes

.travis.yml

@@ -34,7 +34,7 @@ before_script:
 script:
 - export GODEBUG=invalidptr=0
 - export GO15VENDOREXPERIMENT=1
-- go test ./...
+- go test `go list ./... | grep -v vendor`
 notifications:
   email:
     recipients:

README.md

@@ -26,8 +26,8 @@ go get -u -t github.com/attic-labs/noms/...
 # Build
 
 ```
-go install ./...
-go test ./...
+go install `go list ./... | grep -v /vendor/`
+go test `go list ./... | grep -v /vendor/`
 ```
 
 # Run

base/seekable_reader_test.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestSeekableReaderTestSuite(t *testing.T) {

chunks/chunk_store_test_common.go

@@ -1,8 +1,8 @@
 package chunks
 
 import (
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/suite"
 )
 
 type ChunkStoreTestSuite struct {

chunks/chunk_test.go

@@ -3,7 +3,7 @@ package chunks
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestChunkWriteAfterCloseFails(t *testing.T) {

chunks/dynamo_store.go

@@ -6,13 +6,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/session"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/ref"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/dynamodb"
 )
 
 const (

chunks/dynamo_store_fake.go

@@ -3,8 +3,8 @@ package chunks
 import (
 	"bytes"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/dynamodb"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/aws/aws-sdk-go/service/dynamodb"
+	"github.com/stretchr/testify/assert"
 )
 
 type mockAWSError string

chunks/dynamo_store_test.go

@@ -3,8 +3,8 @@ package chunks
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestDynamoStoreTestSuite(t *testing.T) {

chunks/http_store.go

@@ -14,10 +14,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
 	"github.com/attic-labs/noms/constants"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/ref"
+	"github.com/julienschmidt/httprouter"
 )
 
 const (

chunks/leveldb_store.go

@@ -6,12 +6,12 @@ import (
 	"os"
 	"sync"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/opt"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/ref"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/errors"
+	"github.com/syndtr/goleveldb/leveldb/filter"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
 const (

chunks/leveldb_store_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestLevelDBStoreTestSuite(t *testing.T) {

chunks/memory_store_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestMemoryStoreTestSuite(t *testing.T) {

chunks/read_through_store_test.go

@@ -3,7 +3,7 @@ package chunks
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestReadThroughStoreTestSuite(t *testing.T) {

chunks/remote_requests_test.go

@@ -3,11 +3,10 @@ package chunks
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
-
 func TestGetRequestBatch(t *testing.T) {
 	assert := assert.New(t)
 	r0 := ref.Parse("sha1-0000000000000000000000000000000000000000")
@@ -74,4 +73,4 @@ func TestGetRequestBatch(t *testing.T) {
 	}
 	assert.Equal(0, r0True)
 	assert.Equal(1, r0False)
-}
+}

chunks/test_utils.go

@@ -3,8 +3,8 @@ package chunks
 import (
 	"sync"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func assertInputInStore(input string, ref ref.Ref, s ChunkStore, assert *assert.Assertions) {

clients/common/geo_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPoint(t *testing.T) {

clients/counter/counter_test.go

@@ -3,8 +3,8 @@ package main
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/clients/util"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestCounter(t *testing.T) {

clients/crunchbase/importer/importer.go

@@ -13,12 +13,12 @@ import (
 
 	"strings"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/tealeg/xlsx"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/tealeg/xlsx"
 )
 
 var (

clients/csv/exporter/exporter_test.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
@@ -14,6 +13,7 @@ import (
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestCSVExporter(t *testing.T) {

clients/csv/importer/importer_test.go

@@ -5,13 +5,13 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestCSVImporter(t *testing.T) {

clients/flickr/flickr.go

@@ -15,12 +15,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/bradfitz/latlong"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/garyburd/go-oauth/oauth"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	"github.com/bradfitz/latlong"
+	"github.com/garyburd/go-oauth/oauth"
 )
 
 var (

clients/flickr/flickr_test.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/dataset"
+	"github.com/stretchr/testify/assert"
 )
 
 type fakeFlickrAPI struct {

clients/imgsvr/imgsvr.go

@@ -15,11 +15,11 @@ import (
 	"strconv"
 	"syscall"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/nfnt/resize"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/nfnt/resize"
 )
 
 var (

clients/music/mp3_importer/mp3_importer.go

@@ -7,9 +7,9 @@ import (
 	"log"
 	"os"
 
-	id3go "github.com/attic-labs/noms/Godeps/_workspace/src/github.com/mikkyang/id3-go"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	id3go "github.com/mikkyang/id3-go"
 )
 
 var (

clients/picasa/picasa.go

@@ -14,11 +14,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/golang.org/x/oauth2"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	"golang.org/x/oauth2"
 )
 
 const maxProcs = 25

clients/picasa/picasa_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetSizes(t *testing.T) {

clients/shove/shove_test.go

@@ -4,12 +4,12 @@ import (
 	"path"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestShove(t *testing.T) {

clients/tagdex/tagdex_test.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestTagdex(t *testing.T) {

clients/util/client_test_suite.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/d"
+	"github.com/stretchr/testify/suite"
 )
 
 type ClientTestSuite struct {

clients/util/httpcache.go

@@ -6,9 +6,9 @@ import (
 	"os/user"
 	"path"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/gregjones/httpcache"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/gregjones/httpcache/diskcache"
 	"github.com/attic-labs/noms/d"
+	"github.com/gregjones/httpcache"
+	"github.com/gregjones/httpcache/diskcache"
 )
 
 const (

clients/util/util_test.go

@@ -3,8 +3,8 @@ package util
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestLibTestSuite(t *testing.T) {

clients/xml_importer/xml_importer.go

@@ -10,12 +10,12 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/clbanning/mxj"
 	"github.com/attic-labs/noms/clients/util"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/dataset"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/clbanning/mxj"
 )
 
 var (

d/check.go

@@ -3,7 +3,7 @@ package d
 import (
 	"fmt"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 var (

d/try.go

@@ -1,6 +1,6 @@
 package d
 
-import "github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+import "github.com/stretchr/testify/assert"
 
 // Try calls f() and recovers from any panics caused by using d.Exp. The error generated by the call to d.Exp is returned.
 func Try(f func()) (err error) {

d/try_test.go

@@ -3,7 +3,7 @@ package d
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTry(t *testing.T) {

datas/datastore_common.go

@@ -3,12 +3,12 @@ package datas
 import (
 	"sync"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/errors"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
 	"github.com/attic-labs/noms/walk"
+	"github.com/syndtr/goleveldb/leveldb/errors"
 )
 
 type dataStoreCommon struct {

datas/datastore_server.go

@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
 	"github.com/attic-labs/noms/constants"
 	"github.com/attic-labs/noms/d"
+	"github.com/julienschmidt/httprouter"
 )
 
 type connectionState struct {

datas/datastore_test.go

@@ -3,9 +3,9 @@ package datas
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDataStoreAccess(t *testing.T) {

datas/remote_datastore_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestHTTPStoreTestSuite(t *testing.T) {

dataset/dataset_test.go

@@ -3,10 +3,10 @@ package dataset
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDatasetCommitTracker(t *testing.T) {

dataset/pull_test.go

@@ -3,10 +3,10 @@ package dataset
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/datas"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func createTestDataset(name string) Dataset {

nomdl/codegen/code/generate_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 type testResolver struct {

nomdl/codegen/codegen.go

@@ -18,7 +18,6 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/golang.org/x/tools/imports"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/datas"
@@ -27,6 +26,7 @@ import (
 	"github.com/attic-labs/noms/nomdl/pkg"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"golang.org/x/tools/imports"
 )
 
 var (

nomdl/codegen/codegen_test.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
-	"github.com/attic-labs/noms/Godeps/_workspace/src/golang.org/x/tools/imports"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/datas"
@@ -19,6 +17,8 @@ import (
 	"github.com/attic-labs/noms/nomdl/pkg"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/tools/imports"
 )
 
 func assertOutput(inPath, goldenPath string, t *testing.T) {

nomdl/codegen/test/clobber_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestClobber(t *testing.T) {

nomdl/codegen/test/enum_struct_test.go

@@ -3,10 +3,10 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEnum(t *testing.T) {

nomdl/codegen/test/list_int64_test.go

@@ -4,8 +4,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestListInt64Def(t *testing.T) {

nomdl/codegen/test/map_test.go

@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMapDef(t *testing.T) {

nomdl/codegen/test/ref_test.go

@@ -3,10 +3,10 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func SkipTestRef(t *testing.T) {

nomdl/codegen/test/set_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSetDef(t *testing.T) {

nomdl/codegen/test/struct_optional_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestOptionalStruct(t *testing.T) {

nomdl/codegen/test/struct_primitives_test.go

@@ -4,9 +4,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAccessors(t *testing.T) {

nomdl/codegen/test/struct_recursive_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStructRecursiveChildren(t *testing.T) {

nomdl/codegen/test/struct_test.go

@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDef(t *testing.T) {

nomdl/codegen/test/struct_with_dup_list_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStructWithDupList(t *testing.T) {

nomdl/codegen/test/struct_with_imports_test.go

@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestWithImportsDef(t *testing.T) {

nomdl/codegen/test/struct_with_list_test.go

@@ -3,10 +3,10 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStructWithList(t *testing.T) {

nomdl/codegen/test/struct_with_union_field_test.go

@@ -3,9 +3,9 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStructWithUnionField(t *testing.T) {

nomdl/codegen/test/struct_with_unions_test.go

@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/nomdl/codegen/test/gen"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStructWithUnions(t *testing.T) {

nomdl/pkg/imports_test.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestImportSuite(t *testing.T) {

nomdl/pkg/parse_test.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/d"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 const (

ref/ref_slice_test.go

@@ -4,7 +4,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRefSliceSort(t *testing.T) {

ref/ref_test.go

@@ -5,8 +5,8 @@ import (
 
 	"crypto/sha1"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/d"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseError(t *testing.T) {

tools/file/file_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/d"
+	"github.com/stretchr/testify/suite"
 )
 
 const (

tools/roll.py

@@ -1,35 +1,49 @@
 #!/usr/bin/python
 
-import os, os.path, subprocess, sys, shutil
+import argparse, os, os.path, subprocess, sys, shutil, urlparse
 
 
 def main():
-  if len(sys.argv) != 2:
-    print 'Usage: %s github.com/foo/bar' % sys.argv[0]
-    sys.exit(1)
+  parser = argparse.ArgumentParser(description='Dependency snapshotter')
+  parser.add_argument('url')
+  parser.add_argument('--path', help='path to store the dependency at, defaults to vendor/[url without protocol]')
+  parser.add_argument('--version', default='HEAD', help='version of the dependency to snapshot, defaults to HEAD')
 
-  dep = sys.argv[1]
-  if dep.startswith('http'):
-    print 'Argument should not start with "http" or "https" (https is implied)'
+  args = parser.parse_args()
+
+  url = urlparse.urlparse(args.url)
+  if url.scheme == '':
+    print 'Invalid url: no scheme'
     sys.exit(1)
 
   if not os.path.isdir('.git'):
     print '%s must be run from the root of a repository' % sys.argv[0]
     sys.exit(1)
 
-  depdir = os.path.join('vendor', dep)
+  path = url.path
+  if path.startswith('/'):
+    path = path[1:]
+
+  depdir = args.path
+  if depdir == None:
+    depdir = os.path.join('vendor', url.netloc, path)
+
   shutil.rmtree(depdir, True)
   parent = os.path.dirname(depdir)
   if not os.path.isdir(parent):
     os.makedirs(parent)
   os.chdir(parent)
 
-  subprocess.check_call(['git', 'clone', '--depth=1', 'https://%s' % dep])
-  head = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+  # Kinda sucks to clone entire repo to get a particular version, but:
+  # http://stackoverflow.com/questions/3489173/how-to-clone-git-repository-with-specific-revision-changeset
+  subprocess.check_call(['git', 'clone', args.url])
 
   os.chdir(os.path.basename(depdir))
+  subprocess.check_call(['git', 'reset', '--hard', args.version])
+  head = subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip()
+
   f = open('.version', 'w')
-  f.write(head)
+  f.write('%s\n%s\n' % (args.url, head))
   f.close()
 
   shutil.rmtree('.git')

tools/runner/serial_test.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
+	"github.com/stretchr/testify/suite"
 )
 
 const (

types/blob_leaf_codec_test.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestBlobLeafEncode(t *testing.T) {

types/blob_leaf_test.go

@@ -3,7 +3,7 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestBlobLeafLen(t *testing.T) {

types/blob_test.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func AssertSymEq(assert *assert.Assertions, a, b Value) {

types/codec_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/d"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEncode(t *testing.T) {

types/compound_blob_test.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func getTestCompoundBlob(datas ...string) compoundBlob {

types/compound_list_test.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 type testSimpleList []Value

types/compound_map_test.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 type testMap struct {

types/compound_set_test.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 type testSet struct {

types/decode_noms_value_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRead(t *testing.T) {

types/encode_noms_value_test.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestWritePrimitives(t *testing.T) {

types/enum_test.go

@@ -3,9 +3,9 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGenericEnumWriteRead(t *testing.T) {

types/equals_test.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestValueEquals(t *testing.T) {

types/get_ref_test.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGetRef(t *testing.T) {

types/incremental_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 var (

types/list_test.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestListLen(t *testing.T) {

types/map_test.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewMap(t *testing.T) {

types/meta_sequence_cursor_test.go

@@ -3,9 +3,9 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMeta(t *testing.T) {

types/package_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestType(t *testing.T) {

types/primitives_test.go

@@ -3,7 +3,7 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPrimitives(t *testing.T) {

types/read_value_test.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTolerateUngettableRefs(t *testing.T) {

types/ref_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestRefInList(t *testing.T) {

types/sequence_chunker_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 type modBoundaryChecker struct {

types/sequence_cursor_test.go

@@ -3,7 +3,7 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func newTestSequenceCursor(items [][]int) *sequenceCursor {

types/set_test.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSetLen(t *testing.T) {

types/string_test.go

@@ -3,7 +3,7 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestStringEquals(t *testing.T) {

types/struct_test.go

@@ -3,8 +3,8 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestGenericStructEquals(t *testing.T) {

types/type_test.go

@@ -3,9 +3,9 @@ package types
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTypes(t *testing.T) {

types/write_value_test.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestWriteValue(t *testing.T) {

walk/walk_test.go

@@ -3,10 +3,10 @@ package walk
 import (
 	"testing"
 
-	"github.com/attic-labs/noms/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 	"github.com/attic-labs/noms/chunks"
 	"github.com/attic-labs/noms/ref"
 	"github.com/attic-labs/noms/types"
+	"github.com/stretchr/testify/suite"
 )
 
 func TestWalkTestSuite(t *testing.T) {