Flag kwfiles if verbose; shorten bailout code
authorChristian Ebert <blacktrash@gmx.net>
Mon, 15 Oct 2007 10:25:20 +0200
changeset 268 14ebaa9eaf1d
parent 267 4a24c3acd4f2
child 269 b5b64c9da876
Flag kwfiles if verbose; shorten bailout code
hgkw/keyword.py
--- a/hgkw/keyword.py	Sat Oct 13 22:15:20 2007 +0200
+++ b/hgkw/keyword.py	Mon Oct 15 10:25:20 2007 +0200
@@ -324,10 +324,8 @@
         return kwfiles, files
     except AttributeError:
         if ui.configitems('keyword'):
-            err = _('[keyword] patterns cannot match')
-        else:
-            err = _('no [keyword] patterns configured')
-        raise util.Abort(err)
+            raise util.Abort(_('[keyword] patterns cannot match'))
+        raise util.Abort(_('no [keyword] patterns configured'))
 
 def _overwrite(ui, repo, expand, *pats, **opts):
     '''Expands/shrinks keywords in working directory.'''
@@ -366,13 +364,14 @@
 def files(ui, repo, *pats, **opts):
     '''print files currently configured for keyword expansion
 
-    Crosscheck which files in working directory
-    are matched by [keyword] config patterns.
+    Crosscheck which files in working directory are target of expansion,
+    that is, files matched by [keyword] config patterns but not symlinks.
     '''
     kwfiles, files = _weedfiles(ui, repo, *pats, **opts)
     cwd = pats and repo.getcwd() or ''
-    flag = opts['all'] and 1 or 0
+    allf = opts['all']
     ignored = opts['ignored']
+    flag = (allf or ui.verbose) and 1 or 0
     if not ignored:
         format = ('%s\n', 'K %s\n')[flag]
         for k in kwfiles: