test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:8d16b70359da
+:affc18a621f5
 commands.optionalrepo += ' kwdemo'
 def utcdate(date):
 '''Returns hgdate in cvs-like UTC format.'''
 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
-def keywordmatcher(ui, repo):
-'''Collects include/exclude filename patterns for expansion
-candidates of current configuration. Returns filename matching
-function if include patterns exist, None otherwise.'''
-inc, exc = [], ['.hg*']
-for pat, opt in ui.configitems('keyword'):
-if opt != 'ignore':
-inc.append(pat)
-else:
-exc.append(pat)
-if not inc:
-return None
-return util.matcher(repo.root, inc=inc, exc=exc)[1]
 class kwtemplater(object):
 '''
 Sets up keyword templates, corresponding keyword regex, and
 provides keyword substitution functions.
 '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, path='', node=None, expand=True):
+def __init__(self, ui, repo, expand, path='', node=None):
 self.ui = ui
 self.repo = repo
+self.t = expand or None
 self.path = path
 self.node = node
-self.t = expand or None
 templates = dict(ui.configitems('keywordmaps'))
 if templates:
 for k in templates.keys():
 templates[k] = templater.parsestring(templates[k],
 '''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, man, commit=True):
+def overwrite(self, candidates, man, commit):
 '''Overwrites files in working directory if keywords are detected.
 Keywords are expanded if keyword templater is initialized,
 otherwise their substitution is removed.'''
 expand = self.t is not None
 action = ('shrinking', 'expanding')[expand]
 notify = (self.ui.note, self.ui.debug)[commit]
 files = []
 for f in candidates:
-fp = self.repo.file(f, kwcnt=True, kwexp=expand)
+fp = self.repo.file(f, kwexp=expand, kwcnt=True)
-data, cnt = fp.read(man[f])
+data, kwfound = fp.read(man[f])
-if cnt:
+if kwfound:
 notify(_('overwriting %s %s keywords\n') % (f, action))
 try:
 self.repo.wwrite(f, data, man.flags(f))
 except AttributeError:
 # older versions want file descriptor as 3. optional arg
 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=True):
+def _keywordmatcher(ui, repo):
+'''Collects include/exclude filename patterns for expansion
+candidates of current configuration. Returns filename matching
+function if include patterns exist, None otherwise.'''
+inc, exc = [], ['.hg*']
+for pat, opt in ui.configitems('keyword'):
+if opt != 'ignore':
+inc.append(pat)
+else:
+exc.append(pat)
+if inc:
+return util.matcher(repo.root, inc=inc, exc=exc)[1]
+return None
+def _overwrite(ui, repo, files, expand):
 '''Expands/shrinks keywords in working directory.'''
 wlock = None
 try:
 wlock = repo.wlock()
 bail_if_changed(repo)
 ctx = repo.changectx()
 if not ctx:
 raise hg.RepoError(_('no revision checked out'))
-kwfmatcher = keywordmatcher(ui, repo)
+kwfmatcher = _keywordmatcher(ui, repo)
 if kwfmatcher is None:
 ui.warn(_('no files configured for keyword expansion\n'))
 return
 m = ctx.manifest()
 if files:
 files = m.keys()
 files = [f for f in files if kwfmatcher(f) and not os.path.islink(f)]
 if not files:
 ui.warn(_('files not configured for expansion or untracked\n'))
 return
-kwt = kwtemplater(ui, repo, node=ctx.node(), expand=expand)
+commit = False
-kwt.overwrite(files, m, commit=False)
+kwt = kwtemplater(ui, repo, expand, node=ctx.node())
+kwt.overwrite(files, m, commit)
 wlock = None
 finally:
 del wlock
 run before:
 disabling keyword expansion
 changing keyword expansion configuration
 or if you experience problems with "hg import"
 '''
-_overwrite(ui, repo, files=args, expand=False)
+expand = False
+_overwrite(ui, repo, args, expand)
 def expand(ui, repo, *args):
 '''expand keywords in working directory
 run after (re)enabling keyword expansion
 '''
-_overwrite(ui, repo, files=args)
+expand = True
+_overwrite(ui, repo, args, expand)
 def demo(ui, repo, *args, **opts):
 '''print [keywordmaps] configuration and an expansion example
 show current, custom, or default keyword template maps and their expansion
 return aliases[0]
 if not repo.local() or _getcmd() in nokwcommands:
 return
-kwfmatcher = keywordmatcher(ui, repo)
+kwfmatcher = _keywordmatcher(ui, repo)
 if kwfmatcher is None:
 return
 class kwrepo(repo.__class__):
-def file(self, f, kwcnt=False, kwexp=True):
+def file(self, f, kwexp=True, kwcnt=False):
 if f[0] == '/':
 f = f[1:]
 if kwfmatcher(f):
-kwt = kwtemplater(ui, self, path=f, expand=kwexp)
+kwt = kwtemplater(ui, self, kwexp, path=f)
 return kwfilelog(self.sopener, f, kwt, kwcnt)
 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,
 candidates = [f for f in cl[3] if kwfmatcher(f)
 and f not in removed
 and not os.path.islink(self.wjoin(f))]
 if candidates:
 m = self.manifest.read(cl[0])
-kwt = kwtemplater(ui, self, node=node)
+expand = commit = True
-kwt.overwrite(candidates, m)
+kwt = kwtemplater(ui, self, expand, node=node)
+kwt.overwrite(candidates, m, commit)
 wlock = None
 return node
 finally:
 del wlock

changeset 207	affc18a621f5
parent 206	8d16b70359da
child 208	5afdcec8a01f