Expand import * to allow Pyflakes to find problems

hgext/acl.py

@@ -46,7 +46,7 b''
 #   ** = user6
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import bin, short
 from mercurial import util
 import getpass
 

hgext/bugzilla.py

@@ -53,7 +53,7 b''
 #   committer_email = bugzilla_user_name
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import short
 from mercurial import cmdutil, templater, util
 import os, re, time
 

hgext/convert/hg.py

@@ -15,7 +15,7 b''
 
 import os, time
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import bin, hex, nullid
 from mercurial import hg, lock, revlog, util
 
 from common import NoRepo, commit, converter_source, converter_sink

hgext/extdiff.py

@@ -46,7 +46,7 b' pretty fast (at least faster than having'
 '''
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import short
 from mercurial import cmdutil, util, commands
 import os, shlex, shutil, tempfile
 

hgext/fetch.py

@@ -6,7 +6,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import nullid, short
 from mercurial import commands, cmdutil, hg, node, util
 
 def fetch(ui, repo, source='default', **opts):

hgext/imerge.py

@@ -6,7 +6,7 b' imerge - interactive merge'
 '''
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import hex, short
 from mercurial import commands, cmdutil, dispatch, fancyopts
 from mercurial import hg, filemerge, util
 import os, tarfile

hgext/keyword.py

@@ -81,7 +81,7 b" like CVS' $Log$, are not supported. A ke"
 from mercurial import commands, cmdutil, context, dispatch, filelog, revlog
 from mercurial import patch, localrepo, templater, templatefilters, util
 from mercurial.hgweb import webcommands
-from mercurial.node import *
+from mercurial.node import nullid, hex
 from mercurial.i18n import _
 import re, shutil, tempfile, time
 

hgext/notify.py

@@ -66,7 +66,7 b''
 # push changes to, they can manage their own subscriptions.
 
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import bin, short
 from mercurial import patch, cmdutil, templater, util, mail
 import email.Parser, fnmatch, socket, time
 

hgext/patchbomb.py

@@ -69,7 +69,7 b' import email.MIMEMultipart, email.MIMETe'
 import email.Utils, email.Encoders
 from mercurial import cmdutil, commands, hg, mail, ui, patch, util
 from mercurial.i18n import _
-from mercurial.node import *
+from mercurial.node import bin
 
 def patchbomb(ui, repo, *revs, **opts):
     '''send changesets by email

hgext/win32text.py

@@ -24,7 +24,7 b''
 
 from mercurial import util, ui
 from mercurial.i18n import gettext as _
-from mercurial.node import *
+from mercurial.node import bin, short
 import re
 
 # regexp for single LF without CR preceding.

mercurial/archival.py

@@ -6,7 +6,7 b''
 # the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
-from node import *
+from node import hex
 import cStringIO, os, stat, tarfile, time, util, zipfile
 import zlib, gzip
 

mercurial/bundlerepo.py

@@ -10,7 +10,7 b' This software may be used and distribute'
 of the GNU General Public License, incorporated herein by reference.
 """
 
-from node import *
+from node import hex, nullid, short
 from i18n import _
 import changegroup, util, os, struct, bz2, tempfile, mdiff
 import localrepo, changelog, manifest, filelog, revlog

mercurial/changelog.py

@@ -5,7 +5,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from revlog import *
+from node import bin, hex, nullid
+from revlog import revlog
 from i18n import _
 import os, time, util
 

mercurial/cmdutil.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import hex, nullid, nullrev, short
 from i18n import _
 import os, sys, bisect, stat
 import mdiff, bdiff, util, templater, templatefilters, patch, errno

mercurial/commands.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import hex, nullid, nullrev, short
 from i18n import _
 import os, re, sys, urllib
 import hg, util, revlog, bundlerepo, extensions

mercurial/context.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullid, nullrev, short
 from i18n import _
 import ancestor, bdiff, repo, revlog, util, os, errno
 

mercurial/dirstate.py

@@ -7,7 +7,7 b' This software may be used and distribute'
 of the GNU General Public License, incorporated herein by reference.
 """
 
-from node import *
+from node import nullid
 from i18n import _
 import struct, os, time, bisect, stat, strutil, util, re, errno, ignore
 import cStringIO, osutil

mercurial/dispatch.py

@@ -5,7 +5,6 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
 from i18n import _
 import os, sys, atexit, signal, pdb, traceback, socket, errno, shlex, time
 import util, commands, hg, lock, fancyopts, revlog, version, extensions, hook

mercurial/filelog.py

@@ -5,7 +5,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from revlog import *
+from node import bin, nullid
+from revlog import revlog
 import os
 
 class filelog(revlog):

mercurial/filemerge.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullrev
 from i18n import _
 import util, os, tempfile, context, simplemerge, re, filecmp
 

mercurial/hg.py

@@ -6,8 +6,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
-from repo import *
+from node import bin, hex, nullid, nullrev, short
+from repo import NoCapability, RepoError
 from i18n import _
 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
 import errno, lock, os, shutil, util, extensions

mercurial/hgweb/hgweb_mod.py

@@ -7,7 +7,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 import os, mimetypes, re
-from mercurial.node import *
+from mercurial.node import hex, nullid, short
 from mercurial import mdiff, ui, hg, util, archival, patch, hook
 from mercurial import revlog, templater, templatefilters, changegroup
 from common import get_mtime, style_map, paritygen, countgen, get_contact

mercurial/hgweb/protocol.py

@@ -8,7 +8,7 b''
 import cStringIO, zlib, bz2, tempfile, errno, os, sys
 from mercurial import util, streamclone
 from mercurial.i18n import gettext as _
-from mercurial.node import *
+from mercurial.node import bin, hex
 from mercurial import changegroup as changegroupmod
 from common import HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
 

mercurial/httprepo.py

@@ -6,8 +6,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
-from remoterepo import *
+from node import bin, hex
+from remoterepo import remoterepository
 from i18n import _
 import repo, os, urllib, urllib2, urlparse, zlib, util, httplib
 import errno, keepalive, tempfile, socket, changegroup

mercurial/localrepo.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import bin, hex, nullid, nullrev, short
 from i18n import _
 import repo, changegroup
 import changelog, dirstate, filelog, manifest, context, weakref

mercurial/manifest.py

@@ -5,7 +5,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from revlog import *
+from node import bin, hex, nullid
+from revlog import revlog, RevlogError
 from i18n import _
 import array, bisect, struct, mdiff
 

mercurial/merge.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullid, nullrev
 from i18n import _
 import errno, util, os, heapq, filemerge
 

mercurial/patch.py

@@ -7,7 +7,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
-from node import *
+from node import hex, nullid, short
 import base85, cmdutil, mdiff, util, context, revlog, diffhelpers
 import cStringIO, email.Parser, os, popen2, re, sha, errno
 import sys, tempfile, zlib

mercurial/repair.py

@@ -7,7 +7,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 import changegroup, os
-from node import *
+from node import nullrev, short
 
 def _bundle(repo, bases, heads, node, suffix, extranodes=None):
     """create a bundle with the specified revisions as a backup"""

mercurial/revlog.py

@@ -10,7 +10,7 b' This software may be used and distribute'
 of the GNU General Public License, incorporated herein by reference.
 """
 
-from node import *
+from node import bin, hex, nullid, nullrev, short
 from i18n import _
 import binascii, changegroup, errno, ancestor, mdiff, os
 import sha, struct, util, zlib

mercurial/sshrepo.py

@@ -5,8 +5,8 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
-from remoterepo import *
+from node import bin, hex
+from remoterepo import remotelock, remoterepository
 from i18n import _
 import repo, os, re, stat, util
 

mercurial/sshserver.py

@@ -7,7 +7,7 b''
 # of the GNU General Public License, incorporated herein by reference.
 
 from i18n import _
-from node import *
+from node import bin, hex
 import os, streamclone, sys, tempfile, util, hook
 
 class sshserver(object):

mercurial/verify.py

@@ -5,7 +5,7 b''
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from node import *
+from node import nullid, short
 from i18n import _
 import revlog