Merge "jiri: v.io/jiri: move v.io/jiri/jiri to v.io/jiri"
diff --git a/.api b/.api
index e69de29..f4648d7 100644
--- a/.api
+++ b/.api
@@ -0,0 +1,35 @@
+pkg jiri, const JiriManifestFile ideal-string
+pkg jiri, const PreservePathEnv ideal-string
+pkg jiri, const ProfilesDBDir ideal-string
+pkg jiri, const ProfilesRootDir ideal-string
+pkg jiri, const ProjectMetaDir ideal-string
+pkg jiri, const ProjectMetaFile ideal-string
+pkg jiri, const RootEnv ideal-string
+pkg jiri, const RootMetaDir ideal-string
+pkg jiri, func DefaultProfilesDBPath() string
+pkg jiri, func ExpandEnv(*X, *envvar.Vars)
+pkg jiri, func FindRoot() string
+pkg jiri, func NewRelPath(...string) RelPath
+pkg jiri, func NewX(*cmdline.Env) (*X, error)
+pkg jiri, func RunnerFunc(func(*X, []string) error) cmdline.Runner
+pkg jiri, method (*X) BinDir() string
+pkg jiri, method (*X) Clone(tool.ContextOpts) *X
+pkg jiri, method (*X) JiriManifestFile() string
+pkg jiri, method (*X) ProfilesDBDir() string
+pkg jiri, method (*X) ProfilesRootDir() string
+pkg jiri, method (*X) ResolveManifestPath(string) (string, error)
+pkg jiri, method (*X) RootMetaDir() string
+pkg jiri, method (*X) ScriptsDir() string
+pkg jiri, method (*X) UpdateHistoryDir() string
+pkg jiri, method (*X) UpdateHistoryLatestLink() string
+pkg jiri, method (*X) UpdateHistorySecondLatestLink() string
+pkg jiri, method (*X) UsageErrorf(string, ...interface{}) error
+pkg jiri, method (*X) UsingOldManifests() bool
+pkg jiri, method (RelPath) Abs(*X) string
+pkg jiri, method (RelPath) Join(...string) RelPath
+pkg jiri, method (RelPath) Symbolic() string
+pkg jiri, type RelPath string
+pkg jiri, type X struct
+pkg jiri, type X struct, Root string
+pkg jiri, type X struct, Usage func(string, ...interface{}) error
+pkg jiri, type X struct, embedded *tool.Context
diff --git a/cmd/jiri/cl.go b/cmd/jiri/cl.go
index b5a8721..ac97b13 100644
--- a/cmd/jiri/cl.go
+++ b/cmd/jiri/cl.go
@@ -12,10 +12,10 @@
"regexp"
"strings"
+ "v.io/jiri"
"v.io/jiri/collect"
"v.io/jiri/gerrit"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/project"
"v.io/jiri/runutil"
"v.io/x/lib/cmdline"
diff --git a/cmd/jiri/cl_test.go b/cmd/jiri/cl_test.go
index e92f35b..680f0ff 100644
--- a/cmd/jiri/cl_test.go
+++ b/cmd/jiri/cl_test.go
@@ -13,9 +13,9 @@
"strings"
"testing"
+ "v.io/jiri"
"v.io/jiri/gerrit"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/jiritest"
"v.io/jiri/runutil"
)
diff --git a/cmd/jiri/contrib.go b/cmd/jiri/contrib.go
index 1fb31e6..be1a804 100644
--- a/cmd/jiri/contrib.go
+++ b/cmd/jiri/contrib.go
@@ -13,9 +13,9 @@
"strconv"
"strings"
+ "v.io/jiri"
"v.io/jiri/collect"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/project"
"v.io/jiri/tool"
"v.io/x/lib/cmdline"
diff --git a/cmd/jiri/import.go b/cmd/jiri/import.go
index 7636f13..7bf8703 100644
--- a/cmd/jiri/import.go
+++ b/cmd/jiri/import.go
@@ -7,7 +7,7 @@
import (
"os"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/project"
"v.io/jiri/runutil"
"v.io/x/lib/cmdline"
diff --git a/cmd/jiri/import_test.go b/cmd/jiri/import_test.go
index 5e9c6d7..d4de92c 100644
--- a/cmd/jiri/import_test.go
+++ b/cmd/jiri/import_test.go
@@ -12,7 +12,7 @@
"strings"
"testing"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/x/lib/gosh"
)
diff --git a/cmd/jiri/profile.go b/cmd/jiri/profile.go
index a5273b1..a94ee0d 100644
--- a/cmd/jiri/profile.go
+++ b/cmd/jiri/profile.go
@@ -5,7 +5,7 @@
package main
import (
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles/profilescmdline"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/jiri/project.go b/cmd/jiri/project.go
index ea94798..dc6e7f6 100644
--- a/cmd/jiri/project.go
+++ b/cmd/jiri/project.go
@@ -11,7 +11,7 @@
"sort"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/project"
"v.io/jiri/tool"
"v.io/jiri/util"
diff --git a/cmd/jiri/rebuild.go b/cmd/jiri/rebuild.go
index dbf30bc..da4669f 100644
--- a/cmd/jiri/rebuild.go
+++ b/cmd/jiri/rebuild.go
@@ -7,8 +7,8 @@
import (
"fmt"
+ "v.io/jiri"
"v.io/jiri/collect"
- "v.io/jiri/jiri"
"v.io/jiri/project"
"v.io/x/lib/cmdline"
)
diff --git a/cmd/jiri/snapshot.go b/cmd/jiri/snapshot.go
index 21d572d..27e9030 100644
--- a/cmd/jiri/snapshot.go
+++ b/cmd/jiri/snapshot.go
@@ -13,9 +13,9 @@
"strings"
"time"
+ "v.io/jiri"
"v.io/jiri/collect"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/project"
"v.io/jiri/runutil"
"v.io/x/lib/cmdline"
diff --git a/cmd/jiri/snapshot_test.go b/cmd/jiri/snapshot_test.go
index d24b5a6..151fb9b 100644
--- a/cmd/jiri/snapshot_test.go
+++ b/cmd/jiri/snapshot_test.go
@@ -11,8 +11,8 @@
"path/filepath"
"testing"
+ "v.io/jiri"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/jiritest"
"v.io/jiri/project"
"v.io/jiri/tool"
diff --git a/cmd/jiri/update.go b/cmd/jiri/update.go
index 9dccf97..941b6f3 100644
--- a/cmd/jiri/update.go
+++ b/cmd/jiri/update.go
@@ -5,7 +5,7 @@
package main
import (
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/project"
"v.io/jiri/retry"
"v.io/jiri/tool"
diff --git a/cmd/jiri/upgrade.go b/cmd/jiri/upgrade.go
index da6947f..08eb99a 100644
--- a/cmd/jiri/upgrade.go
+++ b/cmd/jiri/upgrade.go
@@ -9,7 +9,7 @@
"os"
"path/filepath"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/project"
"v.io/jiri/runutil"
"v.io/x/lib/cmdline"
diff --git a/cmd/jiri/upgrade_test.go b/cmd/jiri/upgrade_test.go
index 8803792..16f4f72 100644
--- a/cmd/jiri/upgrade_test.go
+++ b/cmd/jiri/upgrade_test.go
@@ -11,7 +11,7 @@
"strings"
"testing"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/x/lib/gosh"
)
diff --git a/googlesource/googlesource.go b/googlesource/googlesource.go
index 949f7a2..ce480f8 100644
--- a/googlesource/googlesource.go
+++ b/googlesource/googlesource.go
@@ -20,7 +20,7 @@
"strings"
"time"
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
// RepoStatus represents the status of a remote repository on googlesource.
diff --git a/jiri/.api b/jiri/.api
deleted file mode 100644
index f4648d7..0000000
--- a/jiri/.api
+++ /dev/null
@@ -1,35 +0,0 @@
-pkg jiri, const JiriManifestFile ideal-string
-pkg jiri, const PreservePathEnv ideal-string
-pkg jiri, const ProfilesDBDir ideal-string
-pkg jiri, const ProfilesRootDir ideal-string
-pkg jiri, const ProjectMetaDir ideal-string
-pkg jiri, const ProjectMetaFile ideal-string
-pkg jiri, const RootEnv ideal-string
-pkg jiri, const RootMetaDir ideal-string
-pkg jiri, func DefaultProfilesDBPath() string
-pkg jiri, func ExpandEnv(*X, *envvar.Vars)
-pkg jiri, func FindRoot() string
-pkg jiri, func NewRelPath(...string) RelPath
-pkg jiri, func NewX(*cmdline.Env) (*X, error)
-pkg jiri, func RunnerFunc(func(*X, []string) error) cmdline.Runner
-pkg jiri, method (*X) BinDir() string
-pkg jiri, method (*X) Clone(tool.ContextOpts) *X
-pkg jiri, method (*X) JiriManifestFile() string
-pkg jiri, method (*X) ProfilesDBDir() string
-pkg jiri, method (*X) ProfilesRootDir() string
-pkg jiri, method (*X) ResolveManifestPath(string) (string, error)
-pkg jiri, method (*X) RootMetaDir() string
-pkg jiri, method (*X) ScriptsDir() string
-pkg jiri, method (*X) UpdateHistoryDir() string
-pkg jiri, method (*X) UpdateHistoryLatestLink() string
-pkg jiri, method (*X) UpdateHistorySecondLatestLink() string
-pkg jiri, method (*X) UsageErrorf(string, ...interface{}) error
-pkg jiri, method (*X) UsingOldManifests() bool
-pkg jiri, method (RelPath) Abs(*X) string
-pkg jiri, method (RelPath) Join(...string) RelPath
-pkg jiri, method (RelPath) Symbolic() string
-pkg jiri, type RelPath string
-pkg jiri, type X struct
-pkg jiri, type X struct, Root string
-pkg jiri, type X struct, Usage func(string, ...interface{}) error
-pkg jiri, type X struct, embedded *tool.Context
diff --git a/jiritest/fake.go b/jiritest/fake.go
index 9fe026d..155fc74 100644
--- a/jiritest/fake.go
+++ b/jiritest/fake.go
@@ -10,8 +10,8 @@
"path/filepath"
"testing"
+ "v.io/jiri"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/project"
"v.io/jiri/util"
)
diff --git a/jiritest/x.go b/jiritest/x.go
index 8772256..361ccc9 100644
--- a/jiritest/x.go
+++ b/jiritest/x.go
@@ -9,7 +9,7 @@
"os"
"testing"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/tool"
)
diff --git a/jiri/path.go b/path.go
similarity index 100%
rename from jiri/path.go
rename to path.go
diff --git a/jiri/path_test.go b/path_test.go
similarity index 100%
rename from jiri/path_test.go
rename to path_test.go
diff --git a/profiles/manifest.go b/profiles/manifest.go
index f51a49e..5549b8f 100644
--- a/profiles/manifest.go
+++ b/profiles/manifest.go
@@ -14,7 +14,7 @@
"sync"
"time"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/runutil"
)
diff --git a/profiles/profiles.go b/profiles/profiles.go
index 5124b04..c2c110f 100644
--- a/profiles/profiles.go
+++ b/profiles/profiles.go
@@ -56,7 +56,7 @@
"flag"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
// InstallerSeparator is the string used to separate the installer
diff --git a/profiles/profilescmdline/cmd_test.go b/profiles/profilescmdline/cmd_test.go
index 8937d2f..56c4396 100644
--- a/profiles/profilescmdline/cmd_test.go
+++ b/profiles/profilescmdline/cmd_test.go
@@ -5,7 +5,7 @@
package profilescmdline
import (
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
func Reset() {
diff --git a/profiles/profilescmdline/internal/example/eg.go b/profiles/profilescmdline/internal/example/eg.go
index 1410e1c..5e60237 100644
--- a/profiles/profilescmdline/internal/example/eg.go
+++ b/profiles/profilescmdline/internal/example/eg.go
@@ -9,7 +9,7 @@
"fmt"
"path/filepath"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesutil"
)
diff --git a/profiles/profilescmdline/internal/i1/i1.go b/profiles/profilescmdline/internal/i1/i1.go
index 4b1cc3e..f2510e6 100644
--- a/profiles/profilescmdline/internal/i1/i1.go
+++ b/profiles/profilescmdline/internal/i1/i1.go
@@ -8,7 +8,7 @@
package main
import (
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles/profilescmdline"
"v.io/jiri/profiles/profilesmanager"
"v.io/jiri/tool"
diff --git a/profiles/profilescmdline/internal/i2/i2.go b/profiles/profilescmdline/internal/i2/i2.go
index 70fd08b..e0eaa08 100644
--- a/profiles/profilescmdline/internal/i2/i2.go
+++ b/profiles/profilescmdline/internal/i2/i2.go
@@ -8,7 +8,7 @@
package main
import (
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles/profilescmdline"
"v.io/jiri/profiles/profilesmanager"
diff --git a/profiles/profilescmdline/manager_cmdline.go b/profiles/profilescmdline/manager_cmdline.go
index c3cf226..651f6af 100644
--- a/profiles/profilescmdline/manager_cmdline.go
+++ b/profiles/profilescmdline/manager_cmdline.go
@@ -32,7 +32,7 @@
"path/filepath"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesmanager"
"v.io/x/lib/cmdline"
diff --git a/profiles/profilescmdline/manager_test.go b/profiles/profilescmdline/manager_test.go
index bec1096..407bf1f 100644
--- a/profiles/profilescmdline/manager_test.go
+++ b/profiles/profilescmdline/manager_test.go
@@ -19,7 +19,7 @@
"sync"
"testing"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/jiritest"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilescmdline"
diff --git a/profiles/profilescmdline/profile_manager.go b/profiles/profilescmdline/profile_manager.go
index 529d6dc..a52085b 100644
--- a/profiles/profilescmdline/profile_manager.go
+++ b/profiles/profilescmdline/profile_manager.go
@@ -8,7 +8,7 @@
"fmt"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesmanager"
"v.io/jiri/runutil"
diff --git a/profiles/profilescmdline/reader_cmdline.go b/profiles/profilescmdline/reader_cmdline.go
index a28bf7f..d34355a 100644
--- a/profiles/profilescmdline/reader_cmdline.go
+++ b/profiles/profilescmdline/reader_cmdline.go
@@ -17,7 +17,7 @@
"strings"
"text/template"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesreader"
"v.io/x/lib/cmdline"
diff --git a/profiles/profilesmanager/manager_test.go b/profiles/profilesmanager/manager_test.go
index 69e1b90..7f9f146 100644
--- a/profiles/profilesmanager/manager_test.go
+++ b/profiles/profilesmanager/manager_test.go
@@ -11,7 +11,7 @@
"os"
"path/filepath"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/profiles/profilesmanager"
"v.io/jiri/tool"
diff --git a/profiles/profilesmanager/util.go b/profiles/profilesmanager/util.go
index 0a0efef..337b8cd 100644
--- a/profiles/profilesmanager/util.go
+++ b/profiles/profilesmanager/util.go
@@ -7,7 +7,7 @@
import (
"fmt"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
)
diff --git a/profiles/profilesreader/flags.go b/profiles/profilesreader/flags.go
index d984151..6d95daa 100644
--- a/profiles/profilesreader/flags.go
+++ b/profiles/profilesreader/flags.go
@@ -9,7 +9,7 @@
"path/filepath"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
// RegisterReaderFlags registers the flags commonly used with a profiles.Reader.
diff --git a/profiles/profilesreader/reader.go b/profiles/profilesreader/reader.go
index 3091a6f..df1bdc9 100644
--- a/profiles/profilesreader/reader.go
+++ b/profiles/profilesreader/reader.go
@@ -14,7 +14,7 @@
"strconv"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/profiles"
"v.io/jiri/project"
"v.io/jiri/util"
diff --git a/profiles/profilesutil/util.go b/profiles/profilesutil/util.go
index 6129b21..4be95c4 100644
--- a/profiles/profilesutil/util.go
+++ b/profiles/profilesutil/util.go
@@ -16,7 +16,7 @@
"runtime"
"strings"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/tool"
)
diff --git a/project/paths.go b/project/paths.go
index fd757ff..b934afa 100644
--- a/project/paths.go
+++ b/project/paths.go
@@ -7,7 +7,7 @@
import (
"path/filepath"
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
// DataDirPath returns the path to the data directory of the given tool.
diff --git a/project/project.go b/project/project.go
index 44e931c..b9789ec 100644
--- a/project/project.go
+++ b/project/project.go
@@ -17,10 +17,10 @@
"strings"
"time"
+ "v.io/jiri"
"v.io/jiri/collect"
"v.io/jiri/gitutil"
"v.io/jiri/googlesource"
- "v.io/jiri/jiri"
"v.io/jiri/runutil"
"v.io/x/lib/set"
)
diff --git a/project/project_test.go b/project/project_test.go
index a060e36..c61710e 100644
--- a/project/project_test.go
+++ b/project/project_test.go
@@ -15,8 +15,8 @@
"strings"
"testing"
+ "v.io/jiri"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/jiritest"
"v.io/jiri/project"
"v.io/jiri/runutil"
diff --git a/project/state.go b/project/state.go
index 9c87f8d..deaf766 100644
--- a/project/state.go
+++ b/project/state.go
@@ -7,8 +7,8 @@
import (
"path/filepath"
+ "v.io/jiri"
"v.io/jiri/gitutil"
- "v.io/jiri/jiri"
"v.io/jiri/runutil"
"v.io/jiri/tool"
)
diff --git a/util/config.go b/util/config.go
index 3870052..eb7ff0d 100644
--- a/util/config.go
+++ b/util/config.go
@@ -11,7 +11,7 @@
"path/filepath"
"sort"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/x/lib/set"
)
diff --git a/util/oncall.go b/util/oncall.go
index 4cab5a9..209a63b 100644
--- a/util/oncall.go
+++ b/util/oncall.go
@@ -10,7 +10,7 @@
"io/ioutil"
"time"
- "v.io/jiri/jiri"
+ "v.io/jiri"
)
type OncallRotation struct {
diff --git a/util/oncall_test.go b/util/oncall_test.go
index a2c9893..f78c568 100644
--- a/util/oncall_test.go
+++ b/util/oncall_test.go
@@ -12,7 +12,7 @@
"testing"
"time"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/jiritest"
"v.io/jiri/util"
)
diff --git a/util/paths.go b/util/paths.go
index d028f15..e018a6e 100644
--- a/util/paths.go
+++ b/util/paths.go
@@ -10,7 +10,7 @@
"path/filepath"
"runtime"
- "v.io/jiri/jiri"
+ "v.io/jiri"
"v.io/jiri/project"
"v.io/jiri/tool"
"v.io/x/lib/host"
diff --git a/jiri/x.go b/x.go
similarity index 100%
rename from jiri/x.go
rename to x.go
diff --git a/jiri/x_test.go b/x_test.go
similarity index 100%
rename from jiri/x_test.go
rename to x_test.go
