facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

keyword: nokwcommands, restricted string variables at top level

Browse Source 
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
This commit is contained in:
Christian Ebert 2008-02-04 21:08:45 +01:00
parent 795a5f750c
commit 9f2689b36a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hgext/keyword.py
View File

@ -86,10 +86,13 @@ import re, shutil, sys, tempfile, time
commands.optionalrepo += ' kwdemo'
# hg commands that do not act on keywords
nokwcommands = ('add addremove bundle copy export grep identify incoming init'
'log outgoing push remove rename rollback tip convert')
# hg commands that trigger expansion only when writing to working dir,
# not when reading filelog, and unexpand when reading from working dir
restricted = ('diff1', 'record',
'qfold', 'qimport', 'qnew', 'qpush', 'qrefresh', 'qrecord')
restricted = 'diff1 record qfold qimport qnew qpush qrefresh qrecord'
def utcdate(date):
'''Returns hgdate in cvs-like UTC format.'''
@ -113,11 +116,11 @@ class kwtemplater(object):
'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
}
def __init__(self, ui, repo, inc, exc, hgcmd):
def __init__(self, ui, repo, inc, exc, restricted):
self.ui = ui
self.repo = repo
self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
self.hgcmd = hgcmd
self.restricted = restricted
self.commitnode = None
self.path = ''
@ -156,7 +159,7 @@ class kwtemplater(object):
def expand(self, node, data):
'''Returns data with keywords expanded.'''
if util.binary(data) or self.hgcmd in restricted:
if self.restricted or util.binary(data):
return data
return self.substitute(node, data, self.re_kw.sub)
@ -410,12 +413,8 @@ def reposetup(ui, repo):
if not repo.local():
return
nokwcommands = ('add', 'addremove', 'bundle', 'copy', 'export', 'grep',
'identify', 'incoming', 'init', 'log', 'outgoing', 'push',
'remove', 'rename', 'rollback', 'tip',
'convert')
hgcmd, func, args, opts, cmdopts = dispatch._parse(ui, sys.argv[1:])
if hgcmd in nokwcommands:
if hgcmd in nokwcommands.split():
return
if hgcmd == 'diff':
@ -437,7 +436,8 @@ def reposetup(ui, repo):
return
global _kwtemplater
_kwtemplater = kwtemplater(ui, repo, inc, exc, hgcmd)
_restricted = hgcmd in restricted.split()
_kwtemplater = kwtemplater(ui, repo, inc, exc, _restricted)
class kwrepo(repo.__class__):
def file(self, f, kwmatch=False):
@ -449,7 +449,7 @@ def reposetup(ui, repo):
def wread(self, filename):
data = super(kwrepo, self).wread(filename)
if hgcmd in restricted and _kwtemplater.matcher(filename):
if _restricted and _kwtemplater.matcher(filename):
return _kwtemplater.shrink(data)
return data