Mercurial > public > mercurial-scm > hg

comparison mercurial/mdiff.py @ 27484:0d7635dca691

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdiff: use absolute_import
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Dec 2015 21:26:14 -0800
parents 56b2bcea2529
children 7a678a12a5cf
comparison
equal deleted inserted replaced
27483:39087ee88835 27484:0d7635dca691
3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> 3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from i18n import _ 8 from __future__ import absolute_import
9 import bdiff, mpatch, util, base85, error 9
10 import re, struct, zlib 10 import re
11 import struct
12 import zlib
13
14 from .i18n import _
15 from . import (
16 base85,
17 bdiff,
18 error,
19 mpatch,
20 util,
21 )
11 22
12 def splitnewlines(text): 23 def splitnewlines(text):
13 '''like str.splitlines, but only split on newlines.''' 24 '''like str.splitlines, but only split on newlines.'''
14 lines = [l + '\n' for l in text.split('\n')] 25 lines = [l + '\n' for l in text.split('\n')]
15 if lines: 26 if lines: