test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:f5927e5574e6
+:63ebc698d06b
 fancyopts.fancyopts = _fancyopts
 commands.optionalrepo += ' kwdemo'
+# hg commands that trigger expansion only when writing to working dir,
+# not when reading filelog, and unexpand when reading from working dir
+restricted = ('diff1', 'record',
+'qfold', 'qimport', 'qnew', 'qpush', 'qrefresh', 'qrecord')
 def utcdate(date):
 '''Returns hgdate in cvs-like UTC format.'''
 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
-def _kwrestrict(cmd):
-'''Returns True if cmd should trigger restricted expansion.
-Keywords will only expanded when writing to working dir.
-Crucial for mq as expanded keywords should not make it into patches.'''
-return cmd in ('diff1',
-'qimport', 'qnew', 'qpush', 'qrefresh', 'record', 'qrecord')
 _kwtemplater = None
 class kwtemplater(object):
 return subfunc(kwsub, data)
 def expand(self, node, data):
 '''Returns data with keywords expanded.'''
-if util.binary(data) or _kwrestrict(self.hgcmd):
+if util.binary(data) or self.hgcmd in restricted:
 return data
 return self.substitute(node, data, self.re_kw.sub)
 def process(self, node, data, expand):
 '''Returns a tuple: data, count.
 '''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 mf.has_key(f)]
+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:
 if opts.get('default'):
 kwstatus = 'default'
 kwmaps = kwtemplater.templates
 if ui.configitems('keywordmaps'):
 # override maps from optional rcfile
-for k, v in kwmaps.items():
+for k, v in kwmaps.iteritems():
 ui.setconfig('keywordmaps', k, v)
 elif args:
 # simulate hgrc parsing
 rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
 fp = repo.opener('hgrc', 'w')
 extension = '%s = %s' % (k, v)
 break
 demostatus('config using %s keyword template maps' % kwstatus)
 ui.write('[extensions]\n%s\n' % extension)
 demoitems('keyword', ui.configitems('keyword'))
-demoitems('keywordmaps', kwmaps.items())
+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))
 return kwfilelog(self.sopener, f)
 return filelog.filelog(self.sopener, f)
 def wread(self, filename):
 data = super(kwrepo, self).wread(filename)
-if _kwrestrict(hgcmd) and _kwtemplater.matcher(filename):
+if hgcmd in restricted and _kwtemplater.matcher(filename):
 return _kwtemplater.shrink(data)
 return data
 def _commit(self, files, text, user, date, match, force, lock, wlock,
 force_editor, p1, p2, extra):
 if not _wlock:
 _wlock = self.wlock()
 if not _lock:
 _lock = self.lock()
 # store and postpone commit hooks
-commithooks = []
+commithooks = {}
 for name, cmd in ui.configitems('hooks'):
 if name.split('.', 1)[0] == 'commit':
-commithooks.append((name, cmd))
+commithooks[name] = cmd
 ui.setconfig('hooks', name, '')
 if commithooks:
 # store parents for commit hook environment
 if p1 is None:
 _p1, _p2 = repo.dirstate.parents()
 node = self._commit(files, text, user, date, match, force,
 _lock, _wlock, force_editor, p1, p2, extra)
 # restore commit hooks
-for name, cmd in commithooks:
+for name, cmd in commithooks.iteritems():
 ui.setconfig('hooks', name, cmd)
 if node is not None:
 _overwrite(ui, self, node=node)
 repo.hook('commit', node=node, parent1=_p1, parent2=_p2)
 return node

branch	0.9.2compat
changeset 348	63ebc698d06b
parent 343	f5927e5574e6
child 350	83aa851f0d84
child 379	290d023e8306