test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:d11a6a561253
+:9d01f9cab5e2
 nokwcommands = ('add addremove annotate bundle copy export grep incoming init'
 ' log outgoing push rename tip verify convert email glog')
 # hg commands that trigger expansion only when writing to working dir,
 # not when reading filelog, and unexpand when reading from working dir
-restricted = 'merge record qrecord resolve transplant'
+restricted = 'merge kwexpand kwshrink record qrecord resolve transplant'
 # commands using dorecord
 recordcommands = 'record qrecord'
 # names of extensions using dorecord
 recordextensions = 'record'
 'LastChangedDate': '{date|svnisodate}',
 })
 templates.update(kwsets[ui.configbool('keywordset', 'svn')])
 return templates
+def _shrinktext(text, subfunc):
+'''Helper for keyword expansion removal in text.
+Depending on subfunc also returns number of substitutions.'''
+return subfunc(r'$\1$', text)
 class kwtemplater(object):
 '''
 Sets up keyword templates, corresponding keyword regex, and
 provides keyword substitution functions.
 '''
 '''Returns true if path matches [keyword] pattern
 and is not a symbolic link.
 Caveat: localrepository._link fails on Windows.'''
 return self.match(path) and not 'l' in flagfunc(path)
-def overwrite(self, ctx, candidates, iswctx, expand, changed):
+def overwrite(self, ctx, candidates, lookup, expand):
 '''Overwrites selected files expanding/shrinking keywords.'''
-if changed is not None:
-candidates = [f for f in candidates if f in changed]
 candidates = [f for f in candidates if self.iskwfile(f, ctx.flags)]
-if candidates:
+if not candidates:
-restrict = self.restrict
+return
-self.restrict = True        # do not expand when reading
+commit = self.restrict and not lookup
-rollback = kwtools['hgcmd'] == 'rollback'
+if self.restrict or expand and lookup:
 mf = ctx.manifest()
-msg = (expand and _('overwriting %s expanding keywords\n')
+fctx = ctx
-or _('overwriting %s shrinking keywords\n'))
+msg = (expand and _('overwriting %s expanding keywords\n')
-for f in candidates:
+or _('overwriting %s shrinking keywords\n'))
-if not self.record and not rollback:
+for f in candidates:
-data = self.repo.file(f).read(mf[f])
+if self.restrict:
-else:
+data = self.repo.file(f).read(mf[f])
-data = self.repo.wread(f)
+else:
-if util.binary(data):
+data = self.repo.wread(f)
-continue
+if util.binary(data):
-if expand:
+continue
-if iswctx:
+if expand:
-ctx = self.repo.filectx(f, fileid=mf[f]).changectx()
+if lookup:
-data, found = self.substitute(data, f, ctx,
+fctx = self.repo.filectx(f, fileid=mf[f]).changectx()
-self.re_kw.subn)
+data, found = self.substitute(data, f, fctx, self.re_kw.subn)
-else:
+elif self.restrict:
 found = self.re_kw.search(data)
-if found:
+else:
-self.ui.note(msg % f)
+data, found = _shrinktext(data, self.re_kw.subn)
-self.repo.wwrite(f, data, mf.flags(f))
+if found:
-if iswctx and not rollback:
+self.ui.note(msg % f)
-self.repo.dirstate.normal(f)
+self.repo.wwrite(f, data, ctx.flags(f))
-elif self.record:
+if commit:
-self.repo.dirstate.normallookup(f)
+self.repo.dirstate.normal(f)
-self.restrict = restrict
+elif self.record:
+self.repo.dirstate.normallookup(f)
-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 self.match(fname) and not util.binary(text):
-return self.shrinktext(text)
+return _shrinktext(text, self.re_kw.sub)
 return text
 def shrinklines(self, fname, lines):
 '''Returns lines with keyword substitutions removed.'''
 if self.match(fname):
 text = ''.join(lines)
 if not util.binary(text):
-return self.shrinktext(text).splitlines(True)
+return _shrinktext(text, self.re_kw.sub).splitlines(True)
 return lines
 def wread(self, fname, data):
 '''If in restricted mode returns data read from wdir with
 keyword substitutions removed.'''
 try:
 status = _status(ui, repo, kwt, *pats, **opts)
 modified, added, removed, deleted, unknown, ignored, clean = status
 if modified or added or removed or deleted:
 raise util.Abort(_('outstanding uncommitted changes'))
-kwt.overwrite(wctx, clean, True, expand, None)
+kwt.overwrite(wctx, clean, True, expand)
 finally:
 wlock.release()
 def demo(ui, repo, *args, **opts):
 '''print [keywordmaps] configuration and an expansion example
 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:
+restrict = kwt.restrict
+kwt.restrict = True
 kwt.overwrite(self[n], sorted(ctx.added() + ctx.modified()),
-False, True, None)
+False, True)
+kwt.restrict = restrict
 return n
 def rollback(self, dryrun=False):
 wlock = repo.wlock()
 try:
 changed = self['.'].files()
 ret = super(kwrepo, self).rollback(dryrun)
 if not dryrun:
 ctx = self['.']
 modified, added = self[None].status()[:2]
-kwt.overwrite(ctx, added, True, False, changed)
+modified = [f for f in modified if f in changed]
-kwt.overwrite(ctx, modified, True, True, changed)
+added = [f for f in added if f in changed]
+kwt.overwrite(ctx, added, True, False)
+kwt.overwrite(ctx, modified, True, True)
 return ret
 finally:
 wlock.release()
 # monkeypatches
 # therefore compare nodes before and after
 ctx = repo['.']
 ret = orig(ui, repo, commitfunc, *pats, **opts)
 recordctx = repo['.']
 if ctx != recordctx:
-kwt.overwrite(recordctx, recordctx.files(),
+candidates = [f for f in recordctx.files() if f in recordctx]
-False, True, recordctx)
+kwt.restrict = False
+kwt.overwrite(recordctx, candidates, False, True)
+kwt.restrict = True
 return ret
 finally:
 wlock.release()
 repo.__class__ = kwrepo

changeset 813	9d01f9cab5e2
parent 812	d11a6a561253
child 814	0588121c815b