Make -name flag default to "manifest" for import cmd.
MultiPart: 1/2
Change-Id: I3932c94151953d3724eb75a897637894e4ec8c2e
diff --git a/cmd/jiri/doc.go b/cmd/jiri/doc.go
index 5f5e32e..e080aff 100644
--- a/cmd/jiri/doc.go
+++ b/cmd/jiri/doc.go
@@ -205,9 +205,8 @@
<remote> specifies the remote manifest repository.
The jiri import flags are:
- -name=
- The name of the remote manifest project, used to disambiguate manifest
- projects with the same remote. Typically empty.
+ -name=manifest
+ The name of the remote manifest project.
-out=
The output file. Uses $JIRI_ROOT/.jiri_manifest if unspecified. Uses stdout
if set to "-".
diff --git a/cmd/jiri/import.go b/cmd/jiri/import.go
index 7bf8703..319affe 100644
--- a/cmd/jiri/import.go
+++ b/cmd/jiri/import.go
@@ -22,7 +22,7 @@
)
func init() {
- cmdImport.Flags.StringVar(&flagImportName, "name", "", `The name of the remote manifest project, used to disambiguate manifest projects with the same remote. Typically empty.`)
+ cmdImport.Flags.StringVar(&flagImportName, "name", "manifest", `The name of the remote manifest project.`)
cmdImport.Flags.StringVar(&flagImportProtocol, "protocol", "git", `The version control protocol used by the remote manifest project.`)
cmdImport.Flags.StringVar(&flagImportRemoteBranch, "remote-branch", "master", `The branch of the remote manifest project to track, without the leading "origin/".`)
cmdImport.Flags.StringVar(&flagImportRoot, "root", "", `Root to store the manifest project locally.`)
diff --git a/cmd/jiri/import_test.go b/cmd/jiri/import_test.go
index d4de92c..ae13c10 100644
--- a/cmd/jiri/import_test.go
+++ b/cmd/jiri/import_test.go
@@ -50,7 +50,7 @@
Args: []string{"foo", "https://github.com/new.git"},
Want: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -60,7 +60,7 @@
Filename: `file`,
Want: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -69,7 +69,7 @@
Args: []string{"-out=-", "foo", "https://github.com/new.git"},
Stdout: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -78,14 +78,14 @@
Args: []string{"foo", "https://github.com/new.git"},
Exist: `<manifest>
<imports>
- <import manifest="bar" remote="https://github.com/orig.git"/>
+ <import manifest="bar" name="manifest" remote="https://github.com/orig.git"/>
</imports>
</manifest>
`,
Want: `<manifest>
<imports>
- <import manifest="bar" remote="https://github.com/orig.git"/>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="bar" name="manifest" remote="https://github.com/orig.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -95,7 +95,7 @@
Args: []string{"-overwrite", "foo", "https://github.com/new.git"},
Want: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -105,7 +105,7 @@
Filename: `file`,
Want: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -114,7 +114,7 @@
Args: []string{"-overwrite", "-out=-", "foo", "https://github.com/new.git"},
Stdout: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
@@ -123,13 +123,13 @@
Args: []string{"-overwrite", "foo", "https://github.com/new.git"},
Exist: `<manifest>
<imports>
- <import manifest="bar" remote="https://github.com/orig.git"/>
+ <import manifest="bar" name="manifest" remote="https://github.com/orig.git"/>
</imports>
</manifest>
`,
Want: `<manifest>
<imports>
- <import manifest="foo" remote="https://github.com/new.git"/>
+ <import manifest="foo" name="manifest" remote="https://github.com/new.git"/>
</imports>
</manifest>
`,
