# HG changeset patch
# User jcoomes
# Date 1393383747 28800
# Node ID c90ebb4991b6479bc8cc9af12f12663aa16a44b8
# Parent  6df5092777791a14b1ff152e42d30bcaeeece4f8
tconfig:  add --expand to show recursively-expanded items

diff -r 6df509277779 -r c90ebb4991b6 tests/test-trees-local.t
--- a/tests/test-trees-local.t	Tue Feb 25 16:25:00 2014 -0800
+++ b/tests/test-trees-local.t	Tue Feb 25 19:02:27 2014 -0800
@@ -381,6 +381,23 @@
   $TESTTMP/r4/s2/s2.2
   $TESTTMP/r4/s2/s2.2/s2.2.1
   $TESTTMP/r4/s3
+
+  $ cat <<EOF >> r4/s3/.hg/hgrc
+  > [trees]
+  > tlevel0 = t0
+  > tlevel1 = tlevel0 t1 t2 t3
+  > tlevel2 = tlevel1 t4 t5
+  > tlevelx = x tlevel1 y z
+  > EOF
+  $ hg -R r4/s3 tconfig --expand tlevel0
+  t0
+  $ hg -R r4/s3 tconfig --expand tlevel1
+  t0 t1 t2 t3
+  $ hg -R r4/s3 tconfig --expand tlevel2
+  t0 t1 t2 t3 t4 t5
+  $ hg -R r4/s3 tconfig --expand tlevelx
+  x t0 t1 t2 t3 y z
+
   $ rm -r r4/s3
 
 Create changesets in r1 and r2.
diff -r 6df509277779 -r c90ebb4991b6 trees.py
--- a/trees.py	Tue Feb 25 16:25:00 2014 -0800
+++ b/trees.py	Tue Feb 25 19:02:27 2014 -0800
@@ -478,6 +478,25 @@
         l.remove(subtree)
     return _writeconfig(repo, _ns(ui, opts), l)
 
+def expandconfig(ui, repo, args, opts):
+    """show recursively-expanded trees config items
+
+    Config items in the [trees] section can be defined in terms of other items;
+    this command shows the expanded value.
+
+    returns 0 if at least one config item was found; otherwise returns 1.
+    """
+
+    rc = 1
+    for item in args:
+        rhs = ui.configlist('trees', item)
+        if rhs:
+            rc = 0
+            l = _expandsubtrees(ui, rhs)
+            ui.write(' '.join(l))
+            ui.write('\n')
+    return rc
+
 def setconfig(ui, repo, subtrees, opts):
     walk = opts.get('walk')
     if walk + bool(subtrees) != 1:
@@ -490,26 +509,44 @@
 def config(ui, repo, *subtrees, **opts):
     """list or change the subtrees configuration
 
-    One of four operations can be selected:  --list, --add, --del, or --set.  If
-    no operation is specified, --list is assumed.
+    One of five operations can be selected:  --list, --add, --del, --expand or
+    --set.  If no operation is specified, --list is assumed.
 
     If the --walk option is used with --set, the filesystem rooted at REPO is
-    scanned and the subtree configuration set to the discovered repos."""
+    scanned and the subtree configuration set to the discovered repos.
+
+    In contrast to most other trees commands, tconfig does not recurse into
+    subtrees; it operates only on the current repository.  (Use the tlist
+    command to recursively list subtrees.)
 
-    _checklocal(repo)
+    The --expand option does not list subtrees, but instead lists the values of
+    config items from the [trees] section after recursively expanding
+    them. (Items in the [trees] section can be defined recursively in terms of
+    other items in the [trees] section.)  It returns 0 if at least one config
+    item was found; otherwise it returns 1.
+
+    """
 
     opadd = opts.get('add')
     opdel = opts.get('del')
+    opexp = opts.get('expand')
     oplst = opts.get('list')
     opset = opts.get('set')
-    cnt = opadd + opdel + oplst + opset
+    cnt = opadd + opdel + opexp + oplst + opset
     if cnt > 1:
-        raise util.Abort(_('at most one of --add, --del, --list or --set is ' +
-                           'allowed'))
+        raise util.Abort(_('at most one of --add, --del, --expand, --list ' +
+                           'or --set is allowed'))
+    if not opexp and not repo:
+        raise util.Abort(_('no repository found'))
+    if repo:
+        _checklocal(repo)
+
     if opadd:
         return addconfig(ui, repo, subtrees, opts)
     if opdel:
         return delconfig(ui, repo, subtrees, opts)
+    if opexp:
+        return expandconfig(ui, repo, subtrees, opts)
     if opset:
         return setconfig(ui, repo, subtrees, opts)
 
@@ -784,6 +821,8 @@
                _('with --del, delete all subtrees from config')),
               ('d', 'del', False,
                _('delete the specified SUBTREEs from config')),
+              ('e', 'expand', False,
+               _('recursively expand config items in the [trees] section')),
               ('l', 'list', False,
                _('list the configured subtrees')),
               ('s', 'set', False, _('set the subtree config to SUBTREEs'))
@@ -847,6 +886,7 @@
         cmdtable['tsummary'] = _newcte('summary', summary, subtreesopts)
 
 commands.norepo += ' tclone tversion tdebugkeys'
+commands.optionalrepo += ' tconfig'
 
 def genlistkeys(namespace):
     def _listkeys(repo):