diff -r 225c969e007b -r 27f2e2126447 hgkw/keyword.py --- a/hgkw/keyword.py Sat Jan 05 16:47:14 2008 +0100 +++ b/hgkw/keyword.py Mon Jan 07 12:02:23 2008 +0100 @@ -426,8 +426,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'): @@ -461,10 +460,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() # use the full definition of repo._link for backwards compatibility kwfiles = [f for f in files if _kwtemplater.matcher(f)