Change output format to match 'mbed ls' when using recursive mode (consistency)

Author: screamerbg

mbed/mbed.py

@@ -2097,7 +2097,7 @@ def update(rev=None, clean=False, clean_files=False, clean_deps=False, ignore=Fa
 
 # Synch command
 @subcommand('sync',
-    help='Synchronize library references',
+    help='Synchronize library references\n\n',
     description=(
         "Synchronizes all library and dependency references (.lib files) in the\n"
         "current program or library.\n"
@@ -2171,10 +2171,7 @@ def list_(detailed=False, prefix='', p_path=None, ignore=False):
     print "%s (%s)" % (prefix + (relpath(p_path, repo.path) if p_path else repo.name), ((repo.url+('#'+str(repo.rev)[:12] if repo.rev else '') if detailed else revstr) or 'no revision'))
 
     for i, lib in enumerate(sorted(repo.libs, key=lambda l: l.path)):
-        if prefix:
-            nprefix = prefix[:-3] + ('|  ' if prefix[-3] == '|' else '   ')
-        else:
-            nprefix = ''
+        nprefix = (prefix[:-3] + ('|  ' if prefix[-3] == '|' else '   ')) if prefix else ''
         nprefix += '|- ' if i < len(repo.libs)-1 else '`- '
 
         if lib.check_repo(ignore):
@@ -2184,34 +2181,45 @@ def list_(detailed=False, prefix='', p_path=None, ignore=False):
 
 # Command status for cross-SCM status of repositories
 @subcommand('releases',
-    dict(name=['-a', '--all'], dest='all_refs', action='store_true', help='Show all, e.g. release candidates, alpha, betas'),
-    dict(name=['-r', '--recursive'], action='store_true', help='Show releases for all libraries and sub-libraries as well'),
-    help='Shows release tags\n\n',
+    dict(name=['-a', '--all'], dest='all_refs', action='store_true', help='Show all releases, including release candidates, alphas, betas, etc'),
+    dict(name=['-r', '--recursive'], action='store_true', help='Show release tags for all libraries and sub-libraries as well'),
+    help='Show release tags',
     description=(
         "Show release tags for the current program or library."))
-def releases_(all_refs=False, recursive=False):
+def releases_(all_refs=False, recursive=False, prefix='', p_path=None):
     repo = Repo.fromrepo()
     tags = repo.scm.gettags()
-    revtags = repo.scm.gettags(repo.rev) # associated tags with current commit
+    revtags = repo.scm.gettags(repo.rev)  if repo.rev else [] # associated tags with current commit
+    revstr = ('#'+repo.rev[:12]+(', tags:'+', '.join(revtags[0:2]) if len(revtags) else '')) if repo.rev else ''
+    regex_rels = regex_rels_all if all_refs else regex_rels_official
 
-    action("Releases in %s \"%s\"\n" % (repo.pathtype(repo.path), repo.name))
-    regex = regex_rels_all if all_refs else regex_rels_official
+    # Generate list of tags
     rels = []
     for tag in tags:
-        if re.match(regex, tag[1]):
+        if re.match(regex_rels, tag[1]):
             rels.append(tag[1] + " %s%s" % (tag[0] if verbose else "", " <- current" if tag[1] in revtags else ""))
 
+    # print header
+    print "%s (%s)" % (prefix + (relpath(p_path, repo.path) if p_path else repo.name), ((repo.url+('#'+str(repo.rev)[:12] if repo.rev else '') if verbose else revstr) or 'no revision'))
+
+    # print list of tags
+    rprefix = (prefix[:-3] + ('|  ' if prefix[-3] == '|' else '   ')) if recursive and prefix else ''
+    rprefix += '| ' if recursive and len(repo.libs)>1 else '  '
     if len(rels):
         for rel in rels:
-            log(rel+"\n")
+            print rprefix+'* '+rel
     else:
-        log("None\n")
-    log("\n")
+        print rprefix+'No release tags detected'
 
     if recursive:
-        for lib in repo.libs:
-            with cd(lib.path):
-                releases_(all_refs, recursive)
+        for i, lib in enumerate(sorted(repo.libs, key=lambda l: l.path)):
+            nprefix = (prefix[:-3] + ('|  ' if prefix[-3] == '|' else '   ')) if prefix else ''
+            nprefix += '|- ' if i < len(repo.libs)-1 else '`- '
+
+            if lib.check_repo():
+                with cd(lib.path):
+                    releases_(all_refs, recursive, nprefix, repo.path)
+
 
 # Command status for cross-SCM status of repositories
 @subcommand('status',