tests: don't match blank output lines as regexes in unified tests
Currently, the following unified test will pass:
$ echo foo
A blank output line (a line containing just two spaces) will match any
output.
The patch modifies the unified test runner to ignore empty strings
strings when do regular expression matching.
[ 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 = TrueNOTE: the more specific you are in your filename patterns the less youlose 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 config changes.Before changing/disabling active keywords, run :hg:`kwshrink` to avoidthe risk of inadvertently storing expanded keywords in the changehistory.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,cmdutil,dispatch,filelog,revlog,extensionsfrommercurialimportpatch,localrepo,templater,templatefilters,util,matchfrommercurial.hgwebimportwebcommandsfrommercurial.i18nimport_importre,shutil,tempfilecommands.optionalrepo+=' kwdemo'# hg commands that do not act on keywordsnokwcommands=('add addremove annotate bundle copy export grep incoming init'' log outgoing push rename rollback 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 record qrecord resolve transplant'# commands using dorecordrecordcommands='record qrecord'# names of extensions using dorecordrecordextensions='record'# date like in cvs' $Dateutcdate=lambdax:util.datestr((x[0],0),'%Y/%m/%d %H:%M:%S')# date like in svn's $Datesvnisodate=lambdax:util.datestr(x,'%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')# date like in svn's $Idsvnutcdate=lambdax:util.datestr((x[0],0),'%Y-%m-%d %H:%M:%SZ')# 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')])returntemplatesclasskwtemplater(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=kwtools['hgcmd']inrecordcommands.split()kwmaps=self.ui.configitems('keywordmaps')ifkwmaps:# override default templatesself.templates=dict((k,templater.parsestring(v,False))fork,vinkwmaps)else:self.templates=_defaultkwmaps(self.ui)escaped=map(re.escape,self.templates.keys())kwpat=r'\$(%s)(: [^$\n\r]*? )??\$'%'|'.join(escaped)self.re_kw=re.compile(kwpat)templatefilters.filters.update({'utcdate':utcdate,'svnisodate':svnisodate,'svnutcdate':svnutcdate})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)defexpand(self,path,node,data):'''Returns data with keywords expanded.'''ifnotself.restrictandself.match(path)andnotutil.binary(data):ctx=self.repo.filectx(path,fileid=node).changectx()returnself.substitute(data,path,ctx,self.re_kw.sub)returndatadefiskwfile(self,path,flagfunc):'''Returns true if path matches [keyword] pattern and is not a symbolic link. Caveat: localrepository._link fails on Windows.'''returnself.match(path)andnot'l'inflagfunc(path)defoverwrite(self,ctx,candidates,iswctx,expand):'''Overwrites selected files expanding/shrinking keywords.'''ifself.record:candidates=[fforfinctx.files()iffinctx]candidates=[fforfincandidatesifself.iskwfile(f,ctx.flags)]ifcandidates:self.restrict=True# do not expand when readingmf=ctx.manifest()msg=(expandand_('overwriting %s expanding keywords\n')or_('overwriting %s shrinking keywords\n'))forfincandidates:ifnotself.record:data=self.repo.file(f).read(mf[f])else:data=self.repo.wread(f)ifutil.binary(data):continueifexpand:ifiswctx:ctx=self.repo.filectx(f,fileid=mf[f]).changectx()data,found=self.substitute(data,f,ctx,self.re_kw.subn)else:found=self.re_kw.search(data)iffound:self.ui.note(msg%f)self.repo.wwrite(f,data,mf.flags(f))ifiswctx:self.repo.dirstate.normal(f)elifself.record:self.repo.dirstate.normallookup(f)self.restrict=Falsedefshrinktext(self,text):'''Unconditionally removes all keyword substitutions from text.'''returnself.re_kw.sub(r'$\1$',text)defshrink(self,fname,text):'''Returns text with all keyword substitutions removed.'''ifself.match(fname)andnotutil.binary(text):returnself.shrinktext(text)returntextdefshrinklines(self,fname,lines):'''Returns lines with keyword substitutions removed.'''ifself.match(fname):text=''.join(lines)ifnotutil.binary(text):returnself.shrinktext(text).splitlines(True)returnlinesdefwread(self,fname,data):'''If in restricted mode returns data read from wdir with keyword substitutions removed.'''returnself.restrictandself.shrink(fname,data)ordataclasskwfilelog(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)returnself.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)ifself.renamed(node):t2=super(kwfilelog,self).read(node)returnt2!=textreturnrevlog.revlog.cmp(self,node,text)def_status(ui,repo,kwt,*pats,**opts):'''Bails out if [keyword] configuration is not active. Returns status of working directory.'''ifkwt:returnrepo.status(match=cmdutil.match(repo,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,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()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,'')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:ui.status(_('\toverriding default template maps\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'):ui.status(_('\n\tconfiguration using default keyword template maps\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'))kwmaps=dict(uikwmaps)or_defaultkwmaps(ui)uisetup(ui)reposetup(ui,repo)ui.write('[extensions]\nkeyword =\n')demoitems('keyword',ui.configitems('keyword'))demoitems('keywordmaps',kwmaps.iteritems())keywords='$'+'$\n$'.join(sorted(kwmaps.keys()))+'$\n'repo.wopener(fn,'w').write(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)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)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']status=_status(ui,repo,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)wctx=repo[None]kwfiles=[fforfinfilesifkwt.iskwfile(f,wctx.flags)]kwunknown=[fforfinunknownifkwt.iskwfile(f,wctx.flags)]ifnotopts.get('ignore')oropts.get('all'):showfiles=kwfiles,kwunknownelse:showfiles=[],[]ifopts.get('all')oropts.get('ignore'):showfiles+=([fforfinfilesiffnotinkwfiles],[fforfinunknowniffnotinkwunknown])forchar,filenamesinzip('KkIi',showfiles):fmt=(opts.get('all')orui.verbose)and'%s%%s\n'%charor'%s\n'forfinfilenames:ui.write(fmt%repo.pathto(f,cwd))defshrink(ui,repo,*pats,**opts):'''revert expanded keywords in the 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)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:kwt.overwrite(self[n],sorted(ctx.added()+ctx.modified()),False,True)returnn# monkeypatchesdefkwpatchfile_init(orig,self,ui,fname,opener,missing=False,eolmode=None):'''Monkeypatch/wrap patch.patchfile.__init__ to avoid rejects or conflicts due to expanded keywords in working dir.'''orig(self,ui,fname,opener,missing,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 except when comparing against working dir.'''ifnode2isnotNone:kwt.match=util.neverelifnode1isnotNoneandnode1!=repo['.'].node():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_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 afterctx=repo['.']ret=orig(ui,repo,commitfunc,*pats,**opts)recordctx=repo['.']ifctx!=recordctx:kwt.overwrite(recordctx,None,False,True)returnretfinally:wlock.release()repo.__class__=kwrepoextensions.wrapfunction(patch.patchfile,'__init__',kwpatchfile_init)ifnotkwt.restrict:extensions.wrapfunction(patch,'diff',kw_diff)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:passcmdtable={'kwdemo':(demo,[('d','default',None,_('show default keyword template maps')),('f','rcfile','',_('read maps from rcfile'),_('FILE'))],_('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','unknown',None,_('only show unknown (not tracked) files')),]+commands.walkopts,_('hg kwfiles [OPTION]... [FILE]...')),'kwshrink':(shrink,commands.walkopts,_('hg kwshrink [OPTION]... [FILE]...')),}