(0.9.2compat) expand keywords in raw web output, and other changes from default branch
Comment out import related tests, as not always available.
# keyword.py - $Keyword$ expansion for Mercurial
#
# Copyright 2007, 2008 Christian Ebert <blacktrash@gmx.net>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.
#
# $Id$
#
# Keyword expansion hack against the grain of a DSCM
#
# There are many good reasons why this is not needed in a distributed
# SCM, still it may be useful in very small projects based on single
# files (like LaTeX packages), that are mostly addressed to an audience
# not running a version control system.
#
# For in-depth discussion refer to
# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
#
# Keyword expansion is based on Mercurial's changeset template mappings.
#
# Binary files are not touched.
#
# Setup in hgrc:
#
# [extensions]
# # enable extension
# keyword = /full/path/to/hgkw/keyword.py
# # or, if script in canonical hgext folder:
# # hgext.keyword =
#
# Files to act upon/ignore are specified in the [keyword] section.
# Customized keyword template mappings in the [keywordmaps] section.
#
# Run "hg help keyword" and "hg kwdemo" to get info on configuration.
'''keyword expansion in local repositories
This extension expands RCS/CVS-like or self-customized $Keywords$
in tracked text files selected by your configuration.
Keywords are only expanded in local repositories and not stored in
the change history. The mechanism can be regarded as a convenience
for the current user or for archive distribution.
Configuration is done in the [keyword] and [keywordmaps] sections
of hgrc files.
Example:
[keyword]
# expand keywords in every python file except those matching "x*"
**.py =
x* = ignore
Note: the more specific you are in your filename patterns
the less you lose speed in huge repos.
For [keywordmaps] template mapping and expansion demonstration and
control run "hg kwdemo".
An additional date template filter {date|utcdate} is provided.
The default template mappings (view with "hg kwdemo -d") can be replaced
with customized keywords and templates.
Again, run "hg kwdemo" to control the results of your config changes.
Before changing/disabling active keywords, run "hg kwshrink" to avoid
the risk of inadvertedly storing expanded keywords in the change history.
To force expansion after enabling it, or a configuration change, run
"hg kwexpand".
Also, when committing with the record extension or using mq's qrecord, be aware
that keywords cannot be updated. Again, run "hg kwexpand" on the files in
question to update keyword expansions after all changes have been checked in.
Expansions spanning more than one line and incremental expansions,
like CVS' $Log$, are not supported. A keyword template map
"Log = {desc}" expands to the first line of the changeset description.
Caveat: With Mercurial versions prior to 4574925db5c0 "hg import" might
cause rejects if the patch context contains an active keyword.
In that case run "hg kwshrink", and then reimport.
Or, better, use bundle/unbundle to share changes.
'''
from mercurial import commands, cmdutil, context
from mercurial import localrepo, revlog, templater, util
from mercurial.node import *
from mercurial.i18n import gettext as _
import mimetypes, os.path, re, shutil, tempfile, time
try:
# avoid spurious rejects if patchfile is available
from mercurial.patch import patchfile
_patchfile_init = patchfile.__init__
except ImportError:
_patchfile_init = None
# backwards compatibility hacks
try:
# templatefilters module introduced in 9f1e6ab76069
from mercurial import templatefilters
template_filters = templatefilters.filters
template_firstline = templatefilters.firstline
except ImportError:
template_filters = templater.common_filters
template_firstline = templater.firstline
try:
# webcommands module introduced in 08887121a652
from mercurial.hgweb import webcommands
_webcommands = True
kwweb_func = webcommands.rawfile
except ImportError:
from mercurial.hgweb import hgweb_mod
_webcommands = False
def _normal(repo, files):
'''Backwards compatible repo.dirstate.normal/update.'''
# 6fd953d5faea introduced dirstate.normal()
try:
for f in files:
repo.dirstate.normal(f)
except AttributeError:
repo.dirstate.update(files, 'n')
def _pathto(repo, f, cwd=None):
'''kwfiles behaves similar to status, using pathto since 78b6add1f966.'''
try:
return repo.pathto(f, cwd)
except AttributeError:
return f
commands.optionalrepo += ' kwdemo'
def utcdate(date):
'''Returns hgdate in cvs-like UTC format.'''
return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
class kwtemplater(object):
'''
Sets up keyword templates, corresponding keyword regex, and
provides keyword substitution functions.
'''
templates = {
'Revision': '{node|short}',
'Author': '{author|user}',
'Date': '{date|utcdate}',
'RCSFile': '{file|basename},v',
'Source': '{root}/{file},v',
'Id': '{file|basename},v {node|short} {date|utcdate} {author|user}',
'Header': '{root}/{file},v {node|short} {date|utcdate} {author|user}',
}
def __init__(self, ui, repo, inc, exc):
self.ui = ui
self.repo = repo
self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
self.ctx = None
kwmaps = self.ui.configitems('keywordmaps')
if kwmaps: # override default templates
kwmaps = [(k, templater.parsestring(v, quoted=False))
for (k, v) in kwmaps]
self.templates = dict(kwmaps)
escaped = map(re.escape, self.templates.keys())
kwpat = r'\$(%s)(: [^$\n\r]*? )??\$' % '|'.join(escaped)
self.re_kw = re.compile(kwpat)
template_filters['utcdate'] = utcdate
self.ct = self._changeset_templater()
def _changeset_templater(self):
'''Backwards compatible cmdutil.changeset_templater.'''
# before 1e0b94cfba0e there was an extra "brinfo" argument
try:
return cmdutil.changeset_templater(self.ui, self.repo,
False, '', False)
except TypeError:
return cmdutil.changeset_templater(self.ui, self.repo,
False, None, '', False)
def substitute(self, path, data, node, subfunc):
'''Obtains file's changenode if node not given,
and calls given substitution function.'''
if node is None:
# kwrepo.wwrite except when overwriting on commit
if self.ctx is None:
self.ctx = self.repo.changectx()
try:
fnode = self.ctx.filenode(path)
fl = self.repo.file(path)
c = context.filectx(self.repo, path, fileid=fnode, filelog=fl)
node = c.node()
except revlog.LookupError:
# eg: convert
return subfunc == self.re_kw.sub and data or (data, None)
def kwsub(mobj):
'''Substitutes keyword using corresponding template.'''
kw = mobj.group(1)
self.ct.use_template(self.templates[kw])
self.ui.pushbuffer()
self.ct.show(changenode=node, root=self.repo.root, file=path)
ekw = template_firstline(self.ui.popbuffer())
return '$%s: %s $' % (kw, ekw)
return subfunc(kwsub, data)
def expand(self, path, data, node):
'''Returns data with keywords expanded.'''
if util.binary(data):
return data
return self.substitute(path, data, node, self.re_kw.sub)
def process(self, path, data, expand, ctx, node):
'''Returns a tuple: data, count.
Count is number of keywords/keyword substitutions,
telling caller whether to act on file containing data.'''
if util.binary(data):
return data, None
if expand:
self.ctx = ctx
return self.substitute(path, data, node, self.re_kw.subn)
return self.re_kw.subn(r'$\1$', data)
def shrink(self, data):
'''Returns text with all keyword substitutions removed.'''
if util.binary(data):
return data
return self.re_kw.sub(r'$\1$', data)
def _status(ui, repo, *pats, **opts):
'''Bails out if [keyword] configuration is not active.
Returns status of working directory.'''
if hasattr(repo, '_kwt'):
files, match, anypats = cmdutil.matchpats(repo, pats, opts)
return repo.status(files=files, match=match, list_clean=True)
if ui.configitems('keyword'):
raise util.Abort(_('[keyword] patterns cannot match'))
raise util.Abort(_('no [keyword] patterns configured'))
def _overwrite(ui, repo, node=None, expand=True, files=None):
'''Overwrites selected files expanding/shrinking keywords.'''
ctx = repo.changectx(node)
mf = ctx.manifest()
if node is not None:
# commit
files = [f for f in ctx.files() if f in mf]
notify = ui.debug
else:
# kwexpand/kwshrink
notify = ui.note
candidates = [f for f in files if not mf.linkf(f) and repo._kwt.matcher(f)]
if candidates:
overwritten = []
candidates.sort()
action = expand and 'expanding' or 'shrinking'
for f in candidates:
data, kwfound = repo._wreadkwct(f, expand, ctx, node)
if kwfound:
notify(_('overwriting %s %s keywords\n') % (f, action))
repo.wwrite(f, data, mf.flags(f), overwrite=True)
overwritten.append(f)
_normal(repo, overwritten)
def _kwfwrite(ui, repo, expand, *pats, **opts):
'''Selects files and passes them to _overwrite.'''
status = _status(ui, repo, *pats, **opts)
modified, added, removed, deleted, unknown, ignored, clean = status
if modified or added or removed or deleted:
raise util.Abort(_('outstanding uncommitted changes in given files'))
wlock = lock = None
try:
wlock = repo.wlock()
lock = repo.lock()
_overwrite(ui, repo, expand=expand, files=clean)
finally:
del wlock, lock
def cat(ui, repo, file1, *pats, **opts):
'''output the current or given revision of files expanding keywords
Print the specified files as they were at the given revision.
If no revision is given, the parent of the working directory is used,
or tip if no revision is checked out.
Output may be to a file, in which case the name of the file is
given using a format string. The formatting rules are the same as
for the export command, with the following additions:
%s basename of file being printed
%d dirname of file being printed, or '.' if in repo root
%p root-relative path name of file being printed
'''
ctx = repo.changectx(opts['rev'])
try:
repo._kwt.ctx = ctx
kw = True
except AttributeError:
kw = False
err = 1
for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts,
ctx.node()):
fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
data = ctx.filectx(abs).data()
if kw and repo._kwt.matcher(abs):
data = repo._kwt.expand(abs, data, None)
fp.write(data)
err = 0
return err
def demo(ui, repo, *args, **opts):
'''print [keywordmaps] configuration and an expansion example
Show current, custom, or default keyword template maps
and their expansion.
Extend current configuration by specifying maps as arguments
and optionally by reading from an additional hgrc file.
Override current keyword template maps with "default" option.
'''
def demostatus(stat):
ui.status(_('\n\t%s\n') % stat)
def demoitems(section, items):
ui.write('[%s]\n' % section)
for k, v in items:
ui.write('%s = %s\n' % (k, v))
msg = 'hg keyword config and expansion example'
kwstatus = 'current'
fn = 'demo.txt'
branchname = 'demobranch'
tmpdir = tempfile.mkdtemp('', 'kwdemo.')
ui.note(_('creating temporary repo at %s\n') % tmpdir)
repo = localrepo.localrepository(ui, path=tmpdir, create=True)
ui.setconfig('keyword', fn, '')
if args or opts.get('rcfile'):
kwstatus = 'custom'
if opts.get('rcfile'):
ui.readconfig(opts.get('rcfile'))
if opts.get('default'):
kwstatus = 'default'
kwmaps = kwtemplater.templates
if ui.configitems('keywordmaps'):
# override maps from optional rcfile
for k, v in kwmaps.iteritems():
ui.setconfig('keywordmaps', k, v)
elif args:
# simulate hgrc parsing
rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
fp = repo.opener('hgrc', 'w')
fp.writelines(rcmaps)
fp.close()
ui.readconfig(repo.join('hgrc'))
if not opts.get('default'):
kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates
reposetup(ui, repo)
for k, v in ui.configitems('extensions'):
if k.endswith('keyword'):
extension = '%s = %s' % (k, v)
break
demostatus('config using %s keyword template maps' % kwstatus)
ui.write('[extensions]\n%s\n' % extension)
demoitems('keyword', ui.configitems('keyword'))
demoitems('keywordmaps', kwmaps.iteritems())
keywords = '$' + '$\n$'.join(kwmaps.keys()) + '$\n'
repo.wopener(fn, 'w').write(keywords)
repo.add([fn])
path = repo.wjoin(fn)
ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path))
ui.note(keywords)
ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
# silence branch command if not verbose
quiet = ui.quiet
ui.quiet = not ui.verbose
commands.branch(ui, repo, branchname)
ui.quiet = quiet
for name, cmd in ui.configitems('hooks'):
if name.split('.', 1)[0].find('commit') > -1:
repo.ui.setconfig('hooks', name, '')
ui.note(_('unhooked all commit hooks\n'))
ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
repo.commit(text=msg)
format = ui.verbose and ' in %s' % path or ''
demostatus('%s keywords expanded%s' % (kwstatus, format))
ui.write(repo.wopener(fn).read())
ui.debug(_('\nremoving temporary repo %s\n') % tmpdir)
shutil.rmtree(tmpdir, ignore_errors=True)
def expand(ui, repo, *pats, **opts):
'''expand keywords in working directory
Run after (re)enabling keyword expansion.
kwexpand refuses to run if given files contain local changes.
'''
# 3rd argument sets expansion to True
_kwfwrite(ui, repo, True, *pats, **opts)
def files(ui, repo, *pats, **opts):
'''print files currently configured for keyword expansion
Crosscheck which files in working directory are potential targets for
keyword expansion.
That is, files matched by [keyword] config patterns but not symlinks.
'''
status = _status(ui, repo, *pats, **opts)
modified, added, removed, deleted, unknown, ignored, clean = status
files = modified + added + clean
if opts.get('untracked'):
files += unknown
files.sort()
# use full def of repo._link for backwards compatibility
kwfiles = [f for f in files if
not os.path.islink(repo.wjoin(f)) and repo._kwt.matcher(f)]
cwd = pats and repo.getcwd() or ''
kwfstats = not opts.get('ignore') and (('K', kwfiles),) or ()
if opts.get('all') or opts.get('ignore'):
kwfstats += (('I', [f for f in files if f not in kwfiles]),)
for char, filenames in kwfstats:
format = (opts.get('all') or ui.verbose) and '%s %%s\n' % char or '%s\n'
for f in filenames:
ui.write(format % _pathto(repo, f, cwd))
def shrink(ui, repo, *pats, **opts):
'''revert expanded keywords in working directory
Run before changing/disabling active keywords
or if you experience problems with "hg import" or "hg merge".
kwshrink refuses to run if given files contain local changes.
'''
# 3rd argument sets expansion to False
_kwfwrite(ui, repo, False, *pats, **opts)
def reposetup(ui, repo):
if not repo.local() or repo.root.endswith('/.hg/patches'):
return
inc, exc = [], ['.hgtags', '.hg_archival.txt']
for pat, opt in ui.configitems('keyword'):
if opt != 'ignore':
inc.append(pat)
else:
exc.append(pat)
if not inc:
return
class kwrepo(repo.__class__):
def _wreadkwct(self, filename, expand, ctx, node):
'''Reads filename and returns tuple of data with keywords
expanded/shrunk and count of keywords (for _overwrite).'''
data = super(kwrepo, self).wread(filename)
return self._kwt.process(filename, data, expand, ctx, node)
def wread(self, filename):
data = super(kwrepo, self).wread(filename)
if self._kwt.matcher(filename):
return self._kwt.shrink(data)
return data
def wwrite(self, filename, data, flags=None, overwrite=False):
if not overwrite and self._kwt.matcher(filename):
data = self._kwt.expand(filename, data, None)
try:
super(kwrepo, self).wwrite(filename, data, flags)
except (AttributeError, TypeError):
# 656e06eebda7 removed file descriptor argument
# 67982d3ee76c added flags argument
super(kwrepo, self).wwrite(filename, data)
def wwritedata(self, filename, data):
if self._kwt.matcher(filename):
data = self._kwt.expand(filename, data, None)
return super(kwrepo, self).wwritedata(filename, data)
def _commit(self, files, text, user, date, match, force, lock, wlock,
force_editor, p1, p2, extra, empty_ok):
'''Private commit wrapper for backwards compatibility.'''
try:
return super(kwrepo, self).commit(files=files, text=text,
user=user, date=date,
match=match, force=force,
lock=lock, wlock=wlock,
force_editor=force_editor,
p1=p1, p2=p2, extra=extra)
except TypeError:
try:
return super(kwrepo, self).commit(files=files, text=text,
user=user, date=date,
match=match, force=force,
force_editor=force_editor,
p1=p1, p2=p2,
extra=extra,
empty_ok=empty_ok)
except TypeError:
return super(kwrepo, self).commit(files=files, text=text,
user=user, date=date,
match=match, force=force,
force_editor=force_editor,
p1=p1, p2=p2, extra=extra)
def commit(self, files=None, text='', user=None, date=None,
match=util.always, force=False, lock=None, wlock=None,
force_editor=False, p1=None, p2=None, extra={},
empty_ok=False):
# (w)lock arguments removed in 126f527b3ba3
# so they are None or what was passed to commit
# use private _(w)lock for deletion
_lock = lock
_wlock = wlock
del wlock, lock
_p1 = _p2 = None
try:
if not _wlock:
_wlock = self.wlock()
if not _lock:
_lock = self.lock()
# store and postpone commit hooks
commithooks = {}
for name, cmd in ui.configitems('hooks'):
if name.split('.', 1)[0] == 'commit':
commithooks[name] = cmd
ui.setconfig('hooks', name, '')
if commithooks:
# store parents for commit hook environment
if p1 is None:
_p1, _p2 = repo.dirstate.parents()
else:
_p1, _p2 = p1, p2 or nullid
_p1 = hex(_p1)
if _p2 == nullid:
_p2 = ''
else:
_p2 = hex(_p2)
node = self._commit(files, text, user, date, match, force,
_lock, _wlock, force_editor, p1, p2, extra,
empty_ok)
# restore commit hooks
for name, cmd in commithooks.iteritems():
ui.setconfig('hooks', name, cmd)
if node is not None:
_overwrite(ui, self, node=node)
repo.hook('commit', node=node, parent1=_p1, parent2=_p2)
return node
finally:
del _wlock, _lock
kwt = kwrepo._kwt = kwtemplater(ui, repo, inc, exc)
if _patchfile_init:
def kwpatchfile_init(self, ui, fname, missing=False):
'''Monkeypatch/wrap patch.patchfile.__init__ to avoid
rejects or conflicts due to expanded keywords in working dir.'''
_patchfile_init(self, ui, fname, missing=missing)
if kwt.matcher(self.fname):
# shrink keywords read from working dir
kwshrunk = kwt.shrink(''.join(self.lines))
self.lines = kwshrunk.splitlines(True)
patchfile.__init__ = kwpatchfile_init
if _webcommands:
def kwweb_rawfile(web, req, tmpl):
'''Monkeypatch webcommands.rawfile so it expands keywords.'''
path = web.cleanpath(req.form.get('file', [''])[0])
if not path:
content = web.manifest(tmpl, web.changectx(req), path)
req.respond(webcommands.HTTP_OK, web.ctype)
return content
try:
fctx = web.filectx(req)
except revlog.LookupError:
content = web.manifest(tmpl, web.changectx(req), path)
req.respond(webcommands.HTTP_OK, web.ctype)
return content
path = fctx.path()
text = fctx.data()
if kwt.matcher(path):
text = kwt.expand(path, text, fctx.node())
mt = mimetypes.guess_type(path)[0]
if mt is None or util.binary(text):
mt = mt or 'application/octet-stream'
req.respond(webcommands.HTTP_OK, mt, path, len(text))
return [text]
webcommands.rawfile = kwweb_rawfile
else:
def kwweb_filerevision(self, fctx):
'''Monkeypatch hgweb_mod.hgweb.filerevision so keywords are
expanded in raw file output.'''
f = fctx.path()
text = fctx.data()
fl = fctx.filelog()
n = fctx.filenode()
parity = hgweb_mod.paritygen(self.stripecount)
mt = mimetypes.guess_type(f)[0]
rawtext = text
if kwt.matcher(f):
rawtext = kwt.expand(f, text, fctx.node())
if util.binary(text):
mt = mt or 'application/octet-stream'
text = "(binary:%s)" % mt
mt = mt or 'text/plain'
def lines():
for l, t in enumerate(text.splitlines(1)):
yield {"line": t,
"linenumber": "% 6d" % (l + 1),
"parity": parity.next()}
yield self.t("filerevision",
file=f,
path=hgweb_mod._up(f),
text=lines(),
raw=rawtext,
mimetype=mt,
rev=fctx.rev(),
node=hex(fctx.node()),
author=fctx.user(),
date=fctx.date(),
desc=fctx.description(),
parent=self.siblings(fctx.parents()),
child=self.siblings(fctx.children()),
rename=self.renamelink(fl, n),
permissions=fctx.manifest().flags(f))
hgweb_mod.hgweb.filerevision = kwweb_filerevision
repo.__class__ = kwrepo
cmdtable = {
'kwcat':
(cat, commands.table['cat'][1],
_('hg kwcat [OPTION]... FILE...')),
'kwdemo':
(demo,
[('d', 'default', None, _('show default keyword template maps')),
('f', 'rcfile', [], _('read maps from rcfile'))],
_('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...')),
'kwexpand': (expand, commands.walkopts,
_('hg kwexpand [OPTION]... [FILE]...')),
'kwfiles':
(files,
[('a', 'all', None, _('show keyword status flags of all files')),
('i', 'ignore', None, _('show files excluded from expansion')),
('u', 'untracked', None, _('additionally show untracked files')),
] + commands.walkopts,
_('hg kwfiles [OPTION]... [FILE]...')),
'kwshrink': (shrink, commands.walkopts,
_('hg kwshrink [OPTION]... [FILE]...')),
}