vendor: go4.org/strutil go4.org/syncutil

They were internal packages (under pkg), which we are now moving to
go4.org, so we in turn need to vendor them in now.

Change-Id: I92224f731404d0bd4ca1c57492bed37cb3367ed4

app/publisher/main.go

@@ -48,10 +48,11 @@ import (
 	"camlistore.org/pkg/search"
 	"camlistore.org/pkg/server"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
 	"camlistore.org/pkg/webserver"
 
+	"go4.org/syncutil"
+
 	_ "camlistore.org/pkg/sorted/kvfile"
 )
 

cmd/camput/camput.go

@@ -31,7 +31,8 @@ import (
 	"camlistore.org/pkg/client"
 	"camlistore.org/pkg/cmdmain"
 	"camlistore.org/pkg/httputil"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 const buffered = 16 // arbitrary

cmd/camput/uploader.go

@@ -23,7 +23,8 @@ import (
 	"camlistore.org/pkg/blobserver"
 	"camlistore.org/pkg/client"
 	"camlistore.org/pkg/httputil"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 // TODO(mpl): move Uploader to pkg/client, or maybe its own pkg, and clean up files.go
@@ -56,9 +57,9 @@ type fileOptions struct {
 	// the above permanode.
 	tag string
 	// perform for the client the actions needing gpg signing when uploading a file.
-	vivify   bool
-	exifTime bool // use the time in exif metadata as the modtime if possible.
-	capCtime bool // use mtime as ctime if ctime > mtime
+	vivify       bool
+	exifTime     bool // use the time in exif metadata as the modtime if possible.
+	capCtime     bool // use mtime as ctime if ctime > mtime
 	contentsOnly bool // do not store any of the file's attributes, only its contents.
 }
 

cmd/camtool/search.go

@@ -26,7 +26,8 @@ import (
 
 	"camlistore.org/pkg/cmdmain"
 	"camlistore.org/pkg/search"
-	"camlistore.org/pkg/strutil"
+
+	"go4.org/strutil"
 )
 
 type searchCmd struct {

pkg/blobserver/blobhub.go

@@ -21,7 +21,8 @@ import (
 	"time"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 type BlobHub interface {

pkg/blobserver/blobpacked/blobpacked.go

@@ -102,9 +102,10 @@ import (
 	"camlistore.org/pkg/pools"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/strutil"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/third_party/go/pkg/archive/zip"
+
+	"go4.org/strutil"
+	"go4.org/syncutil"
 )
 
 // TODO: evaluate whether this should even be 0, to keep the schema blobs together at least.

pkg/blobserver/blobpacked/blobpacked_test.go

@@ -39,9 +39,10 @@ import (
 	"camlistore.org/pkg/context"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/test"
 	"camlistore.org/third_party/go/pkg/archive/zip"
+
+	"go4.org/syncutil"
 )
 
 const debug = false

pkg/blobserver/diskpacked/diskpacked.go

@@ -53,10 +53,11 @@ import (
 	"camlistore.org/pkg/context"
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/strutil"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types"
 	"camlistore.org/third_party/github.com/camlistore/lock"
+
+	"go4.org/strutil"
+	"go4.org/syncutil"
 )
 
 // TODO(wathiede): replace with glog.V(2) when we decide our logging story.

pkg/blobserver/google/cloudstorage/storage.go

@@ -40,7 +40,8 @@ import (
 	"camlistore.org/pkg/googlestorage"
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/oauthutil"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"golang.org/x/oauth2"
 )

pkg/blobserver/localdisk/stat.go

@@ -20,8 +20,9 @@ import (
 	"os"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types"
+
+	"go4.org/syncutil"
 )
 
 const maxParallelStats = 20

pkg/blobserver/mongo/remove.go

@@ -18,7 +18,8 @@ package mongo
 
 import (
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"camlistore.org/third_party/labix.org/v2/mgo"
 	"camlistore.org/third_party/labix.org/v2/mgo/bson"

pkg/blobserver/mongo/stat.go

@@ -20,7 +20,8 @@ import (
 	"fmt"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"camlistore.org/third_party/labix.org/v2/mgo/bson"
 )

pkg/blobserver/namespace/ns.go

@@ -35,7 +35,8 @@ import (
 	"camlistore.org/pkg/context"
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/strutil"
+
+	"go4.org/strutil"
 )
 
 type nsto struct {

pkg/blobserver/s3/remove.go

@@ -18,7 +18,8 @@ package s3
 
 import (
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 var removeGate = syncutil.NewGate(20) // arbitrary

pkg/blobserver/s3/stat.go

@@ -21,7 +21,8 @@ import (
 	"os"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 var statGate = syncutil.NewGate(20) // arbitrary

pkg/blobserver/storagetest/storagetest.go

@@ -32,8 +32,9 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/blobserver"
 	"camlistore.org/pkg/context"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/test"
+
+	"go4.org/syncutil"
 )
 
 type Opts struct {

pkg/client/client.go

@@ -44,8 +44,9 @@ import (
 	"camlistore.org/pkg/osutil"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/search"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/syncutil"
 )
 
 // A Client provides access to a Camlistore server.

pkg/conv/conv.go

@@ -23,7 +23,8 @@ import (
 	"fmt"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/strutil"
+
+	"go4.org/strutil"
 )
 
 func ParseFields(v []byte, dst ...interface{}) error {

pkg/deploy/gce/deploy.go

@@ -42,7 +42,8 @@ import (
 	"camlistore.org/pkg/context"
 	"camlistore.org/pkg/httputil"
 	"camlistore.org/pkg/osutil"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"golang.org/x/oauth2"
 	// TODO(mpl): switch to google.golang.org/cloud/compute

pkg/fs/mut.go

@@ -34,7 +34,8 @@ import (
 	"camlistore.org/pkg/readerutil"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/search"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"camlistore.org/third_party/bazil.org/fuse"
 	"camlistore.org/third_party/bazil.org/fuse/fs"

pkg/fs/roots.go

@@ -28,9 +28,10 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/search"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/third_party/bazil.org/fuse"
 	"camlistore.org/third_party/bazil.org/fuse/fs"
+
+	"go4.org/syncutil"
 )
 
 const refreshTime = 1 * time.Minute

pkg/gc/gc.go

@@ -22,7 +22,8 @@ import (
 	"fmt"
 
 	"camlistore.org/pkg/context"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 const buffered = 32 // arbitrary

pkg/importer/importer.go

@@ -40,8 +40,9 @@ import (
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/search"
 	"camlistore.org/pkg/server"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/syncutil"
 )
 
 const (

pkg/importer/picasa/picasa.go

@@ -37,7 +37,8 @@ import (
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/schema/nodeattr"
 	"camlistore.org/pkg/search"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 
 	"camlistore.org/third_party/code.google.com/p/goauth2/oauth"
 	"camlistore.org/third_party/github.com/tgulacsi/picago"

pkg/importer/pinboard/pinboard.go

@@ -57,7 +57,8 @@ import (
 	"camlistore.org/pkg/importer"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/schema/nodeattr"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 func init() {

pkg/importer/twitter/twitter.go

@@ -40,8 +40,9 @@ import (
 	"camlistore.org/pkg/importer"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/schema/nodeattr"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/third_party/github.com/garyburd/go-oauth/oauth"
+
+	"go4.org/syncutil"
 )
 
 const (

pkg/index/corpus.go

@@ -35,9 +35,10 @@ import (
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/schema/nodeattr"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/strutil"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/strutil"
+	"go4.org/syncutil"
 )
 
 // Corpus is an in-memory summary of all of a user's blobs' metadata.

pkg/index/index.go

@@ -36,9 +36,10 @@ import (
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/strutil"
 	"camlistore.org/pkg/types"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/strutil"
 )
 
 func init() {

pkg/schema/filereader.go

@@ -29,8 +29,9 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/env"
 	"camlistore.org/pkg/singleflight"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types"
+
+	"go4.org/syncutil"
 )
 
 const closedIndex = -1

pkg/schema/filewriter.go

@@ -28,7 +28,8 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/blobserver"
 	"camlistore.org/pkg/rollsum"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 const (

pkg/schema/schema.go

@@ -41,11 +41,12 @@ import (
 	"unicode/utf8"
 
 	"camlistore.org/pkg/blob"
-	"camlistore.org/pkg/strutil"
 	"camlistore.org/pkg/types"
 	"camlistore.org/third_party/github.com/bradfitz/latlong"
 	"camlistore.org/third_party/github.com/rwcarlsen/goexif/exif"
 	"camlistore.org/third_party/github.com/rwcarlsen/goexif/tiff"
+
+	"go4.org/strutil"
 )
 
 func init() {

pkg/search/describe.go

@@ -31,9 +31,10 @@ import (
 
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/httputil"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/syncutil"
 )
 
 func (sh *Handler) serveDescribe(rw http.ResponseWriter, req *http.Request) {

pkg/search/query.go

@@ -35,9 +35,10 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/context"
 	"camlistore.org/pkg/index"
-	"camlistore.org/pkg/strutil"
 	"camlistore.org/pkg/types"
 	"camlistore.org/pkg/types/camtypes"
+
+	"go4.org/strutil"
 )
 
 type SortType int

pkg/server/image.go

@@ -40,9 +40,10 @@ import (
 	"camlistore.org/pkg/schema"
 	"camlistore.org/pkg/search"
 	"camlistore.org/pkg/singleflight"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types"
 
+	"go4.org/syncutil"
+
 	_ "camlistore.org/third_party/github.com/nf/cr2"
 	"camlistore.org/third_party/go/pkg/image/jpeg"
 )

pkg/server/sync.go

@@ -40,9 +40,10 @@ import (
 	"camlistore.org/pkg/index"
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
 	"camlistore.org/third_party/code.google.com/p/xsrftoken"
+
+	"go4.org/syncutil"
 )
 
 const (

pkg/server/ui.go

@@ -39,7 +39,6 @@ import (
 	"camlistore.org/pkg/search"
 	"camlistore.org/pkg/server/app"
 	"camlistore.org/pkg/sorted"
-	"camlistore.org/pkg/syncutil"
 	"camlistore.org/pkg/types/camtypes"
 	uistatic "camlistore.org/server/camlistored/ui"
 	closurestatic "camlistore.org/server/camlistored/ui/closure"
@@ -48,6 +47,8 @@ import (
 	glitchstatic "camlistore.org/third_party/glitch"
 	lessstatic "camlistore.org/third_party/less"
 	reactstatic "camlistore.org/third_party/react"
+
+	"go4.org/syncutil"
 )
 
 var (

pkg/video/thumbnail/service.go

@@ -40,7 +40,8 @@ import (
 	"camlistore.org/pkg/blob"
 	"camlistore.org/pkg/jsonconfig"
 	"camlistore.org/pkg/netutil"
-	"camlistore.org/pkg/syncutil"
+
+	"go4.org/syncutil"
 )
 
 // A Service controls the generation of video thumbnails.

vendor/go4.org/syncutil/lock.go

@@ -25,7 +25,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"camlistore.org/pkg/strutil"
+	"go4.org/strutil"
 )
 
 // RWMutexTracker is a sync.RWMutex that tracks who owns the current

vendor/go4.org/syncutil/sem_test.go

@@ -3,7 +3,7 @@ package syncutil_test
 import (
 	"testing"
 
-	"camlistore.org/pkg/syncutil"
+	"go4.org/syncutil"
 )
 
 func TestSem(t *testing.T) {