diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/pure/bdiff.py | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-master.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'mercurial/pure/bdiff.py')
-rw-r--r-- | mercurial/pure/bdiff.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mercurial/pure/bdiff.py b/mercurial/pure/bdiff.py index 06f0bd3..0e457d3 100644 --- a/mercurial/pure/bdiff.py +++ b/mercurial/pure/bdiff.py @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -import struct, difflib, re +import struct, difflib def splitnewlines(text): '''like str.splitlines, but only split on newlines.''' @@ -78,10 +78,3 @@ def blocks(a, b): d = _normalizeblocks(an, bn, d) return [(i, i + n, j, j + n) for (i, j, n) in d] -def fixws(text, allws): - if allws: - text = re.sub('[ \t\r]+', '', text) - else: - text = re.sub('[ \t\r]+', ' ', text) - text = text.replace(' \n', '\n') - return text |