6 # This software may be used and distributed according to the terms |
6 # This software may be used and distributed according to the terms |
7 # of the GNU General Public License, incorporated herein by reference. |
7 # of the GNU General Public License, incorporated herein by reference. |
8 |
8 |
9 from i18n import _ |
9 from i18n import _ |
10 from node import hex, nullid, short |
10 from node import hex, nullid, short |
11 import base85, cmdutil, mdiff, util, revlog, diffhelpers, copies |
11 import base85, cmdutil, mdiff, util, diffhelpers, copies |
12 import cStringIO, email.Parser, os, re, errno, math |
12 import cStringIO, email.Parser, os, re, math |
13 import sys, tempfile, zlib |
13 import sys, tempfile, zlib |
14 |
14 |
15 gitre = re.compile('diff --git a/(.*) b/(.*)') |
15 gitre = re.compile('diff --git a/(.*) b/(.*)') |
16 |
16 |
17 class PatchError(Exception): |
17 class PatchError(Exception): |