From 6192319df58129fde14054ea48217d41b8b97626 Mon Sep 17 00:00:00 2001 From: Will Scott Date: Sat, 21 Nov 2020 18:05:00 -0800 Subject: [PATCH] Update canonical URL to github.com/polydawn/rio Signed-off-by: Will Scott --- .gitmodules | 4 ++-- .gopath/self | 2 +- .../src/github.com/polydawn/go-timeless-api | 1 + .gopath/src/github.com/polydawn/rio | 1 + .gopath/src/go.polydawn.net/go-timeless-api | 1 - .gopath/src/go.polydawn.net/rio | 1 - cache/filesetCache.go | 6 +++--- cmd/rio/demuxes.go | 8 ++++---- cmd/rio/main.go | 10 +++++----- cmd/rio/main_test.go | 10 +++++----- config/config.go | 2 +- doc/dev/README.md | 16 +++++++-------- fs/metadata.go | 2 +- fs/nilfs/nilfs.go | 2 +- fs/osfs/osfs.go | 2 +- fs/osfs/osfs_test.go | 6 +++--- fs/osfs/utimes_darwin.go | 2 +- fs/osfs/utimes_linux.go | 2 +- fs/tests/fsTests.go | 2 +- fs/walk.go | 2 +- fsOp/convenience.go | 4 ++-- fsOp/convenience_test.go | 6 +++--- fsOp/placefile.go | 2 +- fsOp/placefile_test.go | 6 +++--- fsOp/scanfile.go | 2 +- goad | 2 +- stitch/placer/aufsPlacer_linux.go | 8 ++++---- stitch/placer/bindPlacer_linux.go | 4 ++-- stitch/placer/copyPlacer.go | 8 ++++---- stitch/placer/mountPlacer_darwin.go | 2 +- stitch/placer/overlayPlacer_linux.go | 8 ++++---- stitch/placer/placer.go | 2 +- stitch/placer/placerMux.go | 6 +++--- stitch/placer/placer_test.go | 8 ++++---- stitch/placer/util.go | 8 ++++---- stitch/treePack.go | 6 +++--- stitch/treeUnpack.go | 16 +++++++-------- stitch/treeUnpack_test.go | 14 ++++++------- testutil/fsHelpers.go | 2 +- testutil/requirements.go | 2 +- testutil/withTmpdir.go | 2 +- transmat/git/doc.go | 2 +- transmat/git/git_unpack.go | 20 +++++++++---------- transmat/git/git_warehouse.go | 10 +++++----- transmat/mixins/buffer/fsBufferImpl.go | 4 ++-- transmat/mixins/cache/filesetCacheImpl.go | 18 ++++++++--------- transmat/mixins/filters/applyFilters.go | 6 +++--- transmat/mixins/fshash/bucket.go | 4 ++-- transmat/mixins/fshash/bucketHash.go | 4 ++-- transmat/mixins/fshash/bucket_memory.go | 4 ++-- transmat/mixins/log/log.go | 6 +++--- transmat/mixins/tests/fixturefiles.go | 4 ++-- transmat/mixins/tests/mirrorTests.go | 10 +++++----- transmat/mixins/tests/packTests.go | 10 +++++----- transmat/mixins/tests/unpackTests.go | 16 +++++++-------- transmat/tar/doc.go | 6 +++--- transmat/tar/tar_format.go | 4 ++-- transmat/tar/tar_mirror_test.go | 10 +++++----- transmat/tar/tar_pack.go | 16 +++++++-------- transmat/tar/tar_pack_test.go | 4 ++-- transmat/tar/tar_scan_test.go | 8 ++++---- transmat/tar/tar_unpack.go | 18 ++++++++--------- transmat/tar/tar_unpack_test.go | 14 ++++++------- transmat/util/unpack.go | 12 +++++------ transmat/util/unpackingMirror.go | 8 ++++---- transmat/util/unpackingScanner.go | 10 +++++----- transmat/util/warehouse.go | 12 +++++------ transmat/zip/doc.go | 6 +++--- transmat/zip/zip_format.go | 6 +++--- transmat/zip/zip_mirror_test.go | 10 +++++----- transmat/zip/zip_pack.go | 16 +++++++-------- transmat/zip/zip_pack_test.go | 4 ++-- transmat/zip/zip_scan_test.go | 8 ++++---- transmat/zip/zip_unpack.go | 20 +++++++++---------- transmat/zip/zip_unpack_test.go | 14 ++++++------- warehouse/impl/git/git.go | 8 ++++---- warehouse/impl/git/git_test.go | 12 +++++------ warehouse/impl/kvfs/kvfs.go | 12 +++++------ warehouse/impl/kvhttp/kvhttp.go | 8 ++++---- warehouse/util/util.go | 2 +- warehouse/warehouse.go | 2 +- 81 files changed, 284 insertions(+), 284 deletions(-) create mode 160000 .gopath/src/github.com/polydawn/go-timeless-api create mode 120000 .gopath/src/github.com/polydawn/rio delete mode 160000 .gopath/src/go.polydawn.net/go-timeless-api delete mode 120000 .gopath/src/go.polydawn.net/rio diff --git a/.gitmodules b/.gitmodules index 6e1e39a..4cbb0c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,8 +28,8 @@ [submodule ".gopath/src/github.com/warpfork/go-errcat"] path = .gopath/src/github.com/warpfork/go-errcat url = https://github.com/warpfork/go-errcat -[submodule ".gopath/src/go.polydawn.net/go-timeless-api"] - path = .gopath/src/go.polydawn.net/go-timeless-api +[submodule ".gopath/src/github.com/polydawn/go-timeless-api"] + path = .gopath/src/github.com/polydawn/go-timeless-api url = https://github.com/polydawn/go-timeless-api [submodule ".gopath/src/gopkg.in/warnings.v0"] path = .gopath/src/gopkg.in/warnings.v0 diff --git a/.gopath/self b/.gopath/self index 4b1e8ad..0637b00 120000 --- a/.gopath/self +++ b/.gopath/self @@ -1 +1 @@ -src/go.polydawn.net/rio \ No newline at end of file +src/github.com/polydawn/rio \ No newline at end of file diff --git a/.gopath/src/github.com/polydawn/go-timeless-api b/.gopath/src/github.com/polydawn/go-timeless-api new file mode 160000 index 0000000..7399661 --- /dev/null +++ b/.gopath/src/github.com/polydawn/go-timeless-api @@ -0,0 +1 @@ +Subproject commit 7399661094a6545cb1e541fcde314fc1dc359066 diff --git a/.gopath/src/github.com/polydawn/rio b/.gopath/src/github.com/polydawn/rio new file mode 120000 index 0000000..11a54ed --- /dev/null +++ b/.gopath/src/github.com/polydawn/rio @@ -0,0 +1 @@ +../../../../ \ No newline at end of file diff --git a/.gopath/src/go.polydawn.net/go-timeless-api b/.gopath/src/go.polydawn.net/go-timeless-api deleted file mode 160000 index 0ece408..0000000 --- a/.gopath/src/go.polydawn.net/go-timeless-api +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ece408663edb9dbc6109ef8690f8425f0d8f5f4 diff --git a/.gopath/src/go.polydawn.net/rio b/.gopath/src/go.polydawn.net/rio deleted file mode 120000 index 1b20c9f..0000000 --- a/.gopath/src/go.polydawn.net/rio +++ /dev/null @@ -1 +0,0 @@ -../../../ \ No newline at end of file diff --git a/cache/filesetCache.go b/cache/filesetCache.go index ce3c1b0..3a3c027 100644 --- a/cache/filesetCache.go +++ b/cache/filesetCache.go @@ -3,9 +3,9 @@ package cache import ( "fmt" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/rio/fs" - whutil "go.polydawn.net/rio/warehouse/util" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/rio/fs" + whutil "github.com/polydawn/rio/warehouse/util" ) func ShelfFor(wareID api.WareID) fs.RelPath { diff --git a/cmd/rio/demuxes.go b/cmd/rio/demuxes.go index b1ab4ef..868f407 100644 --- a/cmd/rio/demuxes.go +++ b/cmd/rio/demuxes.go @@ -3,10 +3,10 @@ package main import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/transmat/git" - tartrans "go.polydawn.net/rio/transmat/tar" - ziptrans "go.polydawn.net/rio/transmat/zip" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/transmat/git" + tartrans "github.com/polydawn/rio/transmat/tar" + ziptrans "github.com/polydawn/rio/transmat/zip" ) func demuxPackTool(packType string) (rio.PackFunc, error) { diff --git a/cmd/rio/main.go b/cmd/rio/main.go index 329f5c1..e67b483 100644 --- a/cmd/rio/main.go +++ b/cmd/rio/main.go @@ -14,11 +14,11 @@ import ( . "github.com/warpfork/go-errcat" "gopkg.in/alecthomas/kingpin.v2" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" ) func main() { diff --git a/cmd/rio/main_test.go b/cmd/rio/main_test.go index 5485fc3..84e5a01 100644 --- a/cmd/rio/main_test.go +++ b/cmd/rio/main_test.go @@ -11,11 +11,11 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/testutil" ) func stdBuffers() (stdin, stdout, stderr *bytes.Buffer) { diff --git a/config/config.go b/config/config.go index 1d7e26f..e437d37 100644 --- a/config/config.go +++ b/config/config.go @@ -15,7 +15,7 @@ import ( "os" "path/filepath" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) /* diff --git a/doc/dev/README.md b/doc/dev/README.md index 6b60f9a..c92db81 100644 --- a/doc/dev/README.md +++ b/doc/dev/README.md @@ -57,15 +57,15 @@ Whether or not this is a good idea is a whole different question of course. code layout ----------- -- `go.polydawn.net/rio` -- main package. Interface definitions. Other projects using `rio` as a library should import this package -- and few others. -- `go.polydawn.net/rio/fs` -- types for paths, and an abstract filesystem. All `rio` code uses this when describing files and filesystem metadata. - - `go.polydawn.net/rio/fs/osfs` -- a concrete implementation of the `fs` interfaces, implemented with a regular filesystem. -- `go.polydawn.net/rio/fsOp` -- operations on filesystems. Distinct from `fs` because `fsOp` is more intention-oriented; `fs` is a fairly direct proxy to syscalls, and much less friendly. -- `go.polydawn.net/rio/warehouse/*` -- implementations of storage warehouses. Local filesystem, S3, GCS, IPFS... each get their own package under here. -- `go.polydawn.net/transmat/*` -- implementations of filesystem packing formats. E.g. `tar`. +- `github.com/polydawn/rio` -- main package. Interface definitions. Other projects using `rio` as a library should import this package -- and few others. +- `github.com/polydawn/rio/fs` -- types for paths, and an abstract filesystem. All `rio` code uses this when describing files and filesystem metadata. + - `github.com/polydawn/rio/fs/osfs` -- a concrete implementation of the `fs` interfaces, implemented with a regular filesystem. +- `github.com/polydawn/rio/fsOp` -- operations on filesystems. Distinct from `fs` because `fsOp` is more intention-oriented; `fs` is a fairly direct proxy to syscalls, and much less friendly. +- `github.com/polydawn/rio/warehouse/*` -- implementations of storage warehouses. Local filesystem, S3, GCS, IPFS... each get their own package under here. +- `github.com/polydawn/rio/transmat/*` -- implementations of filesystem packing formats. E.g. `tar`. - REVIEW: so is this name a bug and the whole package should be `s/transmat/packing/`?? Probably -- `go.polydawn.net/transmat/mixins/fshash` -- helper functions for accumulating a hash for a fileset. Used in some of the transmat implementations. -- `go.polydawn.net/lib/*` -- grabbag library functions; these are things that *probably* make sense even more broadly than rio, but are vendored here for simplicity's sake. +- `github.com/polydawn/rio/transmat/mixins/fshash` -- helper functions for accumulating a hash for a fileset. Used in some of the transmat implementations. +- `github.com/polydawn/rio/lib/*` -- grabbag library functions; these are things that *probably* make sense even more broadly than rio, but are vendored here for simplicity's sake. Overall, seen from the outside (as a consumer of `rio`-as-a-library): diff --git a/fs/metadata.go b/fs/metadata.go index 3ca000c..bed6ce4 100644 --- a/fs/metadata.go +++ b/fs/metadata.go @@ -3,7 +3,7 @@ package fs import ( "time" - api "go.polydawn.net/go-timeless-api" + api "github.com/polydawn/go-timeless-api" ) type Metadata struct { diff --git a/fs/nilfs/nilfs.go b/fs/nilfs/nilfs.go index 70c5d73..5484d68 100644 --- a/fs/nilfs/nilfs.go +++ b/fs/nilfs/nilfs.go @@ -5,7 +5,7 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func New() fs.FS { diff --git a/fs/osfs/osfs.go b/fs/osfs/osfs.go index 767173d..f93124c 100644 --- a/fs/osfs/osfs.go +++ b/fs/osfs/osfs.go @@ -7,7 +7,7 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func init() { diff --git a/fs/osfs/osfs_test.go b/fs/osfs/osfs_test.go index 1ccb925..5259a27 100644 --- a/fs/osfs/osfs_test.go +++ b/fs/osfs/osfs_test.go @@ -5,9 +5,9 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/tests" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/tests" + "github.com/polydawn/rio/testutil" ) func TestAll(t *testing.T) { diff --git a/fs/osfs/utimes_darwin.go b/fs/osfs/utimes_darwin.go index a454284..45236e9 100644 --- a/fs/osfs/utimes_darwin.go +++ b/fs/osfs/utimes_darwin.go @@ -13,7 +13,7 @@ import ( "golang.org/x/sys/unix" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) const ( diff --git a/fs/osfs/utimes_linux.go b/fs/osfs/utimes_linux.go index 21d3235..b531cb7 100644 --- a/fs/osfs/utimes_linux.go +++ b/fs/osfs/utimes_linux.go @@ -11,7 +11,7 @@ import ( "time" "unsafe" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func (afs *osFS) SetTimesLNano(path fs.RelPath, mtime time.Time, atime time.Time) error { diff --git a/fs/tests/fsTests.go b/fs/tests/fsTests.go index e62261c..622db2e 100644 --- a/fs/tests/fsTests.go +++ b/fs/tests/fsTests.go @@ -6,7 +6,7 @@ import ( . "github.com/smartystreets/goconvey/convey" "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func CheckBaseLstat(afs fs.FS) { diff --git a/fs/walk.go b/fs/walk.go index 2814130..32827f0 100644 --- a/fs/walk.go +++ b/fs/walk.go @@ -3,7 +3,7 @@ package fs import ( "sort" - "go.polydawn.net/rio/lib/treewalk" + "github.com/polydawn/rio/lib/treewalk" ) type WalkFunc func(filenode *FilewalkNode) error diff --git a/fsOp/convenience.go b/fsOp/convenience.go index 6a1d97f..215c0df 100644 --- a/fsOp/convenience.go +++ b/fsOp/convenience.go @@ -6,8 +6,8 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" ) /* diff --git a/fsOp/convenience_test.go b/fsOp/convenience_test.go index 4c6a4ef..c2220e4 100644 --- a/fsOp/convenience_test.go +++ b/fsOp/convenience_test.go @@ -9,9 +9,9 @@ import ( . "github.com/smartystreets/goconvey/convey" "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - . "go.polydawn.net/rio/testutil" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + . "github.com/polydawn/rio/testutil" ) func TestMkdirAll(t *testing.T) { diff --git a/fsOp/placefile.go b/fsOp/placefile.go index 8974529..bf43510 100644 --- a/fsOp/placefile.go +++ b/fsOp/placefile.go @@ -7,7 +7,7 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) var ( diff --git a/fsOp/placefile_test.go b/fsOp/placefile_test.go index 1c44238..5fcfabe 100644 --- a/fsOp/placefile_test.go +++ b/fsOp/placefile_test.go @@ -7,9 +7,9 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/testutil" ) func TestPlaceFile(t *testing.T) { diff --git a/fsOp/scanfile.go b/fsOp/scanfile.go index 4c7513f..ce8e681 100644 --- a/fsOp/scanfile.go +++ b/fsOp/scanfile.go @@ -4,7 +4,7 @@ import ( "io" "os" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) /* diff --git a/goad b/goad index 459ef9d..2ae6c74 100755 --- a/goad +++ b/goad @@ -3,7 +3,7 @@ set -euo pipefail ### Project details name="rio" -pkg="go.polydawn.net/$name" # everything under here will be tested +pkg="github.com/polydawn/$name" # everything under here will be tested cmd="$pkg/cmd/$name" # if you have a main.main not at the repo root, set this diff --git a/stitch/placer/aufsPlacer_linux.go b/stitch/placer/aufsPlacer_linux.go index a9a5f6c..0372123 100644 --- a/stitch/placer/aufsPlacer_linux.go +++ b/stitch/placer/aufsPlacer_linux.go @@ -9,10 +9,10 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/lib/guid" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/lib/guid" ) /* diff --git a/stitch/placer/bindPlacer_linux.go b/stitch/placer/bindPlacer_linux.go index a72a184..70877e2 100644 --- a/stitch/placer/bindPlacer_linux.go +++ b/stitch/placer/bindPlacer_linux.go @@ -8,8 +8,8 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" ) var _ Placer = BindPlacer diff --git a/stitch/placer/copyPlacer.go b/stitch/placer/copyPlacer.go index d331393..ff02893 100644 --- a/stitch/placer/copyPlacer.go +++ b/stitch/placer/copyPlacer.go @@ -6,10 +6,10 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" ) var _ Placer = CopyPlacer diff --git a/stitch/placer/mountPlacer_darwin.go b/stitch/placer/mountPlacer_darwin.go index 051001a..6f3e413 100644 --- a/stitch/placer/mountPlacer_darwin.go +++ b/stitch/placer/mountPlacer_darwin.go @@ -5,7 +5,7 @@ package placer import ( "errors" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func NewAufsPlacer(workDir fs.AbsolutePath) (Placer, error) { diff --git a/stitch/placer/overlayPlacer_linux.go b/stitch/placer/overlayPlacer_linux.go index 40cdc75..bf1585f 100644 --- a/stitch/placer/overlayPlacer_linux.go +++ b/stitch/placer/overlayPlacer_linux.go @@ -9,10 +9,10 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/lib/guid" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/lib/guid" ) /* diff --git a/stitch/placer/placer.go b/stitch/placer/placer.go index 0d30627..9ba72d1 100644 --- a/stitch/placer/placer.go +++ b/stitch/placer/placer.go @@ -1,7 +1,7 @@ package placer import ( - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) type Placer func(srcPath, dstPath fs.AbsolutePath, writable bool) (Janitor, error) diff --git a/stitch/placer/placerMux.go b/stitch/placer/placerMux.go index 15794a3..b9833e4 100644 --- a/stitch/placer/placerMux.go +++ b/stitch/placer/placerMux.go @@ -7,9 +7,9 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/config" - "go.polydawn.net/rio/fs" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/config" + "github.com/polydawn/rio/fs" ) /* diff --git a/stitch/placer/placer_test.go b/stitch/placer/placer_test.go index f7c34ae..a2bd3be 100644 --- a/stitch/placer/placer_test.go +++ b/stitch/placer/placer_test.go @@ -7,10 +7,10 @@ import ( . "github.com/smartystreets/goconvey/convey" "github.com/warpfork/go-errcat" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - . "go.polydawn.net/rio/testutil" - . "go.polydawn.net/rio/transmat/mixins/tests" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + . "github.com/polydawn/rio/testutil" + . "github.com/polydawn/rio/transmat/mixins/tests" ) func TestPlacers(t *testing.T) { diff --git a/stitch/placer/util.go b/stitch/placer/util.go index f062849..b94703c 100644 --- a/stitch/placer/util.go +++ b/stitch/placer/util.go @@ -5,10 +5,10 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" ) var rootFs = osfs.New(fs.MustAbsolutePath("/")) // handy, since placers are always absolutized diff --git a/stitch/treePack.go b/stitch/treePack.go index dd90c9a..47622aa 100644 --- a/stitch/treePack.go +++ b/stitch/treePack.go @@ -5,9 +5,9 @@ import ( "sort" "sync" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" ) /* diff --git a/stitch/treeUnpack.go b/stitch/treeUnpack.go index 2cb2290..8cecebd 100644 --- a/stitch/treeUnpack.go +++ b/stitch/treeUnpack.go @@ -9,14 +9,14 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/cache" - "go.polydawn.net/rio/config" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/stitch/placer" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/config" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/stitch/placer" + "github.com/polydawn/rio/cache" ) /* diff --git a/stitch/treeUnpack_test.go b/stitch/treeUnpack_test.go index f09e04b..1c0f835 100644 --- a/stitch/treeUnpack_test.go +++ b/stitch/treeUnpack_test.go @@ -9,13 +9,13 @@ import ( . "github.com/smartystreets/goconvey/convey" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - . "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" - "go.polydawn.net/rio/transmat/tar" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + . "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" + "github.com/polydawn/rio/transmat/tar" ) func TestTreeUnpack(t *testing.T) { diff --git a/testutil/fsHelpers.go b/testutil/fsHelpers.go index d37855c..2e868aa 100644 --- a/testutil/fsHelpers.go +++ b/testutil/fsHelpers.go @@ -3,7 +3,7 @@ package testutil import ( "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func ShouldStat(afs fs.FS, path fs.RelPath) fs.Metadata { diff --git a/testutil/requirements.go b/testutil/requirements.go index f46e85c..3649035 100644 --- a/testutil/requirements.go +++ b/testutil/requirements.go @@ -9,7 +9,7 @@ import ( "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/caps" + "github.com/polydawn/rio/caps" ) type ConveyRequirement struct { diff --git a/testutil/withTmpdir.go b/testutil/withTmpdir.go index 4089061..9f73b56 100644 --- a/testutil/withTmpdir.go +++ b/testutil/withTmpdir.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "go.polydawn.net/rio/fs" + "github.com/polydawn/rio/fs" ) func WithTmpdir(fn func(tmpDir fs.AbsolutePath)) { diff --git a/transmat/git/doc.go b/transmat/git/doc.go index 95e1352..36d7eb3 100644 --- a/transmat/git/doc.go +++ b/transmat/git/doc.go @@ -20,7 +20,7 @@ package git import ( - "go.polydawn.net/go-timeless-api" + "github.com/polydawn/go-timeless-api" ) const PackType = api.PackType("git") diff --git a/transmat/git/git_unpack.go b/transmat/git/git_unpack.go index fe87834..a76c5a4 100644 --- a/transmat/git/git_unpack.go +++ b/transmat/git/git_unpack.go @@ -10,16 +10,16 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/filemode" "gopkg.in/src-d/go-git.v4/plumbing/object" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/config" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/transmat/mixins/cache" - "go.polydawn.net/rio/transmat/mixins/filters" - "go.polydawn.net/rio/transmat/mixins/fshash" - gitWarehouse "go.polydawn.net/rio/warehouse/impl/git" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/config" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/transmat/mixins/cache" + "github.com/polydawn/rio/transmat/mixins/filters" + "github.com/polydawn/rio/transmat/mixins/fshash" + gitWarehouse "github.com/polydawn/rio/warehouse/impl/git" ) var ( diff --git a/transmat/git/git_warehouse.go b/transmat/git/git_warehouse.go index 05355c7..ef2da3a 100644 --- a/transmat/git/git_warehouse.go +++ b/transmat/git/git_warehouse.go @@ -7,11 +7,11 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/transmat/mixins/log" - gitWarehouse "go.polydawn.net/rio/warehouse/impl/git" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/transmat/mixins/log" + gitWarehouse "github.com/polydawn/rio/warehouse/impl/git" ) // Pick a warehouse. diff --git a/transmat/mixins/buffer/fsBufferImpl.go b/transmat/mixins/buffer/fsBufferImpl.go index 3a96cd2..6f8ec76 100644 --- a/transmat/mixins/buffer/fsBufferImpl.go +++ b/transmat/mixins/buffer/fsBufferImpl.go @@ -8,8 +8,8 @@ import ( . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" ) type tempRemover struct { diff --git a/transmat/mixins/cache/filesetCacheImpl.go b/transmat/mixins/cache/filesetCacheImpl.go index aaddc2a..c561018 100644 --- a/transmat/mixins/cache/filesetCacheImpl.go +++ b/transmat/mixins/cache/filesetCacheImpl.go @@ -6,15 +6,15 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - cacheapi "go.polydawn.net/rio/cache" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/lib/guid" - "go.polydawn.net/rio/stitch/placer" - "go.polydawn.net/rio/transmat/mixins/log" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + cacheapi "github.com/polydawn/rio/cache" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/lib/guid" + "github.com/polydawn/rio/stitch/placer" + "github.com/polydawn/rio/transmat/mixins/log" ) var ShelfFor = cacheapi.ShelfFor diff --git a/transmat/mixins/filters/applyFilters.go b/transmat/mixins/filters/applyFilters.go index 4ce9d2c..6203905 100644 --- a/transmat/mixins/filters/applyFilters.go +++ b/transmat/mixins/filters/applyFilters.go @@ -4,10 +4,10 @@ import ( "os" "strconv" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" ) var ( diff --git a/transmat/mixins/fshash/bucket.go b/transmat/mixins/fshash/bucket.go index 19f84da..8f05784 100644 --- a/transmat/mixins/fshash/bucket.go +++ b/transmat/mixins/fshash/bucket.go @@ -3,8 +3,8 @@ package fshash import ( "fmt" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/lib/treewalk" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/lib/treewalk" ) /* diff --git a/transmat/mixins/fshash/bucketHash.go b/transmat/mixins/fshash/bucketHash.go index 130fdf8..b703be1 100644 --- a/transmat/mixins/fshash/bucketHash.go +++ b/transmat/mixins/fshash/bucketHash.go @@ -8,8 +8,8 @@ import ( "github.com/polydawn/refmt/cbor" "github.com/polydawn/refmt/tok" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/lib/treewalk" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/lib/treewalk" ) /* diff --git a/transmat/mixins/fshash/bucket_memory.go b/transmat/mixins/fshash/bucket_memory.go index 8a21a89..58ed1e1 100644 --- a/transmat/mixins/fshash/bucket_memory.go +++ b/transmat/mixins/fshash/bucket_memory.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/lib/treewalk" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/lib/treewalk" ) var _ Bucket = &MemoryBucket{} diff --git a/transmat/mixins/log/log.go b/transmat/mixins/log/log.go index eebb758..1578fb9 100644 --- a/transmat/mixins/log/log.go +++ b/transmat/mixins/log/log.go @@ -12,9 +12,9 @@ import ( "fmt" "time" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" ) func CacheHasIt(mon rio.Monitor, ware api.WareID) { diff --git a/transmat/mixins/tests/fixturefiles.go b/transmat/mixins/tests/fixturefiles.go index 344a774..cbf2cca 100644 --- a/transmat/mixins/tests/fixturefiles.go +++ b/transmat/mixins/tests/fixturefiles.go @@ -4,8 +4,8 @@ import ( "bytes" "time" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fsOp" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fsOp" ) type FixtureFile struct { diff --git a/transmat/mixins/tests/mirrorTests.go b/transmat/mixins/tests/mirrorTests.go index ec6d4a6..1749409 100644 --- a/transmat/mixins/tests/mirrorTests.go +++ b/transmat/mixins/tests/mirrorTests.go @@ -5,11 +5,11 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/testutil" ) func CheckMirror(packType api.PackType, mirror rio.MirrorFunc, pack rio.PackFunc, unpack rio.UnpackFunc, target api.WarehouseLocation, source api.WarehouseLocation) { diff --git a/transmat/mixins/tests/packTests.go b/transmat/mixins/tests/packTests.go index 5023a2b..57cd829 100644 --- a/transmat/mixins/tests/packTests.go +++ b/transmat/mixins/tests/packTests.go @@ -6,11 +6,11 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/testutil" ) func CheckPackProducesConsistentHash(packType api.PackType, pack rio.PackFunc) { diff --git a/transmat/mixins/tests/unpackTests.go b/transmat/mixins/tests/unpackTests.go index ba24ff8..b305d62 100644 --- a/transmat/mixins/tests/unpackTests.go +++ b/transmat/mixins/tests/unpackTests.go @@ -8,14 +8,14 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/cache" - "go.polydawn.net/rio/config" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/cache" + "github.com/polydawn/rio/config" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/testutil" ) func CheckRoundTrip(packType api.PackType, pack rio.PackFunc, unpack rio.UnpackFunc, warehouseAddr api.WarehouseLocation) { diff --git a/transmat/tar/doc.go b/transmat/tar/doc.go index 38dd9a3..6af8fec 100644 --- a/transmat/tar/doc.go +++ b/transmat/tar/doc.go @@ -5,9 +5,9 @@ package tartrans import ( - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/transmat/util" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/transmat/util" ) const PackType = api.PackType("tar") diff --git a/transmat/tar/tar_format.go b/transmat/tar/tar_format.go index d831fed..dc66096 100644 --- a/transmat/tar/tar_format.go +++ b/transmat/tar/tar_format.go @@ -4,9 +4,9 @@ import ( "archive/tar" "fmt" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" ) // Mutate tar.Header fields to match the given fmeta. diff --git a/transmat/tar/tar_mirror_test.go b/transmat/tar/tar_mirror_test.go index 6984306..db6d6e7 100644 --- a/transmat/tar/tar_mirror_test.go +++ b/transmat/tar/tar_mirror_test.go @@ -6,11 +6,11 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestTarMirror(t *testing.T) { diff --git a/transmat/tar/tar_pack.go b/transmat/tar/tar_pack.go index 4edc0da..e7e22be 100644 --- a/transmat/tar/tar_pack.go +++ b/transmat/tar/tar_pack.go @@ -10,15 +10,15 @@ import ( "github.com/polydawn/refmt/misc" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/transmat/mixins/filters" + "github.com/polydawn/rio/transmat/mixins/fshash" + "github.com/polydawn/rio/transmat/util" . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/transmat/mixins/filters" - "go.polydawn.net/rio/transmat/mixins/fshash" - "go.polydawn.net/rio/transmat/util" ) var ( diff --git a/transmat/tar/tar_pack_test.go b/transmat/tar/tar_pack_test.go index 19e613e..0333816 100644 --- a/transmat/tar/tar_pack_test.go +++ b/transmat/tar/tar_pack_test.go @@ -5,8 +5,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestTarPack(t *testing.T) { diff --git a/transmat/tar/tar_scan_test.go b/transmat/tar/tar_scan_test.go index c830001..f8ac14e 100644 --- a/transmat/tar/tar_scan_test.go +++ b/transmat/tar/tar_scan_test.go @@ -6,10 +6,10 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/testutil" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/testutil" ) func TestTarFixtureScan(t *testing.T) { diff --git a/transmat/tar/tar_unpack.go b/transmat/tar/tar_unpack.go index b244a7b..7aade22 100644 --- a/transmat/tar/tar_unpack.go +++ b/transmat/tar/tar_unpack.go @@ -12,15 +12,15 @@ import ( "github.com/polydawn/refmt/misc" . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/lib/treewalk" - "go.polydawn.net/rio/transmat/mixins/filters" - "go.polydawn.net/rio/transmat/mixins/fshash" - "go.polydawn.net/rio/transmat/mixins/log" - "go.polydawn.net/rio/transmat/util" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/lib/treewalk" + "github.com/polydawn/rio/transmat/mixins/filters" + "github.com/polydawn/rio/transmat/mixins/fshash" + "github.com/polydawn/rio/transmat/mixins/log" + "github.com/polydawn/rio/transmat/util" ) func unpackTar( diff --git a/transmat/tar/tar_unpack_test.go b/transmat/tar/tar_unpack_test.go index adc6164..fb7ffe9 100644 --- a/transmat/tar/tar_unpack_test.go +++ b/transmat/tar/tar_unpack_test.go @@ -9,13 +9,13 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestTarUnpack(t *testing.T) { diff --git a/transmat/util/unpack.go b/transmat/util/unpack.go index bad2c23..ae8456d 100644 --- a/transmat/util/unpack.go +++ b/transmat/util/unpack.go @@ -7,12 +7,12 @@ import ( . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/config" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/transmat/mixins/cache" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/config" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/transmat/mixins/cache" ) type unpackFn func( diff --git a/transmat/util/unpackingMirror.go b/transmat/util/unpackingMirror.go index e206e54..39cde98 100644 --- a/transmat/util/unpackingMirror.go +++ b/transmat/util/unpackingMirror.go @@ -7,10 +7,10 @@ import ( . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - nilFS "go.polydawn.net/rio/fs/nilfs" - "go.polydawn.net/rio/transmat/mixins/log" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + nilFS "github.com/polydawn/rio/fs/nilfs" + "github.com/polydawn/rio/transmat/mixins/log" ) // CreateMirror provides basic mirroring logic used by both the tar and zip diff --git a/transmat/util/unpackingScanner.go b/transmat/util/unpackingScanner.go index 53d7279..23f7c0c 100644 --- a/transmat/util/unpackingScanner.go +++ b/transmat/util/unpackingScanner.go @@ -3,12 +3,12 @@ package util import ( "context" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + nilFS "github.com/polydawn/rio/fs/nilfs" + "github.com/polydawn/rio/fs/osfs" . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - nilFS "go.polydawn.net/rio/fs/nilfs" - "go.polydawn.net/rio/fs/osfs" ) // A "scan" is roughly the same as an unpack to /dev/null, diff --git a/transmat/util/warehouse.go b/transmat/util/warehouse.go index e9638a5..246fc18 100644 --- a/transmat/util/warehouse.go +++ b/transmat/util/warehouse.go @@ -6,12 +6,12 @@ import ( . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/transmat/mixins/log" - "go.polydawn.net/rio/warehouse" - "go.polydawn.net/rio/warehouse/impl/kvfs" - "go.polydawn.net/rio/warehouse/impl/kvhttp" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/transmat/mixins/log" + "github.com/polydawn/rio/warehouse" + "github.com/polydawn/rio/warehouse/impl/kvfs" + "github.com/polydawn/rio/warehouse/impl/kvhttp" ) // The shared bits of warehouseAddr parse and dial code. diff --git a/transmat/zip/doc.go b/transmat/zip/doc.go index 585e578..e208cea 100644 --- a/transmat/zip/doc.go +++ b/transmat/zip/doc.go @@ -4,9 +4,9 @@ package ziptrans import ( - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/transmat/util" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/transmat/util" ) // PackType defines this as the zip packing type. diff --git a/transmat/zip/zip_format.go b/transmat/zip/zip_format.go index 33ef159..569f3ee 100644 --- a/transmat/zip/zip_format.go +++ b/transmat/zip/zip_format.go @@ -4,10 +4,10 @@ import ( "archive/zip" "encoding/binary" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" ) // MetadataToZipHdr mutates zip.FileHeader fields to match the given fmeta. diff --git a/transmat/zip/zip_mirror_test.go b/transmat/zip/zip_mirror_test.go index 27e1412..a9abedd 100644 --- a/transmat/zip/zip_mirror_test.go +++ b/transmat/zip/zip_mirror_test.go @@ -6,11 +6,11 @@ import ( . "github.com/smartystreets/goconvey/convey" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestZipMirror(t *testing.T) { diff --git a/transmat/zip/zip_pack.go b/transmat/zip/zip_pack.go index 0fbcd51..4bde651 100644 --- a/transmat/zip/zip_pack.go +++ b/transmat/zip/zip_pack.go @@ -8,15 +8,15 @@ import ( "github.com/polydawn/refmt/misc" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/transmat/mixins/filters" + "github.com/polydawn/rio/transmat/mixins/fshash" + "github.com/polydawn/rio/transmat/util" . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/transmat/mixins/filters" - "go.polydawn.net/rio/transmat/mixins/fshash" - "go.polydawn.net/rio/transmat/util" ) var ( diff --git a/transmat/zip/zip_pack_test.go b/transmat/zip/zip_pack_test.go index ffefeae..fb5db56 100644 --- a/transmat/zip/zip_pack_test.go +++ b/transmat/zip/zip_pack_test.go @@ -5,8 +5,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestZipPack(t *testing.T) { diff --git a/transmat/zip/zip_scan_test.go b/transmat/zip/zip_scan_test.go index 66f04c0..a50ab45 100644 --- a/transmat/zip/zip_scan_test.go +++ b/transmat/zip/zip_scan_test.go @@ -6,10 +6,10 @@ import ( . "github.com/smartystreets/goconvey/convey" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/testutil" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/testutil" ) func TestZipFixtureScan(t *testing.T) { diff --git a/transmat/zip/zip_unpack.go b/transmat/zip/zip_unpack.go index 4233abd..62f67d0 100644 --- a/transmat/zip/zip_unpack.go +++ b/transmat/zip/zip_unpack.go @@ -12,16 +12,16 @@ import ( "github.com/polydawn/refmt/misc" . "github.com/warpfork/go-errcat" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/lib/treewalk" - "go.polydawn.net/rio/transmat/mixins/buffer" - "go.polydawn.net/rio/transmat/mixins/filters" - "go.polydawn.net/rio/transmat/mixins/fshash" - "go.polydawn.net/rio/transmat/mixins/log" - "go.polydawn.net/rio/transmat/util" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/lib/treewalk" + "github.com/polydawn/rio/transmat/mixins/buffer" + "github.com/polydawn/rio/transmat/mixins/filters" + "github.com/polydawn/rio/transmat/mixins/fshash" + "github.com/polydawn/rio/transmat/mixins/log" + "github.com/polydawn/rio/transmat/util" ) func unpackZip( diff --git a/transmat/zip/zip_unpack_test.go b/transmat/zip/zip_unpack_test.go index 0dd8a81..c3ccded 100644 --- a/transmat/zip/zip_unpack_test.go +++ b/transmat/zip/zip_unpack_test.go @@ -9,13 +9,13 @@ import ( . "github.com/smartystreets/goconvey/convey" - api "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/fs/osfs" - "go.polydawn.net/rio/fsOp" - "go.polydawn.net/rio/testutil" - "go.polydawn.net/rio/transmat/mixins/tests" + api "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/fs/osfs" + "github.com/polydawn/rio/fsOp" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/rio/transmat/mixins/tests" ) func TestZipUnpack(t *testing.T) { diff --git a/warehouse/impl/git/git.go b/warehouse/impl/git/git.go index c2370ea..27ff6ea 100644 --- a/warehouse/impl/git/git.go +++ b/warehouse/impl/git/git.go @@ -28,11 +28,11 @@ import ( "path/filepath" "strings" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + riofs "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/warehouse" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - riofs "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/warehouse" srcd_osfs "gopkg.in/src-d/go-billy.v4/osfs" srcd_git "gopkg.in/src-d/go-git.v4" diff --git a/warehouse/impl/git/git_test.go b/warehouse/impl/git/git_test.go index bc4d2e4..cdf135f 100644 --- a/warehouse/impl/git/git_test.go +++ b/warehouse/impl/git/git_test.go @@ -14,11 +14,11 @@ import ( "strings" "testing" + riofs "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/testutil" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - riofs "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/testutil" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/object" @@ -63,8 +63,8 @@ func TestSlugifyRemote(t *testing.T) { out string }{ {"http://codesource.google.com/project", "http%3A%2F%2Fcodesource.google.com%2Fproject"}, - {"https://go.polydawn.net/rio", "https%3A%2F%2Fgo.polydawn.net%2Frio"}, - {"https://go.polydawn.net/rio with spaces", "https%3A%2F%2Fgo.polydawn.net%2Frio+with+spaces"}, + {"https://github.com/polydawn/rio", "https%3A%2F%2Fgithub.com%2Fpolydawn%2Frio"}, + {"https://github.com/polydawn/rio with spaces", "https%3A%2F%2Fgithub.com%2Fpolydawn%2Frio+with+spaces"}, } for _, remote := range testItems { t.Run(fmt.Sprintf("Slugify %s", remote.in), func(t *testing.T) { diff --git a/warehouse/impl/kvfs/kvfs.go b/warehouse/impl/kvfs/kvfs.go index c9e9c33..4af60bf 100644 --- a/warehouse/impl/kvfs/kvfs.go +++ b/warehouse/impl/kvfs/kvfs.go @@ -6,13 +6,13 @@ import ( "os" "path/filepath" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/fs" + "github.com/polydawn/rio/lib/guid" + "github.com/polydawn/rio/warehouse" + "github.com/polydawn/rio/warehouse/util" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/fs" - "go.polydawn.net/rio/lib/guid" - "go.polydawn.net/rio/warehouse" - "go.polydawn.net/rio/warehouse/util" ) var ( diff --git a/warehouse/impl/kvhttp/kvhttp.go b/warehouse/impl/kvhttp/kvhttp.go index 204bb3d..e83f677 100644 --- a/warehouse/impl/kvhttp/kvhttp.go +++ b/warehouse/impl/kvhttp/kvhttp.go @@ -6,11 +6,11 @@ import ( "net/url" "path" + "github.com/polydawn/go-timeless-api" + "github.com/polydawn/go-timeless-api/rio" + "github.com/polydawn/rio/warehouse" + "github.com/polydawn/rio/warehouse/util" . "github.com/warpfork/go-errcat" - "go.polydawn.net/go-timeless-api" - "go.polydawn.net/go-timeless-api/rio" - "go.polydawn.net/rio/warehouse" - "go.polydawn.net/rio/warehouse/util" ) var ( diff --git a/warehouse/util/util.go b/warehouse/util/util.go index 6e3facc..42f8558 100644 --- a/warehouse/util/util.go +++ b/warehouse/util/util.go @@ -1,7 +1,7 @@ package util import ( - "go.polydawn.net/go-timeless-api" + "github.com/polydawn/go-timeless-api" ) /* diff --git a/warehouse/warehouse.go b/warehouse/warehouse.go index 7e29d77..fcf3f84 100644 --- a/warehouse/warehouse.go +++ b/warehouse/warehouse.go @@ -4,7 +4,7 @@ import ( "context" "io" - "go.polydawn.net/go-timeless-api" + "github.com/polydawn/go-timeless-api" ) /*