# HG changeset patch # User mpm@selenic.com # Date 1125047015 25200 # Node ID fed8d078840bf6626bd6b0ec30e8e0c25b38e648 # Parent e453d2053b2e8b4bffb6a19251dee50340cefdfc Fix set type usage for Python 2.3 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -9,7 +9,7 @@ from demandload import demandload demandload(globals(), "os re sys signal shutil") demandload(globals(), "fancyopts ui hg util lock") demandload(globals(), "fnmatch hgweb mdiff random signal time traceback") -demandload(globals(), "errno socket version struct atexit") +demandload(globals(), "errno socket version struct atexit sets") class UnknownCommand(Exception): """Exception raised if command is not in the command table.""" @@ -841,7 +841,7 @@ def grep(ui, repo, pattern = None, *pats prev = {} def display(fn, rev, states, prevstates): - diff = list(set(states).symmetric_difference(set(prevstates))) + diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates))) diff.sort(lambda x, y: cmp(x.linenum, y.linenum)) for l in diff: if incrementing: