# HG changeset patch # User Simon Heimberg # Date 1316012793 -7200 # Node ID b1f49efeab65b70124ea0e1a15393dc3812a1997 # Parent edf7ae547b0e475936831fb8459c850d13b2d310 test: test for options duplicate with global options issue2995 should not happen anymore diff -r edf7ae547b0e -r b1f49efeab65 tests/test-duplicateoptions.py --- a/tests/test-duplicateoptions.py Wed Sep 14 14:37:10 2011 -0500 +++ b/tests/test-duplicateoptions.py Wed Sep 14 17:06:33 2011 +0200 @@ -19,9 +19,15 @@ 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 = set() - seenlong = set() + seenshort = globalshort.copy() + seenlong = globallong.copy() for option in entry[1]: if (option[0] and option[0] in seenshort) or \ (option[1] and option[1] in seenlong):