equal
deleted
inserted
replaced
505 else: |
505 else: |
506 ui.status(_(b'\n\tconfiguration using default cvs keywordset\n')) |
506 ui.status(_(b'\n\tconfiguration using default cvs keywordset\n')) |
507 kwmaps = _defaultkwmaps(ui) |
507 kwmaps = _defaultkwmaps(ui) |
508 if uikwmaps: |
508 if uikwmaps: |
509 ui.status(_(b'\tdisabling current template maps\n')) |
509 ui.status(_(b'\tdisabling current template maps\n')) |
510 for k, v in kwmaps.iteritems(): |
510 for k, v in pycompat.iteritems(kwmaps): |
511 ui.setconfig(b'keywordmaps', k, v, b'keyword') |
511 ui.setconfig(b'keywordmaps', k, v, b'keyword') |
512 else: |
512 else: |
513 ui.status(_(b'\n\tconfiguration using current keyword template maps\n')) |
513 ui.status(_(b'\n\tconfiguration using current keyword template maps\n')) |
514 if uikwmaps: |
514 if uikwmaps: |
515 kwmaps = dict(uikwmaps) |
515 kwmaps = dict(uikwmaps) |
519 uisetup(ui) |
519 uisetup(ui) |
520 reposetup(ui, repo) |
520 reposetup(ui, repo) |
521 ui.writenoi18n(b'[extensions]\nkeyword =\n') |
521 ui.writenoi18n(b'[extensions]\nkeyword =\n') |
522 demoitems(b'keyword', ui.configitems(b'keyword')) |
522 demoitems(b'keyword', ui.configitems(b'keyword')) |
523 demoitems(b'keywordset', ui.configitems(b'keywordset')) |
523 demoitems(b'keywordset', ui.configitems(b'keywordset')) |
524 demoitems(b'keywordmaps', kwmaps.iteritems()) |
524 demoitems(b'keywordmaps', pycompat.iteritems(kwmaps)) |
525 keywords = b'$' + b'$\n$'.join(sorted(kwmaps.keys())) + b'$\n' |
525 keywords = b'$' + b'$\n$'.join(sorted(kwmaps.keys())) + b'$\n' |
526 repo.wvfs.write(fn, keywords) |
526 repo.wvfs.write(fn, keywords) |
527 repo[None].add([fn]) |
527 repo[None].add([fn]) |
528 ui.note(_(b'\nkeywords written to %s:\n') % fn) |
528 ui.note(_(b'\nkeywords written to %s:\n') % fn) |
529 ui.note(keywords) |
529 ui.note(keywords) |