test: comparison hgkw/keyword.py

equal deleted inserted replaced

-:0b77aa7ff437
+:772628d1ccb5
 '''Returns true if path matches [keyword] pattern
 and is not a symbolic link.
 Caveat: localrepository._link fails on Windows.'''
 return self.matcher(path) and not islink(path)
-def overwrite(self, node, expand, files):
+def overwrite(self, node, expand, candidates):
 '''Overwrites selected files expanding/shrinking keywords.'''
 # repo[changeid] introduced in f6c00b17387c
 if node is not None:     # commit
 try:
 ctx = self.repo[node]
 except TypeError:
 ctx = self.repo.changectx(node)
 mf = ctx.manifest()
-files = [f for f in ctx.files() if f in mf]
+candidates = [f for f in ctx.files() if f in mf]
-notify = self.ui.debug
 else:                    # kwexpand/kwshrink
 try:
 ctx = self.repo['.']
 except TypeError:
 ctx = self.repo.changectx()
 mf = ctx.manifest()
-notify = self.ui.note
 if hasattr(ctx, 'flags'):
 # 51b0e799352f
 islink = lambda p: 'l' in ctx.flags(p)
 else:
 islink = mf.linkf
-candidates = [f for f in files if self.iskwfile(f, islink)]
+candidates = [f for f in candidates if self.iskwfile(f, islink)]
 if candidates:
 self.restrict = True # do not expand when reading
-candidates.sort()
+msg = (expand and _('overwriting %s expanding keywords\n')
-action = expand and 'expanding' or 'shrinking'
+or _('overwriting %s shrinking keywords\n'))
 overwritten = []
 for f in candidates:
 fp = self.repo.file(f)
 data = fp.read(mf[f])
 if not textsafe(data):
 data, found = self.substitute(data, f, changenode,
 self.re_kw.subn)
 else:
 found = self.re_kw.search(data)
 if found:
-notify(_('overwriting %s %s keywords\n') % (f, action))
+self.ui.note(msg % f)
 self.repo.wwrite(f, data, mf.flags(f))
 overwritten.append(f)
 _normal(self.repo, overwritten)
 self.restrict = False
 '''print [keywordmaps] configuration and an expansion example
 Show current, custom, or default keyword template maps and their
 expansions.
-Extend current configuration by specifying maps as arguments and
+Extend the current configuration by specifying maps as arguments
-optionally by reading from an additional hgrc file.
+and using -f/--rcfile to source an external hgrc file.
-Override current keyword template maps with "default" option.
+Use -d/--default to disable current configuration.
 '''
 def demoitems(section, items):
 items.sort()
 ui.write('[%s]\n' % section)
 for k, v in items:
 ui.write('%s = %s\n' % (k, v))
-msg = 'hg keyword config and expansion example'
 kwstatus = 'current'
 fn = 'demo.txt'
-branchname = 'demobranch'
 tmpdir = tempfile.mkdtemp('', 'kwdemo.')
 ui.note(_('creating temporary repository at %s\n') % tmpdir)
 repo = localrepo.localrepository(ui, tmpdir, True)
 ui.setconfig('keyword', fn, '')
+uikwmaps = ui.configitems('keywordmaps')
 if args or opts.get('rcfile'):
-kwstatus = 'custom'
+ui.status(_('\n\tconfiguration using custom keyword template maps\n'))
-if opts.get('rcfile'):
+if uikwmaps:
-ui.readconfig(opts.get('rcfile'))
+ui.status(_('\textending current template maps\n'))
-if opts.get('default'):
+if opts.get('default') or not uikwmaps:
-kwstatus = 'default'
+ui.status(_('\toverriding default template maps\n'))
+if opts.get('rcfile'):
+ui.readconfig(opts.get('rcfile'))
+if args:
+# simulate hgrc parsing
+rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
+fp = repo.opener('hgrc', 'w')
+fp.writelines(rcmaps)
+fp.close()
+ui.readconfig(repo.join('hgrc'))
+kwmaps = dict(ui.configitems('keywordmaps'))
+elif opts.get('default'):
+ui.status(_('\n\tconfiguration using default keyword template maps\n'))
 kwmaps = kwtemplater.templates
-if ui.configitems('keywordmaps'):
+if uikwmaps:
-# override maps from optional rcfile
+ui.status(_('\tdisabling current template maps\n'))
 for k, v in kwmaps.iteritems():
 ui.setconfig('keywordmaps', k, v)
-elif args:
+else:
-# simulate hgrc parsing
+ui.status(_('\n\tconfiguration using current keyword template maps\n'))
-rcmaps = ['[keywordmaps]\n'] + [a + '\n' for a in args]
+kwmaps = dict(uikwmaps) or kwtemplater.templates
-fp = repo.opener('hgrc', 'w')
-fp.writelines(rcmaps)
-fp.close()
-ui.readconfig(repo.join('hgrc'))
-if not opts.get('default'):
-kwmaps = dict(ui.configitems('keywordmaps')) or kwtemplater.templates
 reposetup(ui, repo)
 for k, v in ui.configitems('extensions'):
 if k.endswith('keyword'):
 extension = '%s = %s' % (k, v)
 break
 kwkeys = kwmaps.keys()
 kwkeys.sort()
 keywords = '$' + '$\n$'.join(kwkeys) + '$\n'
 repo.wopener(fn, 'w').write(keywords)
 repo.add([fn])
-path = repo.wjoin(fn)
+ui.note(_('\nkeywords written to %s:\n') % fn)
-ui.note(_('\n%s keywords written to %s:\n') % (kwstatus, path))
 ui.note(keywords)
-ui.note('\nhg -R "%s" branch "%s"\n' % (tmpdir, branchname))
+try:
-# silence branch command if not verbose
+repo.dirstate.setbranch('demobranch')
-quiet = ui.quiet
+except AttributeError:
-ui.quiet = not ui.verbose
+# before 7e1c8a565a4f
-commands.branch(ui, repo, branchname)
+repo.opener('branch', 'w').write('demobranch\n')
-ui.quiet = quiet
 for name, cmd in ui.configitems('hooks'):
 if name.split('.', 1)[0].find('commit') > -1:
 repo.ui.setconfig('hooks', name, '')
-ui.note(_('unhooked all commit hooks\n'))
+msg = _('hg keyword configuration and expansion example')
-ui.note('hg -R "%s" ci -m "%s"\n' % (tmpdir, msg))
+ui.note("hg ci -m '%s'\n" % msg)
 repo.commit(text=msg)
-fmt = ui.verbose and ' in %s' % path or ''
+ui.status(_('\n\tkeywords expanded\n'))
-ui.status(_('\n\t%s keywords expanded%s\n') % (kwstatus, fmt))
 ui.write(repo.wread(fn))
-ui.debug('\nremoving temporary repository %s\n' % tmpdir)
 shutil.rmtree(tmpdir, ignore_errors=True)
 def expand(ui, repo, *pats, **opts):
 '''expand keywords in the working directory
 expansion.
 See "hg help keyword" on how to construct patterns both for
 inclusion and exclusion of files.
-Use -u/--untracked to list untracked files as well.
 With -A/--all and -v/--verbose the codes used to show the status
 of files are:
 K = keyword expansion candidate
 k = keyword expansion candidate (not tracked)
 I = ignored
 i = ignored (not tracked)
 '''

branch	0.9.2compat
changeset 704	772628d1ccb5
parent 698	0b77aa7ff437
child 984	a4ea5c2d3ff3