[PATCH 2 of 3] absolute imports for mercurial modules
Simon Heimberg
simohe at besonet.ch
Fri May 1 15:28:31 CDT 2009
# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1240936971 -7200
# Node ID da8bb0eb1d2eaacd838399d98d4e6bc764571685
# Parent 1c64876cb225e06807c7ec9d00d26e08564fccbc
absolute imports for mercurial modules
in py3k, modules must be imported absolute or explicit relative
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/archival.py
--- a/mercurial/archival.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/archival.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-from node import hex
-import util
+from mercurial.i18n import _
+from mercurial.node import hex
+from mercurial import util
import cStringIO, os, stat, tarfile, time, zipfile
import zlib, gzip
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/bundlerepo.py Die Apr 28 18:42:51 2009 +0200
@@ -11,11 +11,11 @@
were part of the actual repository.
"""
-from node import nullid
-from i18n import _
+from mercurial.node import nullid
+from mercurial.i18n import _
import os, struct, bz2, zlib, tempfile, shutil
-import changegroup, util, mdiff
-import localrepo, changelog, manifest, filelog, revlog, error
+from mercurial import changegroup, util, mdiff
+from mercurial import localrepo, changelog, manifest, filelog, revlog, error
class bundlerevlog(revlog.revlog):
def __init__(self, opener, indexfile, bundlefile,
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/changegroup.py
--- a/mercurial/changegroup.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/changegroup.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import util
+from mercurial.i18n import _
+from mercurial import util
import struct, os, bz2, zlib, tempfile
def getchunk(source):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/changelog.py
--- a/mercurial/changelog.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/changelog.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import bin, hex, nullid
-from i18n import _
-import util, error, revlog, encoding
+from mercurial.node import bin, hex, nullid
+from mercurial.i18n import _
+from mercurial import util, error, revlog, encoding
def _string_escape(text):
"""
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/cmdutil.py
--- a/mercurial/cmdutil.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/cmdutil.py Die Apr 28 18:42:51 2009 +0200
@@ -5,11 +5,11 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import hex, nullid, nullrev, short
-from i18n import _
+from mercurial.node import hex, nullid, nullrev, short
+from mercurial.i18n import _
import os, sys, bisect, stat, errno
-import mdiff, bdiff, util, templater, templatefilters, patch, error, encoding
-import match as _match
+from mercurial import mdiff, bdiff, util, templater, templatefilters, patch, error, encoding
+from mercurial import match as _match
revrangesep = ':'
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/commands.py
--- a/mercurial/commands.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/commands.py Die Apr 28 18:42:51 2009 +0200
@@ -5,15 +5,15 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import hex, nullid, nullrev, short
-from lock import release
-from i18n import _, gettext
+from mercurial.node import hex, nullid, nullrev, short
+from mercurial.lock import release
+from mercurial.i18n import _, gettext
import os, re, sys, textwrap, difflib, time
-import hg, util, revlog, bundlerepo, extensions, copies, context, error
-import patch, help, mdiff, tempfile, url, encoding
-import archival, changegroup, cmdutil, sshserver, hbisect
-from hgweb import server
-import merge as merge_
+from mercurial import hg, util, revlog, bundlerepo, extensions, copies, context, error
+from mercurial import patch, help, mdiff, tempfile, url, encoding
+from mercurial import archival, changegroup, cmdutil, sshserver, hbisect
+from mercurial.hgweb import server
+from mercurial import merge as merge_
# Commands start here, listed alphabetically
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/config.py
--- a/mercurial/config.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/config.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import error
+from mercurial.i18n import _
+from mercurial import error
import re, os
class sortdict(dict):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/context.py
--- a/mercurial/context.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/context.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import nullid, nullrev, short, hex
-from i18n import _
-import ancestor, bdiff, error, util
+from mercurial.node import nullid, nullrev, short, hex
+from mercurial.i18n import _
+from mercurial import ancestor, bdiff, error, util
import os, errno
propertycache = util.propertycache
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/copies.py
--- a/mercurial/copies.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/copies.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import util
+from mercurial.i18n import _
+from mercurial import util
import heapq
def _nonoverlap(d1, d2, d3):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/dirstate.py
--- a/mercurial/dirstate.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/dirstate.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import nullid
-from i18n import _
-import util, ignore, osutil, parsers
+from mercurial.node import nullid
+from mercurial.i18n import _
+from mercurial import util, ignore, osutil, parsers
import struct, os, stat, errno
import cStringIO, sys
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/dispatch.py
--- a/mercurial/dispatch.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/dispatch.py Die Apr 28 18:42:51 2009 +0200
@@ -5,11 +5,11 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
import os, sys, atexit, signal, pdb, socket, errno, shlex, time
-import util, commands, hg, fancyopts, extensions, hook, error
-import cmdutil, encoding
-import ui as _ui
+from mercurial import util, commands, hg, fancyopts, extensions, hook, error
+from mercurial import cmdutil, encoding
+from mercurial import ui as _ui
def run():
"run the command in sys.argv"
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/encoding.py
--- a/mercurial/encoding.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/encoding.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import error
+from mercurial import error
import sys, unicodedata, locale, os
_encodingfixup = {'646': 'ascii', 'ANSI_X3.4-1968': 'ascii'}
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/extensions.py
--- a/mercurial/extensions.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/extensions.py Die Apr 28 18:42:51 2009 +0200
@@ -6,8 +6,8 @@
# GNU General Public License version 2, incorporated herein by reference.
import imp, os
-import util, cmdutil
-from i18n import _
+from mercurial import util, cmdutil
+from mercurial.i18n import _
_extensions = {}
_order = []
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/filelog.py
--- a/mercurial/filelog.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/filelog.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import revlog
+from mercurial import revlog
class filelog(revlog.revlog):
def __init__(self, opener, path):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/filemerge.py
--- a/mercurial/filemerge.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/filemerge.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import short
-from i18n import _
-import util, simplemerge
+from mercurial.node import short
+from mercurial.i18n import _
+from mercurial import util, simplemerge
import os, tempfile, re, filecmp
def _toolstr(ui, tool, part, default=""):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/graphmod.py
--- a/mercurial/graphmod.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/graphmod.py Die Apr 28 18:42:51 2009 +0200
@@ -6,7 +6,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import nullrev
+from mercurial.node import nullrev
def graph(repo, start_rev, stop_rev):
"""incremental revision grapher
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/hbisect.py
--- a/mercurial/hbisect.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/hbisect.py Die Apr 28 18:42:51 2009 +0200
@@ -9,9 +9,9 @@
# GNU General Public License version 2, incorporated herein by reference.
import os
-from i18n import _
-from node import short, hex
-import util
+from mercurial.i18n import _
+from mercurial.node import short, hex
+from mercurial import util
def bisect(changelog, state):
"""find the next node (if any) for testing during a bisect search.
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/help.py
--- a/mercurial/help.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/help.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
helptable = (
(["dates"], _("Date Formats"),
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/hg.py
--- a/mercurial/hg.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/hg.py Die Apr 28 18:42:51 2009 +0200
@@ -6,12 +6,12 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-from lock import release
-import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
-import lock, util, extensions, error
-import merge as _merge
-import verify as _verify
+from mercurial.i18n import _
+from mercurial.lock import release
+from mercurial import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo
+from mercurial import lock, util, extensions, error
+from mercurial import merge as _merge
+from mercurial import verify as _verify
import errno, os, shutil
def _local(path):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/hook.py
--- a/mercurial/hook.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/hook.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
import os, sys
-import extensions, util
+from mercurial import extensions, util
def _pythonhook(ui, repo, name, hname, funcname, args, throw):
'''call python hook. hook is callable object, looked up as
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/httprepo.py
--- a/mercurial/httprepo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/httprepo.py Die Apr 28 18:42:51 2009 +0200
@@ -6,9 +6,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import bin, hex, nullid
-from i18n import _
-import repo, changegroup, statichttprepo, error, url, util
+from mercurial.node import bin, hex, nullid
+from mercurial.i18n import _
+from mercurial import repo, changegroup, statichttprepo, error, url, util
import os, urllib, urllib2, urlparse, zlib, httplib
import errno, socket
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/i18n.py
--- a/mercurial/i18n.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/i18n.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import encoding
+from mercurial import encoding
import gettext, sys, os
# modelled after templater.templatepath:
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/ignore.py
--- a/mercurial/ignore.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/ignore.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import util
+from mercurial.i18n import _
+from mercurial import util
import re
_commentre = None
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/localrepo.py
--- a/mercurial/localrepo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/localrepo.py Die Apr 28 18:42:51 2009 +0200
@@ -5,15 +5,15 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import bin, hex, nullid, nullrev, short
-from i18n import _
-import repo, changegroup
-import changelog, dirstate, filelog, manifest, context
-import lock, transaction, ui, store, encoding
-import util, extensions, hook, error
-import match as match_
-import merge as merge_
-from lock import release
+from mercurial.node import bin, hex, nullid, nullrev, short
+from mercurial.i18n import _
+from mercurial import repo, changegroup
+from mercurial import changelog, dirstate, filelog, manifest, context
+from mercurial import lock, transaction, ui, store, encoding
+from mercurial import util, extensions, hook, error
+from mercurial import match as match_
+from mercurial import merge as merge_
+from mercurial.lock import release
import weakref, stat, errno, os, time, inspect
propertycache = util.propertycache
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/lock.py
--- a/mercurial/lock.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/lock.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import util, error
+from mercurial import util, error
import errno, os, socket, time
import warnings
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/mail.py
--- a/mercurial/mail.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/mail.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import util, encoding
+from mercurial.i18n import _
+from mercurial import util, encoding
import os, smtplib, socket
import email.Header, email.MIMEText, email.Utils
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/manifest.py
--- a/mercurial/manifest.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/manifest.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import mdiff, parsers, util, error, revlog
+from mercurial.i18n import _
+from mercurial import mdiff, parsers, util, error, revlog
import array, struct
class manifestdict(dict):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/match.py
--- a/mercurial/match.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/match.py Die Apr 28 18:42:51 2009 +0200
@@ -5,7 +5,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import util
+from mercurial import util
class _match(object):
def __init__(self, root, cwd, files, mf, ap):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/mdiff.py
--- a/mercurial/mdiff.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/mdiff.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import bdiff, mpatch, util
+from mercurial.i18n import _
+from mercurial import bdiff, mpatch, util
import re, struct
def splitnewlines(text):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/merge.py
--- a/mercurial/merge.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/merge.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import nullid, nullrev, hex, bin
-from i18n import _
-import util, filemerge, copies
+from mercurial.node import nullid, nullrev, hex, bin
+from mercurial.i18n import _
+from mercurial import util, filemerge, copies
import errno, os, shutil
class mergestate(object):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/patch.py
--- a/mercurial/patch.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/patch.py Die Apr 28 18:42:51 2009 +0200
@@ -6,9 +6,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-from node import hex, nullid, short
-import base85, cmdutil, mdiff, util, diffhelpers, copies
+from mercurial.i18n import _
+from mercurial.node import hex, nullid, short
+from mercurial import base85, cmdutil, mdiff, util, diffhelpers, copies
import cStringIO, email.Parser, os, re, math
import sys, tempfile, zlib
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/posix.py
--- a/mercurial/posix.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/posix.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import osutil
+from mercurial.i18n import _
+from mercurial import osutil
import os, sys, errno, stat, getpass, pwd, grp
posixfile = file
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/repair.py
--- a/mercurial/repair.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/repair.py Die Apr 28 18:42:51 2009 +0200
@@ -6,9 +6,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import changegroup
-from node import nullrev, short
-from i18n import _
+from mercurial import changegroup
+from mercurial.node import nullrev, short
+from mercurial.i18n import _
import os
def _bundle(repo, bases, heads, node, suffix, extranodes=None):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/repo.py
--- a/mercurial/repo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/repo.py Die Apr 28 18:42:51 2009 +0200
@@ -6,8 +6,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import error
+from mercurial.i18n import _
+from mercurial import error
class repository(object):
def capable(self, name):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/revlog.py
--- a/mercurial/revlog.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/revlog.py Die Apr 28 18:42:51 2009 +0200
@@ -12,9 +12,9 @@
"""
# import stuff from node for others to import from revlog
-from node import bin, hex, nullid, nullrev, short #@UnusedImport
-from i18n import _
-import changegroup, ancestor, mdiff, parsers, error, util
+from mercurial.node import bin, hex, nullid, nullrev, short #@UnusedImport
+from mercurial.i18n import _
+from mercurial import changegroup, ancestor, mdiff, parsers, error, util
import struct, zlib, errno
_pack = struct.pack
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/simplemerge.py
--- a/mercurial/simplemerge.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/simplemerge.py Die Apr 28 18:42:51 2009 +0200
@@ -18,8 +18,8 @@
# mbp: "you know that thing where cvs gives you conflict markers?"
# s: "i hate that."
-from i18n import _
-import util, mdiff
+from mercurial.i18n import _
+from mercurial import util, mdiff
import sys, os
class CantReprocessAndShowBase(Exception):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/sshrepo.py
--- a/mercurial/sshrepo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/sshrepo.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import bin, hex
-from i18n import _
-import repo, util, error
+from mercurial.node import bin, hex
+from mercurial.i18n import _
+from mercurial import repo, util, error
import re
class remotelock(object):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/sshserver.py
--- a/mercurial/sshserver.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/sshserver.py Die Apr 28 18:42:51 2009 +0200
@@ -6,9 +6,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-from node import bin, hex
-import streamclone, util, hook
+from mercurial.i18n import _
+from mercurial.node import bin, hex
+from mercurial import streamclone, util, hook
import os, sys, tempfile
class sshserver(object):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/statichttprepo.py
--- a/mercurial/statichttprepo.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/statichttprepo.py Die Apr 28 18:42:51 2009 +0200
@@ -7,9 +7,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import changelog, byterange, url, error
-import localrepo, manifest, util, store
+from mercurial.i18n import _
+from mercurial import changelog, byterange, url, error
+from mercurial import localrepo, manifest, util, store
import urllib, urllib2, errno
class httprangereader(object):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/store.py
--- a/mercurial/store.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/store.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import osutil, util
+from mercurial.i18n import _
+from mercurial import osutil, util
import os, stat
_sha = util.sha1
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/streamclone.py
--- a/mercurial/streamclone.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/streamclone.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-import util, error
-from i18n import _
+from mercurial import util, error
+from mercurial.i18n import _
class StreamException(Exception):
def __init__(self, code):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/templatefilters.py
--- a/mercurial/templatefilters.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/templatefilters.py Die Apr 28 18:42:51 2009 +0200
@@ -6,7 +6,7 @@
# GNU General Public License version 2, incorporated herein by reference.
import cgi, re, os, time, urllib, textwrap
-import util, templater, encoding
+from mercurial import util, templater, encoding
agescales = [("second", 1),
("minute", 60),
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/templater.py
--- a/mercurial/templater.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/templater.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
import re, sys, os
-import util, config
+from mercurial import util, config
path = ['templates', '../templates']
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/transaction.py
--- a/mercurial/transaction.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/transaction.py Die Apr 28 18:42:51 2009 +0200
@@ -11,7 +11,7 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
import os, errno
class transaction(object):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/ui.py
--- a/mercurial/ui.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/ui.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
+from mercurial.i18n import _
import errno, getpass, os, re, socket, sys, tempfile, traceback
-import config, util, error
+from mercurial import config, util, error
_booleans = {'1': True, 'yes': True, 'true': True, 'on': True,
'0': False, 'no': False, 'false': False, 'off': False}
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/url.py
--- a/mercurial/url.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/url.py Die Apr 28 18:42:51 2009 +0200
@@ -8,8 +8,8 @@
# GNU General Public License version 2, incorporated herein by reference.
import urllib, urllib2, urlparse, httplib, os, re
-from i18n import _
-import keepalive, util
+from mercurial.i18n import _
+from mercurial import keepalive, util
def hidepassword(url):
'''hide user credential in a url string'''
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/util.py
--- a/mercurial/util.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/util.py Die Apr 28 18:42:51 2009 +0200
@@ -13,8 +13,8 @@
hide platform-specific details from the core.
"""
-from i18n import _
-import error, osutil
+from mercurial.i18n import _
+from mercurial import error, osutil
import cStringIO, errno, re, shutil, sys, tempfile, traceback
import os, stat, threading, time, calendar, glob, random
import imp
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/verify.py
--- a/mercurial/verify.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/verify.py Die Apr 28 18:42:51 2009 +0200
@@ -5,9 +5,9 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from node import nullid, short
-from i18n import _
-import revlog, util, error
+from mercurial.node import nullid, short
+from mercurial.i18n import _
+from mercurial import revlog, util, error
def verify(repo):
lock = repo.lock()
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/win32.py
--- a/mercurial/win32.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/win32.py Die Apr 28 18:42:51 2009 +0200
@@ -17,8 +17,8 @@
import errno, os, sys, pywintypes, win32con, win32file, win32process
import cStringIO, winerror
-import osutil, encoding
-import util
+from mercurial import osutil, encoding
+from mercurial import util
from win32com.shell import shell,shellcon
class WinError(Exception):
diff -r 1c64876cb225 -r da8bb0eb1d2e mercurial/windows.py
--- a/mercurial/windows.py Die Apr 28 17:40:46 2009 +0200
+++ b/mercurial/windows.py Die Apr 28 18:42:51 2009 +0200
@@ -5,8 +5,8 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
-from i18n import _
-import osutil, error
+from mercurial.i18n import _
+from mercurial import osutil, error
import errno, msvcrt, os, re, sys
nulldev = 'NUL:'
More information about the Mercurial-devel
mailing list