test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:bc5cd6cf69bc
+:c1b7b1d052de
 class kwtemplater(object):
 '''
 Sets up keyword templates, corresponding keyword regex, and
 provides keyword substitution functions.
 '''
-def __init__(self, ui, repo, path='', node=None):
+def __init__(self, ui, repo, path='', node=None, expand=True):
 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
+if expand:
-try:
+templater.common_filters['utcdate'] = utcdate
-self.t = cmdutil.changeset_templater(ui, repo, False, '', False)
+try:
-except TypeError:
+self.t = cmdutil.changeset_templater(ui, repo,
-# depending on hg rev changeset_templater has extra "brinfo" arg
+False, '', False)
-self.t = cmdutil.changeset_templater(ui, repo,
+except TypeError:
-False, None, '', False)
+# depending on hg rev changeset_templater has extra "brinfo" arg
+self.t = cmdutil.changeset_templater(ui, repo,
+False, None, '', False)
+else:
+self.t = None
+def ctxnode(self, node):
+'''Obtains missing node from file context.'''
+if not self.node:
+c = context.filectx(self.repo, self.path, fileid=node)
+self.node = c.node()
 def kwsub(self, mobj):
 '''Substitutes keyword using corresponding template.'''
 kw = mobj.group(1)
 self.t.use_template(self.templates[kw])
 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.'''
+'''Returns data with keywords expanded.'''
 if util.binary(data):
 return data
-c = context.filectx(self.repo, self.path, fileid=node)
+self.ctxnode(node)
-self.node = c.node()
 return self.re_kw.sub(self.kwsub, data)
+def process(self, node, data):
+'''Returns a tuple: data, count.
+Count is number of keywords/keyword substitutions.
+Keywords in data are expanded, if templater was initialized.'''
+if util.binary(data):
+return data, None
+if self.t:
+self.ctxnode(node)
+return self.re_kw.subn(self.kwsub, data)
+return data, self.re_kw.search(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, manifest, expand=True, commit=True):
+def overwrite(self, candidates, man, commit=True):
-'''Overwrites candidates in working dir expanding keywords.'''
+'''Overwrites files in working directory if keywords are detected.
-if expand:
+Keywords are expanded if keyword templater is initialized,
-sub = self.kwsub
+otherwise their substitution is removed.'''
-action = 'expanding'
+expand = self.t is not None
-else:
+action = ('shrinking', 'expanding')[expand]
-sub = r'$\1$'
+notify = (self.ui.note, self.ui.debug)[commit]
-action = 'shrinking'
-if not commit:
-notify = self.ui.note
-else:
-notify = self.ui.debug
 files = []
 for f in candidates:
-data = self.repo.wread(f)
+fp = self.repo.file(f, kwcnt=True, kwexp=expand)
-if not util.binary(data):
+data, cnt = fp.read(man[f])
-self.path = f
+if cnt:
-data, kwct = self.re_kw.subn(sub, data)
+notify(_('overwriting %s %s keywords\n') % (f, action))
-if kwct:
+self.repo.wwrite(f, data, man.flags(f))
-notify(_('overwriting %s %s keywords\n') % (f, action))
+files.append(f)
-self.repo.wwrite(f, data, manifest.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.
+Keywords are "stored" unexpanded, and processed on reading.
 '''
-def __init__(self, opener, path, kwtemplater):
+def __init__(self, opener, path, kwtemplater, kwcnt):
 super(kwfilelog, self).__init__(opener, path)
 self.kwtemplater = kwtemplater
+self.kwcnt = kwcnt
 def read(self, node):
-'''Substitutes keywords when reading filelog.'''
+'''Passes data through kwemplater methods for
+either unconditional keyword expansion
+or counting of keywords and substitution method
+set by the calling overwrite function.'''
 data = super(kwfilelog, self).read(node)
-return self.kwtemplater.expand(node, data)
+if not self.kwcnt:
+return self.kwtemplater.expand(node, data)
+return self.kwtemplater.process(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)
 if self.renamed(node):
 t2 = super(kwfilelog, self).read(node)
 return t2 != text
 return super(kwfilelog, self).cmp(node, text)
-def overwrite(ui, repo, files=None, expand=False):
+def overwrite(ui, repo, files=None, expand=True):
 '''Expands/shrinks keywords in working directory.'''
 wlock = repo.wlock()
 try:
 ctx = repo.changectx()
 if not ctx:
 files = [f for f in files if kwfmatcher(f) and not os.path.islink(f)]
 if not files:
 ui.warn(_('given files not tracked or '
 'not configured for expansion\n'))
 return
-kwt = kwtemplater(ui, repo, node=ctx.node())
+kwt = kwtemplater(ui, repo, node=ctx.node(), expand=expand)
-kwt.overwrite(files, m, expand=expand, commit=False)
+kwt.overwrite(files, m, commit=False)
 finally:
 wlock.release()
 def shrink(ui, repo, *args):
 run before:
 disabling keyword expansion
 changing keyword expansion configuration
 or if you experience problems with "hg import"
 '''
-overwrite(ui, repo, args, expand=False)
+overwrite(ui, repo, files=args, expand=False)
 def expand(ui, repo, *args):
 '''expand keywords in working directory
 run after (re)enabling keyword expansion
 '''
-overwrite(ui, repo, args, expand=True)
+overwrite(ui, repo, files=args)
 def demo(ui, repo, **opts):
 '''print [keywordmaps] configuration and an expansion example
 Show current or default keyword template maps and their expansion
 kwfmatcher = keywordmatcher(ui, repo)
 if kwfmatcher is None:
 return
 class kwrepo(repo.__class__):
-def file(self, f):
+def file(self, f, kwcnt=False, kwexp=True):
 if f[0] == '/':
 f = f[1:]
 if kwfmatcher(f):
-kwt = kwtemplater(ui, self, path=f)
+kwt = kwtemplater(ui, self, path=f, expand=kwexp)
-return kwfilelog(self.sopener, f, kwt)
+return kwfilelog(self.sopener, f, kwt, kwcnt)
 else:
 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,

branch	kwmap-templates
changeset 186	c1b7b1d052de
parent 185	bc5cd6cf69bc
child 187	a01a0392f648