hgkw/keyword.py
branchstable
changeset 697 876f5dff4e59
parent 696 2305f9255f04
child 699 57f8b7f021e8
equal deleted inserted replaced
693:8428f3bda904 697:876f5dff4e59
     1 # keyword.py - $Keyword$ expansion for Mercurial
     1 # keyword.py - $Keyword$ expansion for Mercurial
     2 #
     2 #
     3 # Copyright 2007-2009 Christian Ebert <blacktrash@gmx.net>
     3 # Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
     4 #
     4 #
     5 # This software may be used and distributed according to the terms of the
     5 # This software may be used and distributed according to the terms of the
     6 # GNU General Public License version 2 or any later version.
     6 # GNU General Public License version 2 or any later version.
     7 #
     7 #
     8 # $Id$
     8 # $Id$
   248 
   248 
   249 def _status(ui, repo, kwt, *pats, **opts):
   249 def _status(ui, repo, kwt, *pats, **opts):
   250     '''Bails out if [keyword] configuration is not active.
   250     '''Bails out if [keyword] configuration is not active.
   251     Returns status of working directory.'''
   251     Returns status of working directory.'''
   252     if kwt:
   252     if kwt:
   253         unknown = (opts.get('unknown') or opts.get('all')
       
   254                    or opts.get('untracked'))
       
   255         return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
   253         return repo.status(match=cmdutil.match(repo, pats, opts), clean=True,
   256                            unknown=unknown)
   254                            unknown=opts.get('unknown') or opts.get('all'))
   257     if ui.configitems('keyword'):
   255     if ui.configitems('keyword'):
   258         raise util.Abort(_('[keyword] patterns cannot match'))
   256         raise util.Abort(_('[keyword] patterns cannot match'))
   259     raise util.Abort(_('no [keyword] patterns configured'))
   257     raise util.Abort(_('no [keyword] patterns configured'))
   260 
   258 
   261 def _kwfwrite(ui, repo, expand, *pats, **opts):
   259 def _kwfwrite(ui, repo, expand, *pats, **opts):
   393     kwt = kwtools['templater']
   391     kwt = kwtools['templater']
   394     status = _status(ui, repo, kwt, *pats, **opts)
   392     status = _status(ui, repo, kwt, *pats, **opts)
   395     cwd = pats and repo.getcwd() or ''
   393     cwd = pats and repo.getcwd() or ''
   396     modified, added, removed, deleted, unknown, ignored, clean = status
   394     modified, added, removed, deleted, unknown, ignored, clean = status
   397     files = []
   395     files = []
   398     if not (opts.get('unknown') or opts.get('untracked')) or opts.get('all'):
   396     if not opts.get('unknown') or opts.get('all'):
   399         files = sorted(modified + added + clean)
   397         files = sorted(modified + added + clean)
   400     wctx = repo[None]
   398     wctx = repo[None]
   401     kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
   399     kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
   402     kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
   400     kwunknown = [f for f in unknown if kwt.iskwfile(f, wctx.flags)]
   403     if not opts.get('ignore') or opts.get('all'):
   401     if not opts.get('ignore') or opts.get('all'):
   529     'kwfiles':
   527     'kwfiles':
   530         (files,
   528         (files,
   531          [('A', 'all', None, _('show keyword status flags of all files')),
   529          [('A', 'all', None, _('show keyword status flags of all files')),
   532           ('i', 'ignore', None, _('show files excluded from expansion')),
   530           ('i', 'ignore', None, _('show files excluded from expansion')),
   533           ('u', 'unknown', None, _('only show unknown (not tracked) files')),
   531           ('u', 'unknown', None, _('only show unknown (not tracked) files')),
   534           ('a', 'all', None,
       
   535            _('show keyword status flags of all files (DEPRECATED)')),
       
   536           ('u', 'untracked', None, _('only show untracked files (DEPRECATED)')),
       
   537          ] + commands.walkopts,
   532          ] + commands.walkopts,
   538          _('hg kwfiles [OPTION]... [FILE]...')),
   533          _('hg kwfiles [OPTION]... [FILE]...')),
   539     'kwshrink': (shrink, commands.walkopts,
   534     'kwshrink': (shrink, commands.walkopts,
   540                  _('hg kwshrink [OPTION]... [FILE]...')),
   535                  _('hg kwshrink [OPTION]... [FILE]...')),
   541 }
   536 }