diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py --- a/hgext/bookmarks.py +++ b/hgext/bookmarks.py @@ -30,7 +30,7 @@ branching. from mercurial.i18n import _ from mercurial.node import nullid, nullrev, hex, short -from mercurial import util, commands, localrepo, repair, extensions +from mercurial import util, commands, repair, extensions import os def write(repo): diff --git a/hgext/color.py b/hgext/color.py --- a/hgext/color.py +++ b/hgext/color.py @@ -65,7 +65,7 @@ Default effects may be overridden from t import os, sys -from mercurial import cmdutil, commands, extensions, error +from mercurial import cmdutil, commands, extensions from mercurial.i18n import _ # start and stop parameters for effects diff --git a/hgext/inotify/__init__.py b/hgext/inotify/__init__.py --- a/hgext/inotify/__init__.py +++ b/hgext/inotify/__init__.py @@ -11,7 +11,6 @@ # todo: socket permissions from mercurial.i18n import _ -from mercurial import cmdutil, util import server from client import client, QueryFailed diff --git a/hgext/inotify/linuxserver.py b/hgext/inotify/linuxserver.py --- a/hgext/inotify/linuxserver.py +++ b/hgext/inotify/linuxserver.py @@ -8,7 +8,6 @@ from mercurial.i18n import _ from mercurial import osutil, util -import common import server import errno, os, select, stat, sys, time diff --git a/hgext/progress.py b/hgext/progress.py --- a/hgext/progress.py +++ b/hgext/progress.py @@ -39,7 +39,6 @@ changed by adding either - which wo or + for the first num characters. """ -import math import sys import time diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -7,7 +7,7 @@ from node import hex, nullid, nullrev, short from i18n import _ -import os, sys, errno, re, glob, tempfile, time +import os, sys, errno, re, glob, tempfile import mdiff, bdiff, util, templater, patch, error, encoding, templatekw import match as _match diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -5,7 +5,6 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -from i18n import _ import util import heapq