diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -8,8 +8,8 @@ from node import hex, nullid, nullrev, short from lock import release from i18n import _, gettext -import os, re, sys, subprocess, difflib, time, tempfile -import hg, util, revlog, bundlerepo, extensions, copies, context, error +import os, re, sys, difflib, time, tempfile +import hg, util, revlog, bundlerepo, extensions, copies, error import patch, help, mdiff, url, encoding import archival, changegroup, cmdutil, sshserver, hbisect from hgweb import server diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -9,7 +9,7 @@ from node import nullid from i18n import _ import util, ignore, osutil, parsers import struct, os, stat, errno -import cStringIO, sys +import cStringIO _unknown = ('?', 0, 0, 0) _format = ">cllll" diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -7,7 +7,7 @@ from i18n import gettext, _ import sys, os -import extensions, util +import extensions def moduledoc(file): diff --git a/mercurial/tags.py b/mercurial/tags.py --- a/mercurial/tags.py +++ b/mercurial/tags.py @@ -10,7 +10,6 @@ # Eventually, it could take care of updating (adding/removing/moving) # tags too. -import os from node import nullid, bin, hex, short from i18n import _ import encoding