Merge "v.io/jiri: first part of removing -n flag."
diff --git a/cmd/jiri/doc.go b/cmd/jiri/doc.go
index bfe847c..a6a93a5 100644
--- a/cmd/jiri/doc.go
+++ b/cmd/jiri/doc.go
@@ -31,8 +31,6 @@
The jiri flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -58,8 +56,6 @@
The jiri cl flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -83,8 +79,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -130,8 +124,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -152,8 +144,6 @@
The jiri cl new flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -181,8 +171,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -252,8 +240,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -276,8 +262,6 @@
The jiri profile flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -327,8 +311,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile env - Display profile environment variables
@@ -364,8 +346,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile install - Install the given profiles
@@ -390,8 +370,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -418,8 +396,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile update - Install the latest default version of the given profiles
@@ -440,8 +416,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile cleanup - Cleanup the locally installed profiles
@@ -471,8 +445,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile available - List the available profiles
@@ -487,8 +459,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri project - Manage the jiri projects
@@ -506,8 +476,6 @@
The jiri project flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -527,8 +495,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -548,8 +514,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -573,8 +537,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -595,8 +557,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -615,8 +575,6 @@
The jiri rebuild flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -640,8 +598,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -663,8 +619,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -710,8 +664,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -731,8 +683,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -759,8 +709,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -804,8 +752,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -831,8 +777,6 @@
The jiri which flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
diff --git a/doc.go b/doc.go
index bfe847c..a6a93a5 100644
--- a/doc.go
+++ b/doc.go
@@ -31,8 +31,6 @@
The jiri flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -58,8 +56,6 @@
The jiri cl flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -83,8 +79,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -130,8 +124,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -152,8 +144,6 @@
The jiri cl new flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -181,8 +171,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -252,8 +240,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -276,8 +262,6 @@
The jiri profile flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -327,8 +311,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile env - Display profile environment variables
@@ -364,8 +346,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile install - Install the given profiles
@@ -390,8 +370,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -418,8 +396,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile update - Install the latest default version of the given profiles
@@ -440,8 +416,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile cleanup - Cleanup the locally installed profiles
@@ -471,8 +445,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri profile available - List the available profiles
@@ -487,8 +459,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
Jiri project - Manage the jiri projects
@@ -506,8 +476,6 @@
The jiri project flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -527,8 +495,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -548,8 +514,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -573,8 +537,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -595,8 +557,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -615,8 +575,6 @@
The jiri rebuild flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -640,8 +598,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -663,8 +619,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -710,8 +664,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -731,8 +683,6 @@
Use color to format output.
-dir=
Directory where snapshot are stored. Defaults to $JIRI_ROOT/.snapshot.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -759,8 +709,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -804,8 +752,6 @@
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
@@ -831,8 +777,6 @@
The jiri which flags are:
-color=true
Use color to format output.
- -n=false
- Show what commands will run but do not execute them.
-v=false
Print verbose output.
diff --git a/tool/.api b/tool/.api
index 334a88b..32747af 100644
--- a/tool/.api
+++ b/tool/.api
@@ -21,7 +21,6 @@
pkg tool, type Context struct
pkg tool, type ContextOpts struct
pkg tool, type ContextOpts struct, Color *bool
-pkg tool, type ContextOpts struct, DryRun *bool
pkg tool, type ContextOpts struct, Env map[string]string
pkg tool, type ContextOpts struct, Manifest *string
pkg tool, type ContextOpts struct, Stderr io.Writer
@@ -30,7 +29,6 @@
pkg tool, type ContextOpts struct, Timer *timing.Timer
pkg tool, type ContextOpts struct, Verbose *bool
pkg tool, var ColorFlag bool
-pkg tool, var DryRunFlag bool
pkg tool, var ManifestFlag string
pkg tool, var Name string
pkg tool, var VerboseFlag bool
diff --git a/tool/context.go b/tool/context.go
index d396753..c8b0959 100644
--- a/tool/context.go
+++ b/tool/context.go
@@ -27,7 +27,6 @@
// ContextOpts records the context options.
type ContextOpts struct {
Color *bool
- DryRun *bool
Manifest *string
Env map[string]string
Stdin io.Reader
@@ -41,7 +40,6 @@
func newContextOpts() *ContextOpts {
return &ContextOpts{
Color: &ColorFlag,
- DryRun: &DryRunFlag,
Env: map[string]string{},
Manifest: &ManifestFlag,
Stdin: os.Stdin,
@@ -57,9 +55,6 @@
if opts.Color == nil {
opts.Color = defaultOpts.Color
}
- if opts.DryRun == nil {
- opts.DryRun = defaultOpts.DryRun
- }
if opts.Env == nil {
opts.Env = defaultOpts.Env
}
@@ -121,7 +116,7 @@
// DryRun returns the dry run setting of the context.
func (ctx Context) DryRun() bool {
- return *ctx.opts.DryRun
+ return false
}
// Env returns the environment of the context.
@@ -148,7 +143,7 @@
// NewSeq returns a new instance of Sequence initialized using the options
// stored in the context.
func (ctx Context) NewSeq() runutil.Sequence {
- return runutil.NewSequence(ctx.opts.Env, ctx.opts.Stdin, ctx.opts.Stdout, ctx.opts.Stderr, *ctx.opts.Color, *ctx.opts.DryRun, *ctx.opts.Verbose)
+ return runutil.NewSequence(ctx.opts.Env, ctx.opts.Stdin, ctx.opts.Stdout, ctx.opts.Stderr, *ctx.opts.Color, false, *ctx.opts.Verbose)
}
// Stdin returns the standard input of the context.
diff --git a/tool/tool.go b/tool/tool.go
index 5ec4ffc..aafcb2a 100644
--- a/tool/tool.go
+++ b/tool/tool.go
@@ -17,7 +17,6 @@
var (
// Flags for running commands.
ColorFlag bool
- DryRunFlag bool
VerboseFlag bool
// Flags for working with projects.
@@ -27,7 +26,6 @@
// InitializeRunFlags initializes flags for running commands.
func InitializeRunFlags(flags *flag.FlagSet) {
flags.BoolVar(&ColorFlag, "color", true, "Use color to format output.")
- flags.BoolVar(&DryRunFlag, "n", false, "Show what commands will run but do not execute them.")
flags.BoolVar(&VerboseFlag, "v", false, "Print verbose output.")
}
