test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:5d20f5d642f3
+:8019554adbb2
 def utcdate(date):
 '''Returns hgdate in cvs-like UTC format.'''
 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
-def kwdemo(ui, repo, **opts):
+def getcmd(ui):
+'''Returns current hg command.'''
+# commands.parse(ui, sys.argv[1:])[0] breaks "hg diff -r"
+try:
+args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts, {})
+except fancyopts.getopt.GetoptError, inst:
+raise commands.ParseError(None, inst)
+if args:
+cmd = args[0]
+aliases, i = findcmd(ui, cmd)
+return aliases[0]
+class kwtemplater(object):
+'''
+Sets up keyword templates, corresponding keyword regex, and
+provides keyword substitution functions.
+'''
+def __init__(self, ui, repo, path='', node=None):
+self.ui = ui
+self.repo = repo
+self.path = path
+self.node = node
+templates = dict(ui.configitems('keywordmaps'))
+if templates:
+# parse templates here for less overhead in kwsub matchfunc
+for k in templates.keys():
+templates[k] = templater.parsestring(templates[k],
+quoted=False)
+self.templates = templates or deftemplates
+escaped = [re.escape(k) for k in self.templates.keys()]
+self.re_kw = re.compile(r'\$(%s)[^$]*?\$' % '|'.join(escaped))
+templater.common_filters['utcdate'] = utcdate
+try:
+self.t = cmdutil.changeset_templater(ui, repo, False, '', False)
+except TypeError:
+# depending on hg rev changeset_templater has extra "brinfo" arg
+self.t = cmdutil.changeset_templater(ui, repo,
+False, None, '', False)
+def kwsub(self, mobj):
+'''Substitutes keyword using corresponding template.'''
+kw = mobj.group(1)
+self.t.use_template(self.templates[kw])
+self.ui.pushbuffer()
+self.t.show(changenode=self.node, root=self.repo.root, file=self.path)
+keywordsub = templater.firstline(self.ui.popbuffer())
+return '$%s: %s $' % (kw, keywordsub)
+def expand(self, node, data):
+'''Returns data with expanded keywords.'''
+if util.binary(data):
+return data
+c = context.filectx(self.repo, self.path, fileid=node)
+self.node = c.node()
+return self.re_kw.sub(self.kwsub, data)
+def shrink(self, text):
+'''Returns text with all keyword substitutions removed.'''
+if util.binary(text):
+return text
+return self.re_kw.sub(r'$\1$', text)
+def overwrite(self, candidates, mn):
+'''Overwrites candidates in working dir expanding keywords.'''
+files = []
+m = self.repo.manifest.read(mn)
+for f in candidates:
+data = self.repo.wread(f)
+if not util.binary(data):
+self.path = f
+data, kwct = self.re_kw.subn(self.kwsub, data)
+if kwct:
+self.ui.debug(_('overwriting %s expanding keywords\n') % f)
+self.repo.wwrite(f, data, m.flags(f))
+files.append(f)
+if files:
+self.repo.dirstate.update(files, 'n')
+class kwfilelog(filelog.filelog):
+'''
+Subclass of filelog to hook into its read, add, cmp methods.
+Keywords are "stored" unexpanded, and expanded on reading.
+'''
+def __init__(self, opener, path, kwtemplater):
+super(kwfilelog, self).__init__(opener, path)
+self.kwtemplater = kwtemplater
+def read(self, node):
+'''Substitutes keywords when reading filelog.'''
+data = super(kwfilelog, self).read(node)
+return self.kwtemplater.expand(node, data)
+def add(self, text, meta, tr, link, p1=None, p2=None):
+'''Removes keyword substitutions when adding to filelog.'''
+text = self.kwtemplater.shrink(text)
+return super(kwfilelog, self).add(text, meta, tr, link, p1=p1, p2=p2)
+def cmp(self, node, text):
+'''Removes keyword substitutions for comparison.'''
+text = self.kwtemplater.shrink(text)
+if self.renamed(node):
+t2 = super(kwfilelog, self).read(node)
+return t2 != text
+return super(kwfilelog, self).cmp(node, text)
+def demo(ui, repo, **opts):
 '''print [keywordmaps] configuration and an expansion example
 '''
 log = 'hg keyword config and expansion example'
 fn = 'demo.txt'
 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
 ui.status(_('\n%s keywords expanded:\n') % kwstatus)
 ui.write(_repo.wread(fn))
 ui.debug(_('\nremoving temporary repo\n'))
 shutil.rmtree(tmpdir)
-def getcmd(ui):
-'''Returns current hg command.'''
-# commands.parse(ui, sys.argv[1:])[0] breaks "hg diff -r"
-try:
-args = fancyopts.fancyopts(sys.argv[1:], commands.globalopts, {})
-except fancyopts.getopt.GetoptError, inst:
-raise commands.ParseError(None, inst)
-if args:
-cmd = args[0]
-aliases, i = findcmd(ui, cmd)
-return aliases[0]
-class kwtemplater(object):
-'''
-Sets up keyword templates, corresponding keyword regex, and
-provides keyword substitution functions.
-'''
-def __init__(self, ui, repo, path='', node=None):
-self.ui = ui
-self.repo = repo
-self.path = path
-self.node = node
-templates = dict(ui.configitems('keywordmaps'))
-if templates:
-# parse templates here for less overhead in kwsub matchfunc
-for k in templates.keys():
-templates[k] = templater.parsestring(templates[k],
-quoted=False)
-self.templates = templates or deftemplates
-escaped = [re.escape(k) for k in self.templates.keys()]
-self.re_kw = re.compile(r'\$(%s)[^$]*?\$' % '|'.join(escaped))
-templater.common_filters['utcdate'] = utcdate
-try:
-self.t = cmdutil.changeset_templater(ui, repo, False, '', False)
-except TypeError:
-# depending on hg rev changeset_templater has extra "brinfo" arg
-self.t = cmdutil.changeset_templater(ui, repo,
-False, None, '', False)
-def kwsub(self, mobj):
-'''Substitutes keyword using corresponding template.'''
-kw = mobj.group(1)
-self.t.use_template(self.templates[kw])
-self.ui.pushbuffer()
-self.t.show(changenode=self.node, root=self.repo.root, file=self.path)
-keywordsub = templater.firstline(self.ui.popbuffer())
-return '$%s: %s $' % (kw, keywordsub)
-def expand(self, node, data):
-'''Returns data with expanded keywords.'''
-if util.binary(data):
-return data
-c = context.filectx(self.repo, self.path, fileid=node)
-self.node = c.node()
-return self.re_kw.sub(self.kwsub, data)
-def shrink(self, text):
-'''Returns text with all keyword substitutions removed.'''
-if util.binary(text):
-return text
-return self.re_kw.sub(r'$\1$', text)
-def overwrite(self, candidates, mn):
-'''Overwrites candidates in working dir expanding keywords.'''
-files = []
-m = self.repo.manifest.read(mn)
-for f in candidates:
-data = self.repo.wread(f)
-if not util.binary(data):
-self.path = f
-data, kwct = self.re_kw.subn(self.kwsub, data)
-if kwct:
-self.ui.debug(_('overwriting %s expanding keywords\n') % f)
-self.repo.wwrite(f, data, m.flags(f))
-files.append(f)
-if files:
-self.repo.dirstate.update(files, 'n')
-class kwfilelog(filelog.filelog):
-'''
-Subclass of filelog to hook into its read, add, cmp methods.
-Keywords are "stored" unexpanded, and expanded on reading.
-'''
-def __init__(self, opener, path, kwtemplater):
-super(kwfilelog, self).__init__(opener, path)
-self.kwtemplater = kwtemplater
-def read(self, node):
-'''Substitutes keywords when reading filelog.'''
-data = super(kwfilelog, self).read(node)
-return self.kwtemplater.expand(node, data)
-def add(self, text, meta, tr, link, p1=None, p2=None):
-'''Removes keyword substitutions when adding to filelog.'''
-text = self.kwtemplater.shrink(text)
-return super(kwfilelog, self).add(text, meta, tr, link, p1=p1, p2=p2)
-def cmp(self, node, text):
-'''Removes keyword substitutions for comparison.'''
-text = self.kwtemplater.shrink(text)
-if self.renamed(node):
-t2 = super(kwfilelog, self).read(node)
-return t2 != text
-return super(kwfilelog, self).cmp(node, text)
 def reposetup(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
 kwfmatcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
 ui = repo.ui
 class kwrepo(repo.__class__):
-'''
-Subclass of repo's class attribute to wrap its file and commit methods.
-'''
 def file(self, f):
-'''Opens kwfilelog instead of filelog if needed.'''
 if f[0] == '/':
 f = f[1:]
 if kwfmatcher(f):
 kwt = kwtemplater(ui, self, path=f)
 return kwfilelog(self.sopener, f, kwt)
 return filelog.filelog(self.sopener, f)
 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={}):
-'''Wraps commit, expanding keywords of committed and
-configured files in working directory.'''
 wrelease = False
 if not wlock:
 wlock = self.wlock()
 wrelease = True
 try:
 repo.__class__ = kwrepo
 cmdtable = {
 'kwdemo':
-(kwdemo,
+(demo,
 [('d', 'default', None, _('use default keyword maps'))],
 _('hg kwdemo [-d]')),
 }

branch	kwmap-templates
changeset 181	8019554adbb2
parent 180	5d20f5d642f3
child 182	de32fbee75a4