Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 27727 1a6fd929056f
parent 27726 7e9dc8bbebf6
child 27728 294037159c64 
--- a/mercurial/commands.py	Sun Dec 13 22:02:32 2015 +0900
+++ b/mercurial/commands.py	Sun Dec 13 23:01:19 2015 +0900
@@ -5403,16 +5403,19 @@
     else:
         pathitems = sorted(ui.paths.iteritems())
 
+    if ui.quiet:
+        namefmt = '%s\n'
+    else:
+        namefmt = '%s = '
+    showsubopts = not search and not ui.quiet
+
     for name, path in pathitems:
-        if search and not ui.quiet:
+        if not search:
+            ui.write(namefmt % name)
+        if not ui.quiet:
             ui.write("%s\n" % util.hidepassword(path.rawloc))
-        if search:
-            continue
-        if ui.quiet:
-            ui.write("%s\n" % name)
-        else:
-            ui.write("%s = %s\n" % (name, util.hidepassword(path.rawloc)))
-            for subopt, value in sorted(path.suboptions.items()):
+        for subopt, value in sorted(path.suboptions.items()):
+            if showsubopts:
                 ui.write('%s:%s = %s\n' % (name, subopt, value))
 
     if search and not pathitems:
Mercurial