# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1199852673 -3600
# Node ID 2b67acc404f6b16c10e44966118bd8167b07c37d
# Parent  b8e8bd3c82f6c862ee8a0b17738812edf9bd3c40
keyword: clean up quiet setting in kwdemo and adding of untracked kwfiles

diff -r b8e8bd3c82f6 -r 2b67acc404f6 hgext/keyword.py
--- a/hgext/keyword.py	Wed Jan 09 11:21:40 2008 +0100
+++ b/hgext/keyword.py	Wed Jan 09 05:24:33 2008 +0100
@@ -328,8 +328,7 @@
     ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
     # silence branch command if not verbose
     quiet = ui.quiet
-    verbose = ui.verbose
-    ui.quiet = not verbose
+    ui.quiet = not ui.verbose
     commands.branch(ui, repo, branchname)
     ui.quiet = quiet
     for name, cmd in ui.configitems('hooks'):
@@ -363,10 +362,9 @@
     '''
     status = _status(ui, repo, *pats, **opts)
     modified, added, removed, deleted, unknown, ignored, clean = status
+    files = modified + added + clean
     if opts.get('untracked'):
-        files = modified + added + unknown + clean
-    else:
-        files = modified + added + clean
+        files += unknown
     files.sort()
     kwfiles = [f for f in files if _iskwfile(f, repo._link)]
     cwd = pats and repo.getcwd() or ''