Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 10965:7faef79a89c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: move mercurial-specific imports after stdlib imports
author Augie Fackler <durin42@gmail.com>
date Sat, 17 Apr 2010 13:13:57 -0500
parents 13a1b2fb7ef2
children 91c58cf54eee
comparison
equal deleted inserted replaced
10964:aa0426c79664 10965:7faef79a89c7
4 # Copyright 2007 Chris Mason <chris.mason@oracle.com> 4 # Copyright 2007 Chris Mason <chris.mason@oracle.com>
5 # 5 #
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.Parser, os, re
10 import tempfile, zlib
11
9 from i18n import _ 12 from i18n import _
10 from node import hex, nullid, short 13 from node import hex, nullid, short
11 import base85, cmdutil, mdiff, util, diffhelpers, copies 14 import base85, cmdutil, mdiff, util, diffhelpers, copies
12 import cStringIO, email.Parser, os, re
13 import tempfile, zlib
14 15
15 gitre = re.compile('diff --git a/(.*) b/(.*)') 16 gitre = re.compile('diff --git a/(.*) b/(.*)')
16 17
17 class PatchError(Exception): 18 class PatchError(Exception):
18 pass 19 pass