This is an archive of the discontinued Mercurial Phabricator instance.

Differential D297

tests: update duplicateoptions test to use bytestrings everywhere
ClosedPublic

Authored by durin42 on Aug 9 2017, 10:24 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5b2f331d0a33: tests: update duplicateoptions test to use bytestrings everywhere
Summary

Test now passes on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 9 2017, 10:24 AM
Closed by commit rHG5b2f331d0a33: tests: update duplicateoptions test to use bytestrings everywhere (authored by durin42). · Explain WhyAug 9 2017, 11:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-duplicateoptions.py (12 lines)

Diff 691

tests/test-duplicateoptions.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import os import os
from mercurial import ( from mercurial import (
commands, commands,
extensions, extensions,
ui as uimod, ui as uimod,
) )
ignore = {'highlight', 'win32text', 'factotum'} ignore = {b'highlight', b'win32text', b'factotum'}
if os.name != 'nt': if os.name != 'nt':
ignore.add('win32mbcs') ignore.add(b'win32mbcs')
disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore] disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]
hgrc = open(os.environ["HGRCPATH"], 'w') hgrc = open(os.environ["HGRCPATH"], 'wb')
hgrc.write('[extensions]\n') hgrc.write(b'[extensions]\n')
for ext in disabled: for ext in disabled:
hgrc.write(ext + '=\n') hgrc.write(ext + b'=\n')
hgrc.close() hgrc.close()
u = uimod.ui.load() u = uimod.ui.load()
extensions.loadall(u) extensions.loadall(u)
globalshort = set() globalshort = set()
globallong = set() globallong = set()
for option in commands.globalopts: for option in commands.globalopts:
option[0] and globalshort.add(option[0]) option[0] and globalshort.add(option[0])
option[1] and globallong.add(option[1]) option[1] and globallong.add(option[1])
for cmd, entry in commands.table.iteritems(): for cmd, entry in commands.table.items():
seenshort = globalshort.copy() seenshort = globalshort.copy()
seenlong = globallong.copy() seenlong = globallong.copy()
for option in entry[1]: for option in entry[1]:
if (option[0] and option[0] in seenshort) or \ if (option[0] and option[0] in seenshort) or \
(option[1] and option[1] in seenlong): (option[1] and option[1] in seenlong):
print("command '" + cmd + "' has duplicate option " + str(option)) print("command '" + cmd + "' has duplicate option " + str(option))
seenshort.add(option[0]) seenshort.add(option[0])
seenlong.add(option[1]) seenlong.add(option[1])