summaryrefslogtreecommitdiff
path: root/tests/test-duplicateoptions.py
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2011-10-01 20:49:36 +0000
committerLorry <lorry@roadtrain.codethink.co.uk>2012-09-27 13:27:51 +0000
commit921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch)
tree3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-duplicateoptions.py
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-master.tar.gz
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-duplicateoptions.py')
-rw-r--r--tests/test-duplicateoptions.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/test-duplicateoptions.py b/tests/test-duplicateoptions.py
index 22964c4..43b4b87 100644
--- a/tests/test-duplicateoptions.py
+++ b/tests/test-duplicateoptions.py
@@ -1,7 +1,7 @@
import os
from mercurial import ui, commands, extensions
-ignore = set(['highlight', 'inotify', 'win32text', 'factotum'])
+ignore = set(['highlight', 'inotify', 'win32text'])
if os.name != 'nt':
ignore.add('win32mbcs')
@@ -19,15 +19,9 @@ hgrc.close()
u = ui.ui()
extensions.loadall(u)
-globalshort = set()
-globallong = set()
-for option in commands.globalopts:
- option[0] and globalshort.add(option[0])
- option[1] and globallong.add(option[1])
-
for cmd, entry in commands.table.iteritems():
- seenshort = globalshort.copy()
- seenlong = globallong.copy()
+ seenshort = set()
+ seenlong = set()
for option in entry[1]:
if (option[0] and option[0] in seenshort) or \
(option[1] and option[1] in seenlong):