From 371fc1569400798ceef6817afa4e47c8e499c4a2 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Mon, 4 Sep 2017 20:26:25 -0700 Subject: [PATCH] merged 'repofs' into 'snapshot' package --- cli/command_ls.go | 4 ++-- cli/command_mount.go | 6 +++--- cli/command_object_cleanup.go | 3 +-- cli/command_repository_migrate.go | 5 ++--- cli/objref.go | 4 ++-- fs/repofs/doc.go | 2 -- {fs/repofs => snapshot}/all_sources.go | 7 +++---- {fs/repofs => snapshot}/repofs.go | 2 +- {fs/repofs => snapshot}/source_directories.go | 5 ++--- {fs/repofs => snapshot}/source_snapshots.go | 7 +++---- 10 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 fs/repofs/doc.go rename {fs/repofs => snapshot}/all_sources.go (91%) rename {fs/repofs => snapshot}/repofs.go (99%) rename {fs/repofs => snapshot}/source_directories.go (91%) rename {fs/repofs => snapshot}/source_snapshots.go (91%) diff --git a/cli/command_ls.go b/cli/command_ls.go index 13f2d777d..54b321617 100644 --- a/cli/command_ls.go +++ b/cli/command_ls.go @@ -6,8 +6,8 @@ "strings" "github.com/kopia/kopia/fs" - "github.com/kopia/kopia/fs/repofs" "github.com/kopia/kopia/repo" + "github.com/kopia/kopia/snapshot" kingpin "gopkg.in/alecthomas/kingpin.v2" ) @@ -46,7 +46,7 @@ func init() { } func listDirectory(rep *repo.Repository, prefix string, oid repo.ObjectID, indent string) error { - d := repofs.Directory(rep, oid) + d := snapshot.Directory(rep, oid) entries, err := d.Readdir() if err != nil { diff --git a/cli/command_mount.go b/cli/command_mount.go index 5f4dcbb96..e9f64231c 100644 --- a/cli/command_mount.go +++ b/cli/command_mount.go @@ -7,7 +7,7 @@ "github.com/kopia/kopia/fs" "github.com/kopia/kopia/fs/cachefs" "github.com/kopia/kopia/fs/loggingfs" - "github.com/kopia/kopia/fs/repofs" + "github.com/kopia/kopia/snapshot" kingpin "gopkg.in/alecthomas/kingpin.v2" ) @@ -38,13 +38,13 @@ func runMountCommand(context *kingpin.ParseContext) error { } if *mountObjectID == "all" { - entry = repofs.AllSources(rep) + entry = snapshot.AllSources(rep) } else { oid, err := parseObjectID(*mountObjectID, rep) if err != nil { return err } - entry = repofs.Directory(rep, oid) + entry = snapshot.Directory(rep, oid) } if *mountTraceFS { diff --git a/cli/command_object_cleanup.go b/cli/command_object_cleanup.go index 03d8700d0..b97679875 100644 --- a/cli/command_object_cleanup.go +++ b/cli/command_object_cleanup.go @@ -9,7 +9,6 @@ "time" "github.com/kopia/kopia/fs" - "github.com/kopia/kopia/fs/repofs" "github.com/kopia/kopia/internal/units" "github.com/kopia/kopia/repo" "github.com/kopia/kopia/snapshot" @@ -131,7 +130,7 @@ func findAliveBlocks(ctx *cleanupContext, wi *cleanupWorkItem) error { } if wi.isDirectory { - entries, err := repofs.Directory(ctx.repo, wi.oid).Readdir() + entries, err := snapshot.Directory(ctx.repo, wi.oid).Readdir() if err != nil { return err diff --git a/cli/command_repository_migrate.go b/cli/command_repository_migrate.go index 24e33eed7..c5f75711e 100644 --- a/cli/command_repository_migrate.go +++ b/cli/command_repository_migrate.go @@ -4,7 +4,6 @@ "fmt" "log" - "github.com/kopia/kopia/fs/repofs" "github.com/kopia/kopia/repo" "github.com/kopia/kopia/snapshot" kingpin "gopkg.in/alecthomas/kingpin.v2" @@ -59,7 +58,7 @@ func runMigrateCommand(context *kingpin.ParseContext) error { } for _, m := range filterSnapshotsToMigrate(snapshots) { - d := repofs.Directory(sourceRepo, m.RootObjectID) + d := snapshot.Directory(sourceRepo, m.RootObjectID) newm, err := uploader.Upload(d, &m.Source, nil) if err != nil { return fmt.Errorf("error migrating shapshot %v @ %v: %v", m.Source, m.StartTime, err) @@ -81,7 +80,7 @@ func runMigrateCommand(context *kingpin.ParseContext) error { if err != nil { return err } - d := repofs.Directory(sourceRepo, dirOID) + d := snapshot.Directory(sourceRepo, dirOID) newm, err := uploader.Upload(d, &snapshot.SourceInfo{Host: "temp"}, nil) if err != nil { return fmt.Errorf("error migrating directory %v: %v", dirOID, err) diff --git a/cli/objref.go b/cli/objref.go index ca4c29b65..1bca2b0dd 100644 --- a/cli/objref.go +++ b/cli/objref.go @@ -5,8 +5,8 @@ "strings" "github.com/kopia/kopia/fs" - "github.com/kopia/kopia/fs/repofs" "github.com/kopia/kopia/repo" + "github.com/kopia/kopia/snapshot" ) // ParseObjectID interprets the given ID string and returns corresponding repo.ObjectID. @@ -25,7 +25,7 @@ func parseObjectID(id string, r *repo.Repository) (repo.ObjectID, error) { return oid, nil } - dir := repofs.Directory(r, oid) + dir := snapshot.Directory(r, oid) if err != nil { return repo.NullObjectID, err } diff --git a/fs/repofs/doc.go b/fs/repofs/doc.go deleted file mode 100644 index 6d299b777..000000000 --- a/fs/repofs/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package repofs implements virtual filesystem on top of Repository. -package repofs diff --git a/fs/repofs/all_sources.go b/snapshot/all_sources.go similarity index 91% rename from fs/repofs/all_sources.go rename to snapshot/all_sources.go index 84d5b9200..6b23aae0a 100644 --- a/fs/repofs/all_sources.go +++ b/snapshot/all_sources.go @@ -1,4 +1,4 @@ -package repofs +package snapshot import ( "fmt" @@ -6,12 +6,11 @@ "github.com/kopia/kopia/fs" "github.com/kopia/kopia/repo" - "github.com/kopia/kopia/snapshot" ) type repositoryAllSources struct { repo *repo.Repository - snapshotManager *snapshot.Manager + snapshotManager *Manager } func (s *repositoryAllSources) Parent() fs.Directory { @@ -54,7 +53,7 @@ func (s *repositoryAllSources) Readdir() (fs.Entries, error) { // AllSources returns fs.Directory that contains the list of all snapshot sources found in the repository. func AllSources(r *repo.Repository) fs.Directory { - sm := snapshot.NewManager(r) + sm := NewManager(r) return &repositoryAllSources{repo: r, snapshotManager: sm} } diff --git a/fs/repofs/repofs.go b/snapshot/repofs.go similarity index 99% rename from fs/repofs/repofs.go rename to snapshot/repofs.go index 567c393e9..8b253874c 100644 --- a/fs/repofs/repofs.go +++ b/snapshot/repofs.go @@ -1,4 +1,4 @@ -package repofs +package snapshot import ( "fmt" diff --git a/fs/repofs/source_directories.go b/snapshot/source_directories.go similarity index 91% rename from fs/repofs/source_directories.go rename to snapshot/source_directories.go index 00b0ee0b7..b83d94956 100644 --- a/fs/repofs/source_directories.go +++ b/snapshot/source_directories.go @@ -1,17 +1,16 @@ -package repofs +package snapshot import ( "time" "github.com/kopia/kopia/fs" "github.com/kopia/kopia/repo" - "github.com/kopia/kopia/snapshot" ) type sourceDirectories struct { parent fs.Directory repo *repo.Repository - snapshotManager *snapshot.Manager + snapshotManager *Manager userHost string } diff --git a/fs/repofs/source_snapshots.go b/snapshot/source_snapshots.go similarity index 91% rename from fs/repofs/source_snapshots.go rename to snapshot/source_snapshots.go index df6769eb4..83873b560 100644 --- a/fs/repofs/source_snapshots.go +++ b/snapshot/source_snapshots.go @@ -1,4 +1,4 @@ -package repofs +package snapshot import ( "fmt" @@ -7,14 +7,13 @@ "github.com/kopia/kopia/fs" "github.com/kopia/kopia/internal/dir" "github.com/kopia/kopia/repo" - "github.com/kopia/kopia/snapshot" ) type sourceSnapshots struct { parent fs.Directory repo *repo.Repository - snapshotManager *snapshot.Manager - src *snapshot.SourceInfo + snapshotManager *Manager + src *SourceInfo } func (s *sourceSnapshots) Parent() fs.Directory {