newt: Print external repos with info command

Now all repositories versions are printed on default.
* prefix means internal repository
@ means external one

Author: m-gorecki

newt/cli/project_cmds.go

@@ -148,11 +148,13 @@ func infoRunCmd(cmd *cobra.Command, args []string) {
 
 	// If no arguments specified, print status of all installed repos.
 	if len(args) == 0 {
-		pred := func(r *repo.Repo) bool { return true }
-		if err := proj.InfoIf(pred, infoRemote); err != nil {
-			NewtUsage(nil, err)
+		if !infoRemote {
+			proj.GetPkgRepos()
 		}
 
+		if err := proj.Info(infoRemote); err != nil {
+			NewtUsage(nil, err)
+		}
 		return
 	}
 
@@ -243,7 +245,7 @@ func AddProjectCommands(cmd *cobra.Command) {
 	}
 	infoCmd.PersistentFlags().BoolVarP(&infoRemote,
 		"remote", "r", false,
-		"Fetch latest repos to determine if upgrades are required")
+		"Fetch latest repos to determine if upgrades are required. Works only on internal repositories.")
 
 	cmd.AddCommand(infoCmd)
 }

newt/install/install.go

@@ -694,8 +694,17 @@ func (inst *Installer) Info(repos []*repo.Repo, remote bool) error {
 // remoteRepoInfo prints information about the specified repo.  If `vm` is
 // non-nil, the output indicates whether a remote update is available.
 func (inst *Installer) remoteRepoInfo(r *repo.Repo, vm *deprepo.VersionMap) {
+	var prefix_char string
+
 	ri := inst.gatherInfo(r, vm)
-	s := fmt.Sprintf("    * %s:", r.Name())
+
+	if r.IsExternal(r.Path()) {
+		prefix_char = "@"
+	} else {
+		prefix_char = "*"
+	}
+
+	s := fmt.Sprintf("    %s %s:", prefix_char, r.Name())
 
 	s += fmt.Sprintf(" %s", ri.commitHash)
 	if ri.installedVer == nil {
@@ -720,12 +729,20 @@ func (inst *Installer) remoteRepoInfo(r *repo.Repo, vm *deprepo.VersionMap) {
 // project itself).  It does nothing if the project is not a git repo.
 func (inst *Installer) localRepoInfo(r *repo.Repo) {
 	ri := inst.gatherInfo(r, nil)
+	var prefix_char string
+
 	if ri.commitHash == "" {
 		// The project is not a git repo.
 		return
 	}
 
-	s := fmt.Sprintf("    * %s (project):", r.Name())
+	if r.IsExternal(r.Path()) {
+		prefix_char = "@"
+	} else {
+		prefix_char = "*"
+	}
+
+	s := fmt.Sprintf("    %s %s:", prefix_char, r.Name())
 
 	s += fmt.Sprintf(" %s", ri.commitHash)
 	if ri.dirtyState != "" {

newt/project/project.go

@@ -411,9 +411,7 @@ func (proj *Project) UpgradeIf(
 	return inst.Upgrade(specifiedRepoList, force, ask)
 }
 
-func (proj *Project) InfoIf(predicate func(r *repo.Repo) bool,
-	remote bool) error {
-
+func (proj *Project) Info(remote bool) error {
 	if remote {
 		// Make sure we have an up to date copy of all `repository.yml` files.
 		if err := proj.downloadRepositoryYmlFiles(); err != nil {
@@ -422,7 +420,14 @@ func (proj *Project) InfoIf(predicate func(r *repo.Repo) bool,
 	}
 
 	// Determine which repos the user wants info about.
-	repoList := proj.SelectRepos(predicate)
+	predicate := func(r *repo.Repo) bool { return !r.IsExternal(r.Path()) }
+	internalRepos := proj.SelectRepos(predicate)
+
+	predicate = func(r *repo.Repo) bool { return r.IsExternal(r.Path()) }
+	// This should be empty slice if remote is true
+	externalRepos := proj.SelectRepos(predicate)
+
+	repoList := append(internalRepos, externalRepos...)
 
 	// Ignore errors.  We will deal with bad repos individually when we display
 	// info about them.