tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode
This makes -d output much more readable when debugging the test framework or
very strange test failures.
[ original upstream message ]
# keyword.py - $Keyword$ expansion for Mercurial## Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>## This software may be used and distributed according to the terms of the# GNU General Public License version 2 or any later version.## $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://mercurial.selenic.com/wiki/KeywordPlan>.## Keyword expansion is based on Mercurial's changeset template mappings.## Binary files are not touched.## 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.'''expand keywords in tracked filesThis extension expands RCS/CVS-like or self-customized $Keywords$ intracked text files selected by your configuration.Keywords are only expanded in local repositories and not stored in thechange history. The mechanism can be regarded as a convenience for thecurrent user or for archive distribution.Keywords expand to the changeset data pertaining to the latest changerelative to the working directory parent of each file.Configuration is done in the [keyword], [keywordset] and [keywordmaps]sections of hgrc files.Example:: [keyword] # expand keywords in every python file except those matching "x*" **.py = x* = ignore [keywordset] # prefer svn- over cvs-like default keywordmaps svn = True.. note:: The more specific you are in your filename patterns the less you lose speed in huge repositories.For [keywordmaps] template mapping and expansion demonstration andcontrol run :hg:`kwdemo`. See :hg:`help templates` for a list ofavailable templates and filters.Three additional date template filters are provided::``utcdate``: "2006/09/18 15:13:13":``svnutcdate``: "2006-09-18 15:13:13Z":``svnisodate``: "2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)"The default template mappings (view with :hg:`kwdemo -d`) can bereplaced with customized keywords and templates. Again, run:hg:`kwdemo` to control the results of your configuration changes.Before changing/disabling active keywords, you must run :hg:`kwshrink`to avoid storing expanded keywords in the change history.To force expansion after enabling it, or a configuration change, run:hg:`kwexpand`.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.'''frommercurialimportcommands,context,cmdutil,dispatch,filelog,extensionsfrommercurialimportlocalrepo,match,patch,templatefilters,templater,utilfrommercurialimportscmutilfrommercurial.hgwebimportwebcommandsfrommercurial.i18nimport_importos,re,shutil,tempfilecommands.optionalrepo+=' kwdemo'cmdtable={}command=cmdutil.command(cmdtable)# hg commands that do not act on keywordsnokwcommands=('add addremove annotate bundle export grep incoming init log'' outgoing push tip verify convert email glog')# hg commands that trigger expansion only when writing to working dir,# not when reading filelog, and unexpand when reading from working dirrestricted='merge kwexpand kwshrink record qrecord resolve transplant'# names of extensions using dorecordrecordextensions='record'colortable={'kwfiles.enabled':'green bold','kwfiles.deleted':'cyan bold underline','kwfiles.enabledunknown':'green','kwfiles.ignored':'bold','kwfiles.ignoredunknown':'none'}# date like in cvs' $Datedefutcdate(text):''':utcdate: Date. Returns a UTC-date in this format: "2009/08/18 11:00:13". '''returnutil.datestr((text[0],0),'%Y/%m/%d %H:%M:%S')# date like in svn's $Datedefsvnisodate(text):''':svnisodate: Date. Returns a date in this format: "2009-08-18 13:00:13 +0200 (Tue, 18 Aug 2009)". '''returnutil.datestr(text,'%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')# date like in svn's $Iddefsvnutcdate(text):''':svnutcdate: Date. Returns a UTC-date in this format: "2009-08-18 11:00:13Z". '''returnutil.datestr((text[0],0),'%Y-%m-%d %H:%M:%SZ')templatefilters.filters.update({'utcdate':utcdate,'svnisodate':svnisodate,'svnutcdate':svnutcdate})# make keyword tools accessiblekwtools={'templater':None,'hgcmd':''}def_defaultkwmaps(ui):'''Returns default keywordmaps according to keywordset configuration.'''templates={'Revision':'{node|short}','Author':'{author|user}',}kwsets=({'Date':'{date|utcdate}','RCSfile':'{file|basename},v','RCSFile':'{file|basename},v',# kept for backwards compatibility# with hg-keyword'Source':'{root}/{file},v','Id':'{file|basename},v {node|short} {date|utcdate} {author|user}','Header':'{root}/{file},v {node|short} {date|utcdate} {author|user}',},{'Date':'{date|svnisodate}','Id':'{file|basename},v {node|short} {date|svnutcdate} {author|user}','LastChangedRevision':'{node|short}','LastChangedBy':'{author|user}','LastChangedDate':'{date|svnisodate}',})templates.update(kwsets[ui.configbool('keywordset','svn')])returntemplatesdef_shrinktext(text,subfunc):'''Helper for keyword expansion removal in text. Depending on subfunc also returns number of substitutions.'''returnsubfunc(r'$\1$',text)def_preselect(wstatus,changed):'''Retrieves modfied and added files from a working directory state and returns the subset of each contained in given changed files retrieved from a change context.'''modified,added=wstatus[:2]modified=[fforfinmodifiediffinchanged]added=[fforfinaddediffinchanged]returnmodified,addedclasskwtemplater(object):''' Sets up keyword templates, corresponding keyword regex, and provides keyword substitution functions. '''def__init__(self,ui,repo,inc,exc):self.ui=uiself.repo=repoself.match=match.match(repo.root,'',[],inc,exc)self.restrict=kwtools['hgcmd']inrestricted.split()self.record=Falsekwmaps=self.ui.configitems('keywordmaps')ifkwmaps:# override default templatesself.templates=dict((k,templater.parsestring(v,False))fork,vinkwmaps)else:self.templates=_defaultkwmaps(self.ui)@util.propertycachedefescape(self):'''Returns bar-separated and escaped keywords.'''return'|'.join(map(re.escape,self.templates.keys()))@util.propertycachedefrekw(self):'''Returns regex for unexpanded keywords.'''returnre.compile(r'\$(%s)\$'%self.escape)@util.propertycachedefrekwexp(self):'''Returns regex for expanded keywords.'''returnre.compile(r'\$(%s): [^$\n\r]*? \$'%self.escape)defsubstitute(self,data,path,ctx,subfunc):'''Replaces keywords in data with expanded template.'''defkwsub(mobj):kw=mobj.group(1)ct=cmdutil.changeset_templater(self.ui,self.repo,False,None,'',False)ct.use_template(self.templates[kw])self.ui.pushbuffer()ct.show(ctx,root=self.repo.root,file=path)ekw=templatefilters.firstline(self.ui.popbuffer())return'$%s: %s $'%(kw,ekw)returnsubfunc(kwsub,data)deflinkctx(self,path,fileid):'''Similar to filelog.linkrev, but returns a changectx.'''returnself.repo.filectx(path,fileid=fileid).changectx()defexpand(self,path,node,data):'''Returns data with keywords expanded.'''ifnotself.restrictandself.match(path)andnotutil.binary(data):ctx=self.linkctx(path,node)returnself.substitute(data,path,ctx,self.rekw.sub)returndatadefiskwfile(self,cand,ctx):'''Returns subset of candidates which are configured for keyword expansion but are not symbolic links.'''return[fforfincandifself.match(f)andnot'l'inctx.flags(f)]defoverwrite(self,ctx,candidates,lookup,expand,rekw=False):'''Overwrites selected files expanding/shrinking keywords.'''ifself.restrictorlookuporself.record:# exclude kw_copycandidates=self.iskwfile(candidates,ctx)ifnotcandidates:returnkwcmd=self.restrictandlookup# kwexpand/kwshrinkifself.restrictorexpandandlookup:mf=ctx.manifest()ifself.restrictorrekw:re_kw=self.rekwelse:re_kw=self.rekwexpifexpand:msg=_('overwriting %s expanding keywords\n')else:msg=_('overwriting %s shrinking keywords\n')forfincandidates:ifself.restrict:data=self.repo.file(f).read(mf[f])else:data=self.repo.wread(f)ifutil.binary(data):continueifexpand:iflookup:ctx=self.linkctx(f,mf[f])data,found=self.substitute(data,f,ctx,re_kw.subn)elifself.restrict:found=re_kw.search(data)else:data,found=_shrinktext(data,re_kw.subn)iffound:self.ui.note(msg%f)fp=self.repo.wopener(f,"wb",atomictemp=True)fp.write(data)fp.close()ifkwcmd:self.repo.dirstate.normal(f)elifself.record:self.repo.dirstate.normallookup(f)defshrink(self,fname,text):'''Returns text with all keyword substitutions removed.'''ifself.match(fname)andnotutil.binary(text):return_shrinktext(text,self.rekwexp.sub)returntextdefshrinklines(self,fname,lines):'''Returns lines with keyword substitutions removed.'''ifself.match(fname):text=''.join(lines)ifnotutil.binary(text):return_shrinktext(text,self.rekwexp.sub).splitlines(True)returnlinesdefwread(self,fname,data):'''If in restricted mode returns data read from wdir with keyword substitutions removed.'''ifself.restrict:returnself.shrink(fname,data)returndataclasskwfilelog(filelog.filelog):''' Subclass of filelog to hook into its read, add, cmp methods. Keywords are "stored" unexpanded, and processed on reading. '''def__init__(self,opener,kwt,path):super(kwfilelog,self).__init__(opener,path)self.kwt=kwtself.path=pathdefread(self,node):'''Expands keywords when reading filelog.'''data=super(kwfilelog,self).read(node)ifself.renamed(node):returndatareturnself.kwt.expand(self.path,node,data)defadd(self,text,meta,tr,link,p1=None,p2=None):'''Removes keyword substitutions when adding to filelog.'''text=self.kwt.shrink(self.path,text)returnsuper(kwfilelog,self).add(text,meta,tr,link,p1,p2)defcmp(self,node,text):'''Removes keyword substitutions for comparison.'''text=self.kwt.shrink(self.path,text)returnsuper(kwfilelog,self).cmp(node,text)def_status(ui,repo,wctx,kwt,*pats,**opts):'''Bails out if [keyword] configuration is not active. Returns status of working directory.'''ifkwt:returnrepo.status(match=scmutil.match(wctx,pats,opts),clean=True,unknown=opts.get('unknown')oropts.get('all'))ifui.configitems('keyword'):raiseutil.Abort(_('[keyword] patterns cannot match'))raiseutil.Abort(_('no [keyword] patterns configured'))def_kwfwrite(ui,repo,expand,*pats,**opts):'''Selects files and passes them to kwtemplater.overwrite.'''wctx=repo[None]iflen(wctx.parents())>1:raiseutil.Abort(_('outstanding uncommitted merge'))kwt=kwtools['templater']wlock=repo.wlock()try:status=_status(ui,repo,wctx,kwt,*pats,**opts)modified,added,removed,deleted,unknown,ignored,clean=statusifmodifiedoraddedorremovedordeleted:raiseutil.Abort(_('outstanding uncommitted changes'))kwt.overwrite(wctx,clean,True,expand)finally:wlock.release()@command('kwdemo',[('d','default',None,_('show default keyword template maps')),('f','rcfile','',_('read maps from rcfile'),_('FILE'))],_('hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]...'))defdemo(ui,repo,*args,**opts):'''print [keywordmaps] configuration and an expansion example Show current, custom, or default keyword template maps and their expansions. Extend the current configuration by specifying maps as arguments and using -f/--rcfile to source an external hgrc file. Use -d/--default to disable current configuration. See :hg:`help templates` for information on templates and filters. '''defdemoitems(section,items):ui.write('[%s]\n'%section)fork,vinsorted(items):ui.write('%s = %s\n'%(k,v))fn='demo.txt'tmpdir=tempfile.mkdtemp('','kwdemo.')ui.note(_('creating temporary repository at %s\n')%tmpdir)repo=localrepo.localrepository(ui,tmpdir,True)ui.setconfig('keyword',fn,'')svn=ui.configbool('keywordset','svn')# explicitly set keywordset for demo outputui.setconfig('keywordset','svn',svn)uikwmaps=ui.configitems('keywordmaps')ifargsoropts.get('rcfile'):ui.status(_('\n\tconfiguration using custom keyword template maps\n'))ifuikwmaps:ui.status(_('\textending current template maps\n'))ifopts.get('default')ornotuikwmaps:ifsvn:ui.status(_('\toverriding default svn keywordset\n'))else:ui.status(_('\toverriding default cvs keywordset\n'))ifopts.get('rcfile'):ui.readconfig(opts.get('rcfile'))ifargs:# simulate hgrc parsingrcmaps=['[keywordmaps]\n']+[a+'\n'forainargs]fp=repo.opener('hgrc','w')fp.writelines(rcmaps)fp.close()ui.readconfig(repo.join('hgrc'))kwmaps=dict(ui.configitems('keywordmaps'))elifopts.get('default'):ifsvn:ui.status(_('\n\tconfiguration using default svn keywordset\n'))else:ui.status(_('\n\tconfiguration using default cvs keywordset\n'))kwmaps=_defaultkwmaps(ui)ifuikwmaps:ui.status(_('\tdisabling current template maps\n'))fork,vinkwmaps.iteritems():ui.setconfig('keywordmaps',k,v)else:ui.status(_('\n\tconfiguration using current keyword template maps\n'))ifuikwmaps:kwmaps=dict(uikwmaps)else:kwmaps=_defaultkwmaps(ui)uisetup(ui)reposetup(ui,repo)ui.write('[extensions]\nkeyword =\n')demoitems('keyword',ui.configitems('keyword'))demoitems('keywordset',ui.configitems('keywordset'))demoitems('keywordmaps',kwmaps.iteritems())keywords='$'+'$\n$'.join(sorted(kwmaps.keys()))+'$\n'repo.wopener.write(fn,keywords)repo[None].add([fn])ui.note(_('\nkeywords written to %s:\n')%fn)ui.note(keywords)repo.dirstate.setbranch('demobranch')forname,cmdinui.configitems('hooks'):ifname.split('.',1)[0].find('commit')>-1:repo.ui.setconfig('hooks',name,'')msg=_('hg keyword configuration and expansion example')ui.note("hg ci -m '%s'\n"%msg)repo.commit(text=msg)ui.status(_('\n\tkeywords expanded\n'))ui.write(repo.wread(fn))shutil.rmtree(tmpdir,ignore_errors=True)@command('kwexpand',commands.walkopts,_('hg kwexpand [OPTION]... [FILE]...'))defexpand(ui,repo,*pats,**opts):'''expand keywords in the 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)@command('kwfiles',[('A','all',None,_('show keyword status flags of all files')),('i','ignore',None,_('show files excluded from expansion')),('u','unknown',None,_('only show unknown (not tracked) files')),]+commands.walkopts,_('hg kwfiles [OPTION]... [FILE]...'))deffiles(ui,repo,*pats,**opts):'''show files configured for keyword expansion List which files in the working directory are matched by the [keyword] configuration patterns. Useful to prevent inadvertent keyword expansion and to speed up execution by including only files that are actual candidates for expansion. See :hg:`help keyword` on how to construct patterns both for inclusion and exclusion of files. With -A/--all and -v/--verbose the codes used to show the status of files are:: K = keyword expansion candidate k = keyword expansion candidate (not tracked) I = ignored i = ignored (not tracked) '''kwt=kwtools['templater']wctx=repo[None]status=_status(ui,repo,wctx,kwt,*pats,**opts)cwd=patsandrepo.getcwd()or''modified,added,removed,deleted,unknown,ignored,clean=statusfiles=[]ifnotopts.get('unknown')oropts.get('all'):files=sorted(modified+added+clean)kwfiles=kwt.iskwfile(files,wctx)kwdeleted=kwt.iskwfile(deleted,wctx)kwunknown=kwt.iskwfile(unknown,wctx)ifnotopts.get('ignore')oropts.get('all'):showfiles=kwfiles,kwdeleted,kwunknownelse:showfiles=[],[],[]ifopts.get('all')oropts.get('ignore'):showfiles+=([fforfinfilesiffnotinkwfiles],[fforfinunknowniffnotinkwunknown])kwlabels='enabled deleted enabledunknown ignored ignoredunknown'.split()kwstates=zip('K!kIi',showfiles,kwlabels)forchar,filenames,kwstateinkwstates:fmt=(opts.get('all')orui.verbose)and'%s%%s\n'%charor'%s\n'forfinfilenames:ui.write(fmt%repo.pathto(f,cwd),label='kwfiles.'+kwstate)@command('kwshrink',commands.walkopts,_('hg kwshrink [OPTION]... [FILE]...'))defshrink(ui,repo,*pats,**opts):'''revert expanded keywords in the working directory Must be run before changing/disabling active keywords. kwshrink refuses to run if given files contain local changes. '''# 3rd argument sets expansion to False_kwfwrite(ui,repo,False,*pats,**opts)defuisetup(ui):''' Monkeypatches dispatch._parse to retrieve user command.'''defkwdispatch_parse(orig,ui,args):'''Monkeypatch dispatch._parse to obtain running hg command.'''cmd,func,args,options,cmdoptions=orig(ui,args)kwtools['hgcmd']=cmdreturncmd,func,args,options,cmdoptionsextensions.wrapfunction(dispatch,'_parse',kwdispatch_parse)defreposetup(ui,repo):'''Sets up repo as kwrepo for keyword substitution. Overrides file method to return kwfilelog instead of filelog if file matches user configuration. Wraps commit to overwrite configured files with updated keyword substitutions. Monkeypatches patch and webcommands.'''try:if(notrepo.local()orkwtools['hgcmd']innokwcommands.split()or'.hg'inutil.splitpath(repo.root)orrepo._url.startswith('bundle:')):returnexceptAttributeError:passinc,exc=[],['.hg*']forpat,optinui.configitems('keyword'):ifopt!='ignore':inc.append(pat)else:exc.append(pat)ifnotinc:returnkwtools['templater']=kwt=kwtemplater(ui,repo,inc,exc)classkwrepo(repo.__class__):deffile(self,f):iff[0]=='/':f=f[1:]returnkwfilelog(self.sopener,kwt,f)defwread(self,filename):data=super(kwrepo,self).wread(filename)returnkwt.wread(filename,data)defcommit(self,*args,**opts):# use custom commitctx for user commands# other extensions can still wrap repo.commitctx directlyself.commitctx=self.kwcommitctxtry:returnsuper(kwrepo,self).commit(*args,**opts)finally:delself.commitctxdefkwcommitctx(self,ctx,error=False):n=super(kwrepo,self).commitctx(ctx,error)# no lock needed, only called from repo.commit() which already locksifnotkwt.record:restrict=kwt.restrictkwt.restrict=Truekwt.overwrite(self[n],sorted(ctx.added()+ctx.modified()),False,True)kwt.restrict=restrictreturnndefrollback(self,dryrun=False,force=False):wlock=self.wlock()try:ifnotdryrun:changed=self['.'].files()ret=super(kwrepo,self).rollback(dryrun,force)ifnotdryrun:ctx=self['.']modified,added=_preselect(self[None].status(),changed)kwt.overwrite(ctx,modified,True,True)kwt.overwrite(ctx,added,True,False)returnretfinally:wlock.release()# monkeypatchesdefkwpatchfile_init(orig,self,ui,gp,backend,store,eolmode=None):'''Monkeypatch/wrap patch.patchfile.__init__ to avoid rejects or conflicts due to expanded keywords in working dir.'''orig(self,ui,gp,backend,store,eolmode)# shrink keywords read from working dirself.lines=kwt.shrinklines(self.fname,self.lines)defkw_diff(orig,repo,node1=None,node2=None,match=None,changes=None,opts=None,prefix=''):'''Monkeypatch patch.diff to avoid expansion.'''kwt.restrict=Truereturnorig(repo,node1,node2,match,changes,opts,prefix)defkwweb_skip(orig,web,req,tmpl):'''Wraps webcommands.x turning off keyword expansion.'''kwt.match=util.neverreturnorig(web,req,tmpl)defkw_copy(orig,ui,repo,pats,opts,rename=False):'''Wraps cmdutil.copy so that copy/rename destinations do not contain expanded keywords. Note that the source of a regular file destination may also be a symlink: hg cp sym x -> x is symlink cp sym x; hg cp -A sym x -> x is file (maybe expanded keywords) For the latter we have to follow the symlink to find out whether its target is configured for expansion and we therefore must unexpand the keywords in the destination.'''orig(ui,repo,pats,opts,rename)ifopts.get('dry_run'):returnwctx=repo[None]cwd=repo.getcwd()defhaskwsource(dest):'''Returns true if dest is a regular file and configured for expansion or a symlink which points to a file configured for expansion. '''source=repo.dirstate.copied(dest)if'l'inwctx.flags(source):source=scmutil.canonpath(repo.root,cwd,os.path.realpath(source))returnkwt.match(source)candidates=[fforfinrepo.dirstate.copies()ifnot'l'inwctx.flags(f)andhaskwsource(f)]kwt.overwrite(wctx,candidates,False,False)defkw_dorecord(orig,ui,repo,commitfunc,*pats,**opts):'''Wraps record.dorecord expanding keywords after recording.'''wlock=repo.wlock()try:# record returns 0 even when nothing has changed# therefore compare nodes before and afterkwt.record=Truectx=repo['.']wstatus=repo[None].status()ret=orig(ui,repo,commitfunc,*pats,**opts)recctx=repo['.']ifctx!=recctx:modified,added=_preselect(wstatus,recctx.files())kwt.restrict=Falsekwt.overwrite(recctx,modified,False,True)kwt.overwrite(recctx,added,False,True,True)kwt.restrict=Truereturnretfinally:wlock.release()defkwfilectx_cmp(orig,self,fctx):# keyword affects data size, comparing wdir and filelog size does# not make senseif(fctx._filerevisNoneand(self._repo._encodefilterpatsorkwt.match(fctx.path())andnot'l'infctx.flags()orself.size()-4==fctx.size())orself.size()==fctx.size()):returnself._filelog.cmp(self._filenode,fctx.data())returnTrueextensions.wrapfunction(context.filectx,'cmp',kwfilectx_cmp)extensions.wrapfunction(patch.patchfile,'__init__',kwpatchfile_init)extensions.wrapfunction(patch,'diff',kw_diff)extensions.wrapfunction(cmdutil,'copy',kw_copy)forcin'annotate changeset rev filediff diff'.split():extensions.wrapfunction(webcommands,c,kwweb_skip)fornameinrecordextensions.split():try:record=extensions.find(name)extensions.wrapfunction(record,'dorecord',kw_dorecord)exceptKeyError:passrepo.__class__=kwrepo