test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:98336da24c5e
+:f5927e5574e6
 the risk of inadvertedly storing expanded keywords in the change history.
 To force expansion after enabling it, or a configuration change, run
 "hg kwexpand".
+Also, when committing with the record extension or using mq's qrecord, be aware
+that keywords cannot be updated. Again, run "hg kwexpand" on the files in
+question to update keyword expansions after all changes have been checked in.
 Expansions spanning more than one line and incremental expansions,
 like CVS' $Log$, are not supported. A keyword template map
 "Log = {desc}" expands to the first line of the changeset description.
 Caveat: "hg import" fails if the patch context contains an active
 keyword. In that case run "hg kwshrink", and then reimport.
 Or, better, use bundle/unbundle to share changes.
 '''
-from mercurial import commands, cmdutil, context
+from mercurial import commands, cmdutil, context, fancyopts
 from mercurial import filelog, localrepo, revlog, templater, util
 from mercurial.node import *
 from mercurial.i18n import gettext as _
 import getopt, os.path, re, shutil, sys, tempfile, time
 # backwards compatibility hacks
+try:
+# cmdutil.parse moves to dispatch._parse in 18a9fbb5cd78
+# also avoid name conflict with other dispatch package(s)
+from mercurial.dispatch import _parse
+except ImportError:
+try:
+# commands.parse moves to cmdutil.parse in 0c61124ad877
+_parse = cmdutil.parse
+except AttributeError:
+_parse = commands.parse
 def _wwrite(repo, f, data, mf):
 '''Makes repo.wwrite backwards compatible.'''
 # 656e06eebda7 removed file descriptor argument
 # 67982d3ee76c added flags argument
 except AttributeError:
 return f
 # commands.parse/cmdutil.parse returned nothing for
 # "hg diff --rev" before 88803a69b24a due to bug in fancyopts
-def fancyopts(args, options, state):
+def _fancyopts(args, options, state):
 '''Fixed fancyopts from a9b7e425674f.'''
 namelist = []
 shortlist = ''
 argmap = {}
 defmap = {}
 state[name] = True
 # return unparsed args
 return args
-def findcmd(ui, cmd, table):
+fancyopts.fancyopts = _fancyopts
-'''findcmd has table argument since 18a9fbb5cd78.'''
-try:
-return findcmd.findcmd(ui, cmd, table)
-except TypeError:
-return findcmd.findcmd(ui, cmd)
-# findcmd in commands until 0c61124ad877
-try:
-findcmd.findcmd = cmdutil.findcmd
-findcmd.__doc__ = cmdutil.findcmd.__doc__
-except AttributeError:
-findcmd.findcmd = commands.findcmd
-findcmd.__doc__ = commands.findcmd.__doc__
 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 _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):
 '''
 '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):
+def __init__(self, ui, repo, inc, exc, hgcmd):
 self.ui = ui
 self.repo = repo
 self.matcher = util.matcher(repo.root, inc=inc, exc=exc)[1]
+self.hgcmd = hgcmd
 self.commitnode = None
 self.path = ''
 kwmaps = self.ui.configitems('keywordmaps')
 if kwmaps: # override default templates
 return subfunc(kwsub, data)
 def expand(self, node, data):
 '''Returns data with keywords expanded.'''
-if util.binary(data):
+if util.binary(data) or _kwrestrict(self.hgcmd):
 return data
 return self.substitute(node, data, self.re_kw.sub)
 def process(self, node, data, expand):
 '''Returns a tuple: data, count.
 Wraps commit to overwrite configured files with updated
 keyword substitutions.
 This is done for local repos only, and only if there are
 files configured at all for keyword substitution.'''
-def kwbailout():
+if not repo.local():
-'''Obtains command via simplified cmdline parsing,
-returns True if keyword expansion not needed.'''
-nokwcommands = ('add', 'addremove', 'bundle', 'clone', 'copy',
-'export', 'grep', 'identify', 'incoming', 'init',
-'log', 'outgoing', 'push', 'remove', 'rename',
-'rollback', 'tip',
-'convert')
-args = fancyopts(sys.argv[1:], commands.globalopts, {})
-if args:
-aliases, i = findcmd(ui, args[0], commands.table)
-return aliases[0] in nokwcommands
-if not repo.local() or kwbailout():
 return
+nokwcommands = ('add', 'addremove', 'bundle', 'clone', 'copy',
+'export', 'grep', 'identify', 'incoming', 'init',
+'log', 'outgoing', 'push', 'remove', 'rename',
+'rollback', 'tip',
+'convert')
+hgcmd, func, args, opts, cmdopts = _parse(ui, sys.argv[1:])
+if hgcmd in nokwcommands:
+return
+if hgcmd == 'diff':
+# only expand if comparing against working dir
+node1, node2 = cmdutil.revpair(repo, cmdopts.get('rev'))
+if node2 is not None:
+return
+# shrink if rev is not current node
+if node1 is not None and node1 != repo.changectx().node():
+hgcmd = 'diff1'
 inc, exc = [], ['.hgtags']
 for pat, opt in ui.configitems('keyword'):
 if opt != 'ignore':
 inc.append(pat)
 exc.append(pat)
 if not inc:
 return
 global _kwtemplater
-_kwtemplater = kwtemplater(ui, repo, inc, exc)
+_kwtemplater = kwtemplater(ui, repo, inc, exc, hgcmd)
 class kwrepo(repo.__class__):
 def file(self, f, kwmatch=False):
 if f[0] == '/':
 f = f[1:]
 if kwmatch or _kwtemplater.matcher(f):
 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):
+return _kwtemplater.shrink(data)
+return data
 def _commit(self, files, text, user, date, match, force, lock, wlock,
 force_editor, p1, p2, extra):
 '''Private commit wrapper for backwards compatibility.'''
 try:

branch	0.9.2compat
changeset 343	f5927e5574e6
parent 339	98336da24c5e
child 348	63ebc698d06b