test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:2069334ec1d0
+:60c993ce6acb
 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.'''
 _patchfile_init(self, ui, fname, missing=missing)
-if _kwtemplater.matcher(self.fname):
+# shrink keywords read from working dir
-# shrink keywords read from working dir
+self.lines = _kwtemplater.shrinklines(self.fname, self.lines)
-kwshrunk = _kwtemplater.shrink(''.join(self.lines))
-self.lines = kwshrunk.splitlines(True)
 def _kw_diff(repo, node1=None, node2=None, files=None, match=util.always,
 fp=None, changes=None, opts=None):
 # only expand if comparing against working dir
 if node2 is not None:
 '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):
+def __init__(self, ui, repo, inc, exc):
 self.ui = ui
 self.repo = repo
 self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
-self.restrict = hgcmd in restricted.split()
+self.restrict = _cmd in restricted.split()
-self.commitnode = None
-self.path = ''
 kwmaps = self.ui.configitems('keywordmaps')
 if kwmaps: # override default templates
 kwmaps = [(k, templater.parsestring(v, quoted=False))
 for (k, v) in kwmaps]
 templatefilters.filters['utcdate'] = utcdate
 self.ct = cmdutil.changeset_templater(self.ui, self.repo,
 False, '', False)
-def substitute(self, node, data, subfunc):
+def getnode(self, path, fnode):
-'''Obtains file's changenode if commit node not given,
+'''Derives changenode from file context.'''
-and calls given substitution function.'''
+c = context.filectx(self.repo, path, fileid=fnode)
-if self.commitnode:
+return c.node()
-fnode = self.commitnode
-else:
+def substitute(self, data, path, node, subfunc):
-c = context.filectx(self.repo, self.path, fileid=node)
+'''Replaces keywords in data with expanded template.'''
-fnode = c.node()
 def kwsub(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)
+self.ct.show(changenode=node, root=self.repo.root, file=path)
 ekw = templatefilters.firstline(self.ui.popbuffer())
 return '$%s: %s $' % (kw, ekw)
 return subfunc(kwsub, data)
-def expand(self, node, data):
+def expand(self, path, node, data):
 '''Returns data with keywords expanded.'''
-if self.restrict or util.binary(data):
+if not self.restrict and self.matcher(path) and not util.binary(data):
-return data
+changenode = self.getnode(path, node)
-return self.substitute(node, data, self.re_kw.sub)
+return self.substitute(data, path, changenode, self.re_kw.sub)
+return data
-def process(self, node, data, expand):
-'''Returns a tuple: data, count.
+def iskwfile(self, path, islink):
-Count is number of keywords/keyword substitutions,
+'''Returns true if path matches [keyword] pattern
-telling caller whether to act on file containing data.'''
+and is not a symbolic link.
-if util.binary(data):
+Caveat: localrepository._link fails on Windows.'''
-return data, None
+return self.matcher(path) and not islink(path)
-if expand:
-return self.substitute(node, data, self.re_kw.subn)
+def overwrite(self, node=None, expand=True, files=None):
-return data, self.re_kw.search(data)
+'''Overwrites selected files expanding/shrinking keywords.'''
+ctx = self.repo.changectx(node)
-def shrink(self, text):
+mf = ctx.manifest()
+if node is not None:     # commit
+files = [f for f in ctx.files() if f in mf]
+notify = self.ui.debug
+else:                    # kwexpand/kwshrink
+notify = self.ui.note
+candidates = [f for f in files if self.iskwfile(f, mf.linkf)]
+if candidates:
+self.restrict = True # do not expand when reading
+candidates.sort()
+action = expand and 'expanding' or 'shrinking'
+for f in candidates:
+fp = self.repo.file(f)
+data = fp.read(mf[f])
+if util.binary(data):
+continue
+if expand:
+changenode = node or self.getnode(f, mf[f])
+data, found = self.substitute(data, f, changenode,
+self.re_kw.subn)
+else:
+found = self.re_kw.search(data)
+if found:
+notify(_('overwriting %s %s keywords\n') % (f, action))
+self.repo.wwrite(f, data, mf.flags(f))
+self.repo.dirstate.normal(f)
+self.restrict = False
+def shrinktext(self, text):
+'''Unconditionally removes all keyword substitutions from text.'''
+return self.re_kw.sub(r'$\1$', text)
+def shrink(self, fname, text):
 '''Returns text with all keyword substitutions removed.'''
-if util.binary(text):
+if self.matcher(fname) and not util.binary(text):
-return text
+return self.shrinktext(text)
-return self.re_kw.sub(r'$\1$', text)
+return text
+def shrinklines(self, fname, lines):
+'''Returns lines with keyword substitutions removed.'''
+if self.matcher(fname):
+text = ''.join(lines)
+if not util.binary(text):
+return self.shrinktext(text).splitlines(True)
+return lines
+def wread(self, fname, data):
+'''If in restricted mode returns data read from wdir with
+keyword substitutions removed.'''
+return self.restrict and self.shrink(fname, data) or data
 class kwfilelog(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 = path
+self.path = path
-def kwctread(self, node, expand):
-'''Reads expanding and counting keywords, called from _overwrite.'''
-data = super(kwfilelog, self).read(node)
-return _kwtemplater.process(node, data, expand)
 def read(self, node):
 '''Expands keywords when reading filelog.'''
 data = super(kwfilelog, self).read(node)
-return _kwtemplater.expand(node, data)
+return _kwtemplater.expand(self.path, node, data)
 def add(self, text, meta, tr, link, p1=None, p2=None):
 '''Removes keyword substitutions when adding to filelog.'''
-text = _kwtemplater.shrink(text)
+text = _kwtemplater.shrink(self.path, 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 = _kwtemplater.shrink(text)
+text = _kwtemplater.shrink(self.path, text)
 if self.renamed(node):
 t2 = super(kwfilelog, self).read(node)
 return t2 != text
 return revlog.revlog.cmp(self, node, text)
-def _iskwfile(f, link):
-return not link(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:
 return repo.status(files=files, match=match, list_clean=True)
 if ui.configitems('keyword'):
 raise util.Abort(_('[keyword] patterns cannot match'))
 raise util.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()
-if node is not None:   # commit
-_kwtemplater.commitnode = node
-files = [f for f in ctx.files() if f in mf]
-notify = ui.debug
-else:                  # kwexpand/kwshrink
-notify = ui.note
-candidates = [f for f in files if _iskwfile(f, mf.linkf)]
-if candidates:
-candidates.sort()
-action = expand and 'expanding' or 'shrinking'
-for f in candidates:
-fp = repo.file(f, kwmatch=True)
-data, kwfound = fp.kwctread(mf[f], expand)
-if kwfound:
-notify(_('overwriting %s %s keywords\n') % (f, action))
-repo.wwrite(f, data, mf.flags(f))
-repo.dirstate.normal(f)
 def _kwfwrite(ui, repo, expand, *pats, **opts):
-'''Selects files and passes them to _overwrite.'''
+'''Selects files and passes them to kwtemplater.overwrite.'''
 status = _status(ui, repo, *pats, **opts)
 modified, added, removed, deleted, unknown, ignored, clean = status
 if modified or added or removed or deleted:
 raise util.Abort(_('outstanding uncommitted changes in given files'))
 wlock = lock = None
 try:
 wlock = repo.wlock()
 lock = repo.lock()
-_overwrite(ui, repo, expand=expand, files=clean)
+_kwtemplater.overwrite(expand=expand, files=clean)
 finally:
 del wlock, lock
 def demo(ui, repo, *args, **opts):
 if opts.get('untracked'):
 files += unknown
 files.sort()
 wctx = repo.workingctx()
 islink = lambda p: 'l' in wctx.fileflags(p)
-kwfiles = [f for f in files if _iskwfile(f, islink)]
+kwfiles = [f for f in files if _kwtemplater.iskwfile(f, islink)]
 cwd = pats and repo.getcwd() or ''
 kwfstats = not opts.get('ignore') and (('K', kwfiles),) or ()
 if opts.get('all') or opts.get('ignore'):
 kwfstats += (('I', [f for f in files if f not in kwfiles]),)
 for char, filenames in kwfstats:
 else:
 exc.append(pat)
 if not inc:
 return
-_kwtemplater = kwtemplater(ui, repo, inc, exc, _cmd)
+_kwtemplater = kwtemplater(ui, repo, inc, exc)
 class kwrepo(repo.__class__):
-def file(self, f, kwmatch=False):
+def file(self, f):
 if f[0] == '/':
 f = f[1:]
-if kwmatch or _kwtemplater.matcher(f):
+return kwfilelog(self.sopener, f)
-return kwfilelog(self.sopener, f)
-return filelog.filelog(self.sopener, f)
 def wread(self, filename):
 data = super(kwrepo, self).wread(filename)
-if _kwtemplater.restrict and _kwtemplater.matcher(filename):
+return _kwtemplater.wread(filename, data)
-return _kwtemplater.shrink(data)
-return data
 def commit(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
 # restore commit hooks
 for name, cmd in commithooks.iteritems():
 ui.setconfig('hooks', name, cmd)
 if node is not None:
-_overwrite(ui, self, node=node)
+_kwtemplater.overwrite(node=node)
 repo.hook('commit', node=node, parent1=_p1, parent2=_p2)
 return node
 finally:
 del wlock, lock

changeset 407	60c993ce6acb
parent 406	2069334ec1d0
child 408	33e5b8a51e47