(0.9.2compat) use different names for web methods
Makes it clearer that these are not redefinitions of the same
methods.
# 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.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.'''frommercurialimportcommands,cmdutil,context,fancyoptsfrommercurialimportfilelog,localrepo,revlog,templater,utilfrommercurial.nodeimport*frommercurial.i18nimportgettextas_importgetopt,os,re,shutil,tempfile,timecommands.optionalrepo+=' kwdemo'# hg commands that do not act on keywordsnokwcommands=('add addremove bundle copy export grep identify incoming init'' log outgoing push remove rename rollback tip convert email')# hg commands that trigger expansion only when writing to working dir,# not when reading filelog, and unexpand when reading from working dirrestricted='diff1 record qfold qimport qnew qpush qrefresh qrecord'defutcdate(date):'''Returns hgdate in cvs-like UTC format.'''returntime.strftime('%Y/%m/%d %H:%M:%S',time.gmtime(date[0]))_kwtemplater=_cmd=_cmdoptions=None# backwards compatibility hackstry:# cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78frommercurialimportdispatch_dispatch_parse=dispatch._parseexceptImportError:try:# commands.parse moves to cmdutil.parse in 0c61124ad877_dispatch_parse=cmdutil.parseexceptAttributeError:_dispatch_parse=commands.parsedef_kwdispatch_parse(ui,args):'''Monkeypatch dispatch._parse to obtain current command and command options (global _cmd, _cmdoptions).'''global_cmd,_cmdoptions_cmd,func,args,options,_cmdoptions=_dispatch_parse(ui,args)return_cmd,func,args,options,_cmdoptionstry:setattr(dispatch,'_parse',_kwdispatch_parse)except(NameError,ImportError):# 0.9.4 needs ImportErrorifhasattr(cmdutil,'parse'):cmdutil.parse=_kwdispatch_parseelse:commands.parse=_kwdispatch_parsetry:# avoid spurious rejects if patchfile is availablefrommercurial.patchimportpatchfile_patchfile_init=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.'''try:_patchfile_init(self,ui,fname,missing=missing)exceptTypeError:# "missing" arg added in e90e72c6b4c7_patchfile_init(self,ui,fname)if_kwtemplater.matcher(self.fname):# shrink keywords read from working dirkwshrunk=_kwtemplater.shrink(''.join(self.lines))self.lines=kwshrunk.splitlines(True)exceptImportError:passtry:frommercurial.hgwebimportwebcommandsdef_kwweb_changeset(web,req,tmpl):'''Wraps webcommands.changeset turning off keyword expansion.'''try:_kwtemplater.matcher=util.neverexceptAttributeError:passreturnweb.changeset(tmpl,web.changectx(req))def_kwweb_filediff(web,req,tmpl):'''Wraps webcommands.filediff turning off keyword expansion.'''try:_kwtemplater.matcher=util.neverexceptAttributeError:passreturnweb.filediff(tmpl,web.filectx(req))webcommands.changeset=webcommands.rev=_kwweb_changesetwebcommands.filediff=webcommands.diff=_kwweb_filediffexceptImportError:frommercurial.hgweb.hgweb_modimporthgwebdef_kwweb_do_changeset(self,req):try:_kwtemplater.matcher=util.neverexceptAttributeError:passreq.write(self.changeset(self.changectx(req)))def_kwweb_do_filediff(self,req):try:_kwtemplater.matcher=util.neverexceptAttributeError:passreq.write(self.filediff(self.filectx(req)))hgweb.do_changeset=hgweb.do_rev=_kwweb_do_changesethgweb.do_filediff=hgweb.do_diff=_kwweb_do_filedifftry:# templatefilters module introduced in 9f1e6ab76069frommercurialimporttemplatefilterstemplate_filters=templatefilters.filterstemplate_firstline=templatefilters.firstlineexceptImportError:template_filters=templater.common_filterstemplate_firstline=templater.firstlinedef_wwrite(repo,f,data,mf):'''Makes repo.wwrite backwards compatible.'''# 656e06eebda7 removed file descriptor argument# 67982d3ee76c added flags argumenttry:repo.wwrite(f,data,mf.flags(f))except(AttributeError,TypeError):repo.wwrite(f,data)def_normal(repo,files):'''Backwards compatible repo.dirstate.normal/update.'''# 6fd953d5faea introduced dirstate.normal()try:forfinfiles:repo.dirstate.normal(f)exceptAttributeError:repo.dirstate.update(files,'n')def_pathto(repo,f,cwd=None):'''kwfiles behaves similar to status, using pathto since 78b6add1f966.'''try:returnrepo.pathto(f,cwd)exceptAttributeError:returnf# commands.parse/cmdutil.parse returned nothing for# "hg diff --rev" before 88803a69b24a due to bug in fancyoptsdef_fancyopts(args,options,state):'''Fixed fancyopts from a9b7e425674f.'''namelist=[]shortlist=''argmap={}defmap={}forshort,name,default,commentinoptions:# convert opts to getopt formatoname=namename=name.replace('-','_')argmap['-'+short]=argmap['--'+oname]=namedefmap[name]=default# copy defaults to stateifisinstance(default,list):state[name]=default[:]elifcallable(default):print"whoa",name,defaultstate[name]=Noneelse:state[name]=default# does it take a parameter?ifnot(defaultisNoneordefaultisTrueordefaultisFalse):ifshort:short+=':'ifoname:oname+='='ifshort:shortlist+=shortifname:namelist.append(oname)# parse argumentsopts,args=getopt.getopt(args,shortlist,namelist)# transfer result to stateforopt,valinopts:name=argmap[opt]t=type(defmap[name])iftistype(fancyopts):state[name]=defmap[name](val)eliftistype(1):state[name]=int(val)eliftistype(''):state[name]=valeliftistype([]):state[name].append(val)eliftistype(None)ortistype(False):state[name]=True# return unparsed argsreturnargsfancyopts.fancyopts=_fancyoptsclasskwtemplater(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,hgcmd):self.ui=uiself.repo=repoself.matcher=util.matcher(repo.root,inc=inc,exc=exc)[1]self.restrict=hgcmdinrestricted.split()self.commitnode=Noneself.path=''kwmaps=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)template_filters['utcdate']=utcdateself.ct=self._changeset_templater()def_changeset_templater(self):'''Backwards compatible cmdutil.changeset_templater.'''# before 1e0b94cfba0e there was an extra "brinfo" argumenttry:returncmdutil.changeset_templater(self.ui,self.repo,False,'',False)exceptTypeError:returncmdutil.changeset_templater(self.ui,self.repo,False,None,'',False)defsubstitute(self,node,data,subfunc):'''Obtains file's changenode if commit node not given, and calls given substitution function.'''ifself.commitnode:fnode=self.commitnodeelse:c=context.filectx(self.repo,self.path,fileid=node)fnode=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=fnode,root=self.repo.root,file=self.path)return'$%s: %s $'%(kw,template_firstline(self.ui.popbuffer()))returnsubfunc(kwsub,data)defexpand(self,node,data):'''Returns data with keywords expanded.'''ifself.restrictorutil.binary(data):returndatareturnself.substitute(node,data,self.re_kw.sub)defprocess(self,node,data,expand):'''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:returnself.substitute(node,data,self.re_kw.subn)returndata,self.re_kw.search(data)defshrink(self,text):'''Returns text with all keyword substitutions removed.'''ifutil.binary(text):returntextreturnself.re_kw.sub(r'$\1$',text)classkwfilelog(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,path):super(kwfilelog,self).__init__(opener,path)_kwtemplater.path=pathdefkwctread(self,node,expand):'''Reads expanding and counting keywords, called from _overwrite.'''data=super(kwfilelog,self).read(node)return_kwtemplater.process(node,data,expand)defread(self,node):'''Expands keywords when reading filelog.'''data=super(kwfilelog,self).read(node)return_kwtemplater.expand(node,data)defadd(self,text,meta,tr,link,p1=None,p2=None):'''Removes keyword substitutions when adding to filelog.'''text=_kwtemplater.shrink(text)returnsuper(kwfilelog,self).add(text,meta,tr,link,p1=p1,p2=p2)defcmp(self,node,text):'''Removes keyword substitutions for comparison.'''text=_kwtemplater.shrink(text)ifself.renamed(node):t2=super(kwfilelog,self).read(node)returnt2!=textreturnrevlog.revlog.cmp(self,node,text)def_iskwfile(f,link):returnnotlink(f)and_kwtemplater.matcher(f)def_status(ui,repo,*pats,**opts):'''Bails out if [keyword] configuration is not active. Returns status of working directory.'''if_kwtemplater: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:# commit_kwtemplater.commitnode=nodefiles=[fforfinctx.files()iffinmf]notify=ui.debugelse:# kwexpand/kwshrinknotify=ui.notecandidates=[fforfinfilesif_iskwfile(f,mf.linkf)]ifcandidates:overwritten=[]candidates.sort()action=expandand'expanding'or'shrinking'forfincandidates:fp=repo.file(f,kwmatch=True)data,kwfound=fp.kwctread(mf[f],expand)ifkwfound:notify(_('overwriting %s%s keywords\n')%(f,action))_wwrite(repo,f,data,mf)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=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,lockdefdemo(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.wread(fn))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()wctx=repo.workingctx()ifhasattr(wctx,'fileflags'):islink=lambdap:'l'inwctx.fileflags(p)else:mf=wctx.manifest()islink=mf.linkfkwfiles=[fforfinfilesif_iskwfile(f,islink)]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%_pathto(repo,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):'''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. This is done for local repos only, and only if there are files configured at all for keyword substitution.'''global_kwtemplaterhgcmd,hgcmdopts=_cmd,_cmdoptionstry:if(notrepo.local()orhgcmdinnokwcommands.split()or'.hg'inrepo.root.split(os.sep)orrepo._url.startswith('bundle:')):returnexceptAttributeError:passinc,exc=[],['.hg*']forpat,optinui.configitems('keyword'):ifopt!='ignore':inc.append(pat)else:exc.append(pat)ifnotinc:returnifhgcmd=='diff':# only expand if comparing against working dirnode1,node2=cmdutil.revpair(repo,hgcmdopts.get('rev'))ifnode2isnotNone:return# shrink if rev is not current nodeifnode1isnotNoneandnode1!=repo.changectx().node():hgcmd='diff1'_kwtemplater=kwtemplater(ui,repo,inc,exc,hgcmd)classkwrepo(repo.__class__):deffile(self,f,kwmatch=False):iff[0]=='/':f=f[1:]ifkwmatchor_kwtemplater.matcher(f):returnkwfilelog(self.sopener,f)returnfilelog.filelog(self.sopener,f)defwread(self,filename):data=super(kwrepo,self).wread(filename)if_kwtemplater.restrictand_kwtemplater.matcher(filename):return_kwtemplater.shrink(data)returndatadef_commit(self,files,text,user,date,match,force,lock,wlock,force_editor,p1,p2,extra,empty_ok):'''Private commit wrapper for backwards compatibility.'''try:returnsuper(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)exceptTypeError:try:returnsuper(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)exceptTypeError:returnsuper(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)defcommit(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=wlockdelwlock,lock_p1=_p2=Nonetry:ifnot_wlock:_wlock=self.wlock()ifnot_lock:_lock=self.lock()# store and postpone commit hookscommithooks={}forname,cmdinui.configitems('hooks'):ifname.split('.',1)[0]=='commit':commithooks[name]=cmdui.setconfig('hooks',name,'')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=self._commit(files,text,user,date,match,force,_lock,_wlock,force_editor,p1,p2,extra,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:del_wlock,_lockrepo.__class__=kwrepotry:patchfile.__init__=_kwpatchfile_initexceptNameError:passcmdtable={'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]...')),}