test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:2a1ab2f6559c
+:64fc3d450713
 # keyword.py - $Keyword$ expansion for Mercurial
 #
-# Copyright 2007-2010 Christian Ebert <blacktrash@gmx.net>
+# Copyright 2007-2012 Christian Ebert <blacktrash@gmx.net>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 #
 # $Id$
 def __init__(self, ui, repo, inc, exc):
 self.ui = ui
 self.repo = repo
 self.match = match.match(repo.root, '', [], inc, exc)
 self.restrict = kwtools['hgcmd'] in restricted.split()
-self.record = False
+self.postcommit = False
 kwmaps = self.ui.configitems('keywordmaps')
 if kwmaps: # override default templates
 self.templates = dict((k, templater.parsestring(v, False))
 for k, v in kwmaps)
 expansion but are not symbolic links.'''
 return [f for f in cand if self.match(f) and 'l' not in ctx.flags(f)]
 def overwrite(self, ctx, candidates, lookup, expand, rekw=False):
 '''Overwrites selected files expanding/shrinking keywords.'''
-if self.restrict or lookup or self.record: # exclude kw_copy
+if self.restrict or lookup or self.postcommit: # exclude kw_copy
 candidates = self.iskwfile(candidates, ctx)
 if not candidates:
 return
 kwcmd = self.restrict and lookup # kwexpand/kwshrink
 if self.restrict or expand and lookup:
 fp = self.repo.wopener(f, "wb", atomictemp=True)
 fp.write(data)
 fp.close()
 if kwcmd:
 self.repo.dirstate.normal(f)
-elif self.record:
+elif self.postcommit:
 self.repo.dirstate.normallookup(f)
 def shrink(self, fname, text):
 '''Returns text with all keyword substitutions removed.'''
 if self.match(fname) and not util.binary(text):
 del self.commitctx
 def kwcommitctx(self, ctx, error=False):
 n = super(kwrepo, self).commitctx(ctx, error)
 # no lock needed, only called from repo.commit() which already locks
-if not kwt.record:
+if not kwt.postcommit:
 restrict = kwt.restrict
 kwt.restrict = True
 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
 False, True)
 kwt.restrict = restrict
 def kwweb_skip(orig, web, req, tmpl):
 '''Wraps webcommands.x turning off keyword expansion.'''
 kwt.match = util.never
 return orig(web, req, tmpl)
+def kw_amend(orig, ui, repo, commitfunc, old, extra, pats, opts):
+'''Wraps cmdutil.amend expanding keywords after amend.'''
+wlock = repo.wlock()
+try:
+kwt.postcommit = True
+newid = orig(ui, repo, commitfunc, old, extra, pats, opts)
+if newid != old.node():
+ctx = repo[newid]
+kwt.restrict = True
+kwt.overwrite(ctx, ctx.files(), False, True)
+kwt.restrict = False
+return newid
+finally:
+wlock.release()
 def kw_copy(orig, ui, repo, pats, opts, rename=False):
 '''Wraps cmdutil.copy so that copy/rename destinations do not
 contain expanded keywords.
 Note that the source of a regular file destination may also be a
 symlink:
 hg cp sym x                -> x is symlink
 cp sym x; hg cp -A sym x   -> x is file (maybe expanded keywords)
 For the latter we have to follow the symlink to find out whether its
 target is configured for expansion and we therefore must unexpand the
 keywords in the destination.'''
-orig(ui, repo, pats, opts, rename)
+wlock = repo.wlock()
-if opts.get('dry_run'):
+try:
-return
+orig(ui, repo, pats, opts, rename)
-wctx = repo[None]
+if opts.get('dry_run'):
-cwd = repo.getcwd()
+return
+wctx = repo[None]
-def haskwsource(dest):
+cwd = repo.getcwd()
-'''Returns true if dest is a regular file and configured for
-expansion or a symlink which points to a file configured for
+def haskwsource(dest):
-expansion. '''
+'''Returns true if dest is a regular file and configured for
-source = repo.dirstate.copied(dest)
+expansion or a symlink which points to a file configured for
-if 'l' in wctx.flags(source):
+expansion. '''
-source = scmutil.canonpath(repo.root, cwd,
+source = repo.dirstate.copied(dest)
-os.path.realpath(source))
+if 'l' in wctx.flags(source):
-return kwt.match(source)
+source = scmutil.canonpath(repo.root, cwd,
+os.path.realpath(source))
-candidates = [f for f in repo.dirstate.copies() if
+return kwt.match(source)
-'l' not in wctx.flags(f) and haskwsource(f)]
-kwt.overwrite(wctx, candidates, False, False)
+candidates = [f for f in repo.dirstate.copies() if
+'l' not in wctx.flags(f) and haskwsource(f)]
+kwt.overwrite(wctx, candidates, False, False)
+finally:
+wlock.release()
 def kw_dorecord(orig, ui, repo, commitfunc, *pats, **opts):
 '''Wraps record.dorecord expanding keywords after recording.'''
 wlock = repo.wlock()
 try:
 # record returns 0 even when nothing has changed
 # therefore compare nodes before and after
-kwt.record = True
+kwt.postcommit = True
 ctx = repo['.']
 wstatus = repo[None].status()
 ret = orig(ui, repo, commitfunc, *pats, **opts)
 recctx = repo['.']
 if ctx != recctx:
 return True
 extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
 extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
 extensions.wrapfunction(patch, 'diff', kw_diff)
+extensions.wrapfunction(cmdutil, 'amend', kw_amend)
 extensions.wrapfunction(cmdutil, 'copy', kw_copy)
 for c in 'annotate changeset rev filediff diff'.split():
 extensions.wrapfunction(webcommands, c, kwweb_skip)
 for name in recordextensions.split():
 try:

branch	stable
changeset 1083	64fc3d450713
parent 1082	2ba350253f76
child 1114	22b300b7a7c1