Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 19810:c80feeb715d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
python2.4: fix imports of sub-packages of the email package These all have an obvious comment so if/when we finally ditch Python 2.4 we can eradicate them easily.
author Augie Fackler <raf@durin42.com>
date Tue, 24 Sep 2013 15:10:32 -0400
parents b054a241257d
children 7032dcff290c
comparison
equal deleted inserted replaced
19809:50d721553198 19810:c80feeb715d1
6 # This software may be used and distributed according to the terms of the 6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version. 7 # GNU General Public License version 2 or any later version.
8 8
9 import cStringIO, email, os, errno, re, posixpath 9 import cStringIO, email, os, errno, re, posixpath
10 import tempfile, zlib, shutil 10 import tempfile, zlib, shutil
11 # On python2.4 you have to import these by name or they fail to
12 # load. This was not a problem on Python 2.7.
13 import email.Generator
14 import email.Parser
11 15
12 from i18n import _ 16 from i18n import _
13 from node import hex, nullid, short 17 from node import hex, nullid, short
14 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error 18 import base85, mdiff, scmutil, util, diffhelpers, copies, encoding, error
15 import context 19 import context