Disable expansion in mq directory; add test for qcommit
There might still be problems with qsave copied patch queues.
# 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 repositoriesThis 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 inthe change history. The mechanism can be regarded as a conveniencefor the current user or for archive distribution.Configuration is done in the [keyword] and [keywordmaps] sectionsof hgrc files.Example: [keyword] # expand keywords in every python file except those matching "x*" **.py = x* = ignoreNote: the more specific you are in your filename patterns the less you lose speed in huge repos.For [keywordmaps] template mapping and expansion demonstration andcontrol run "hg kwdemo".An additional date template filter {date|utcdate} is provided.The default template mappings (view with "hg kwdemo -d") can be replacedwith 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 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 awarethat keywords cannot be updated. Again, run "hg kwexpand" on the files inquestion 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.'''frommercurialimportcommands,cmdutil,context,filelog,localrepofrommercurialimportpatch,revlog,templater,templatefilters,utilfrommercurial.nodeimport*frommercurial.i18nimport_importre,shutil,tempfile,timecommands.optionalrepo+=' kwdemo'defutcdate(date):'''Returns hgdate in cvs-like UTC format.'''returntime.strftime('%Y/%m/%d %H:%M:%S',time.gmtime(date[0]))classkwtemplater(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=uiself.repo=repoself.matcher=util.matcher(repo.root,inc=inc,exc=exc)[1]self.ctx=Nonekwmaps=self.ui.configitems('keywordmaps')ifkwmaps:# override default templateskwmaps=[(k,templater.parsestring(v,quoted=False))for(k,v)inkwmaps]self.templates=dict(kwmaps)escaped=map(re.escape,self.templates.keys())kwpat=r'\$(%s)(: [^$\n\r]*? )??\$'%'|'.join(escaped)self.re_kw=re.compile(kwpat)templatefilters.filters['utcdate']=utcdateself.ct=cmdutil.changeset_templater(self.ui,self.repo,False,'',False)defsubstitute(self,path,data,node,subfunc):'''Obtains file's changenode if node not given, and calls given substitution function.'''ifnodeisNone:# kwrepo.wwrite except when overwriting on commitifself.ctxisNone: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()exceptrevlog.LookupError:# eg: convertreturnsubfunc==self.re_kw.subanddataor(data,None)elifsubfunc==self.re_kw.sub:# hg kwcat using kwfilelog.readc=context.filectx(self.repo,path,fileid=node)node=c.node()defkwsub(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=templatefilters.firstline(self.ui.popbuffer())return'$%s: %s $'%(kw,ekw)returnsubfunc(kwsub,data)defexpand(self,path,data,node):'''Returns data with keywords expanded.'''ifutil.binary(data):returndatareturnself.substitute(path,data,node,self.re_kw.sub)defprocess(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.'''ifutil.binary(data):returndata,Noneifexpand:self.ctx=ctxreturnself.substitute(path,data,node,self.re_kw.subn)returnself.re_kw.subn(r'$\1$',data)defshrink(self,data):'''Returns text with all keyword substitutions removed.'''ifutil.binary(data):returndatareturnself.re_kw.sub(r'$\1$',data)classkwfilelog(filelog.filelog):''' Subclass of filelog to hook into its read method for kwcat. '''def__init__(self,opener,path,kwt):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,data,node)# store original patch.patchfile.__init___patchfile_init=patch.patchfile.__init__def_iskwfile(f,link,kwt):returnnotlink(f)andkwt.matcher(f)def_status(ui,repo,*pats,**opts):'''Bails out if [keyword] configuration is not active. Returns status of working directory.'''ifhasattr(repo,'_kwt'):files,match,anypats=cmdutil.matchpats(repo,pats,opts)returnrepo.status(files=files,match=match,list_clean=True)ifui.configitems('keyword'):raiseutil.Abort(_('[keyword] patterns cannot match'))raiseutil.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()ifnodeisnotNone:# commitfiles=[fforfinctx.files()iffinmf]notify=ui.debugelse:# kwexpand/kwshrinknotify=ui.notecandidates=[fforfinfilesif_iskwfile(f,mf.linkf,repo._kwt)]ifcandidates:candidates.sort()action=expandand'expanding'or'shrinking'forfincandidates:data,kwfound=repo._wreadkwct(f,expand,ctx,node)ifkwfound:notify(_('overwriting %s%s keywords\n')%(f,action))repo.wwrite(f,data,mf.flags(f),overwrite=True)repo.dirstate.normal(f)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=statusifmodifiedoraddedorremovedordeleted:raiseutil.Abort(_('outstanding uncommitted changes in given files'))wlock=lock=Nonetry:wlock=repo.wlock()lock=repo.lock()_overwrite(ui,repo,expand=expand,files=clean)finally:delwlock,lockdefcat(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 '''try:repo.file=repo._kwfileexceptAttributeError:passcommands.cat(ui,repo,file1,*pats,**opts)defdemo(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. '''defdemostatus(stat):ui.status(_('\n\t%s\n')%stat)defdemoitems(section,items):ui.write('[%s]\n'%section)fork,vinitems: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,'')ifargsoropts.get('rcfile'):kwstatus='custom'ifopts.get('rcfile'):ui.readconfig(opts.get('rcfile'))ifopts.get('default'):kwstatus='default'kwmaps=kwtemplater.templatesifui.configitems('keywordmaps'):# override maps from optional rcfilefork,vinkwmaps.iteritems():ui.setconfig('keywordmaps',k,v)elifargs:# simulate hgrc parsingrcmaps=['[keywordmaps]\n']+[a+'\n'forainargs]fp=repo.opener('hgrc','w')fp.writelines(rcmaps)fp.close()ui.readconfig(repo.join('hgrc'))ifnotopts.get('default'):kwmaps=dict(ui.configitems('keywordmaps'))orkwtemplater.templatesreposetup(ui,repo)fork,vinui.configitems('extensions'):ifk.endswith('keyword'):extension='%s = %s'%(k,v)breakdemostatus('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 verbosequiet=ui.quietui.quiet=notui.verbosecommands.branch(ui,repo,branchname)ui.quiet=quietforname,cmdinui.configitems('hooks'):ifname.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.verboseand' in %s'%pathor''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)defexpand(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)deffiles(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=statusfiles=modified+added+cleanifopts.get('untracked'):files+=unknownfiles.sort()kwfiles=[fforfinfilesif_iskwfile(f,repo._link,repo._kwt)]cwd=patsandrepo.getcwd()or''kwfstats=notopts.get('ignore')and(('K',kwfiles),)or()ifopts.get('all')oropts.get('ignore'):kwfstats+=(('I',[fforfinfilesiffnotinkwfiles]),)forchar,filenamesinkwfstats:format=(opts.get('all')orui.verbose)and'%s%%s\n'%charor'%s\n'forfinfilenames:ui.write(format%repo.pathto(f,cwd))defshrink(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)defreposetup(ui,repo):ifnotrepo.local()orrepo.root.endswith('/.hg/patches'):returninc,exc=[],['.hgtags','.hg_archival.txt']forpat,optinui.configitems('keyword'):ifopt!='ignore':inc.append(pat)else:exc.append(pat)ifnotinc:returnclasskwrepo(repo.__class__):def_kwfile(self,f):'''Returns filelog expanding keywords on read (for kwcat).'''iff[0]=='/':f=f[1:]ifself._kwt.matcher(f):returnkwfilelog(self.sopener,f,self._kwt)returnfilelog.filelog(self.sopener,f)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)returnself._kwt.process(filename,data,expand,ctx,node)defwread(self,filename):data=super(kwrepo,self).wread(filename)ifself._kwt.matcher(filename):returnself._kwt.shrink(data)returndatadefwwrite(self,filename,data,flags,overwrite=False):ifnotoverwriteandself._kwt.matcher(filename):data=self._kwt.expand(filename,data,None)super(kwrepo,self).wwrite(filename,data,flags)defwwritedata(self,filename,data):ifself._kwt.matcher(filename):data=self._kwt.expand(filename,data,None)returnsuper(kwrepo,self).wwritedata(filename,data)defcommit(self,files=None,text='',user=None,date=None,match=util.always,force=False,force_editor=False,p1=None,p2=None,extra={},empty_ok=False):wlock=lock=None_p1=_p2=Nonetry:wlock=self.wlock()lock=self.lock()# store and postpone commit hookscommithooks={}forname,cmdinui.configitems('hooks'):ifname.split('.',1)[0]=='commit':commithooks[name]=cmdui.setconfig('hooks',name,None)ifcommithooks:# store parents for commit hook environmentifp1isNone:_p1,_p2=repo.dirstate.parents()else:_p1,_p2=p1,p2ornullid_p1=hex(_p1)if_p2==nullid:_p2=''else:_p2=hex(_p2)node=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)# restore commit hooksforname,cmdincommithooks.iteritems():ui.setconfig('hooks',name,cmd)ifnodeisnotNone:_overwrite(ui,self,node=node)repo.hook('commit',node=node,parent1=_p1,parent2=_p2)returnnodefinally:delwlock,lockkwt=kwrepo._kwt=kwtemplater(ui,repo,inc,exc)defkwpatchfile_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)ifkwt.matcher(self.fname):# shrink keywords read from working dirkwshrunk=kwt.shrink(''.join(self.lines))self.lines=kwshrunk.splitlines(True)repo.__class__=kwrepopatch.patchfile.__init__=kwpatchfile_initcmdtable={'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]...')),}