mercurial-scm/hg-stable: mercurial/mdiff.py annotate

annotate mercurial/mdiff.py @ 10189:e451e599fbcf

patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

author	Patrick Mezard <pmezard@gmail.com>
date	Fri, 01 Jan 2010 20:54:05 +0100
parents	7637fe4f525d
children	d6512b3e9ac0

rev	line source
239 75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	1 # mdiff.py - diff and patch routines for mercurial
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	2 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2580 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
239 75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7436 diff changeset	5 # This software may be used and distributed according to the terms of the
46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 7436 diff changeset	6 # GNU General Public License version 2, incorporated herein by reference.
239 75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	7
6467 65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	8 from i18n import _
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	9 import bdiff, mpatch, util
b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	10 import re, struct
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	11
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	12 def splitnewlines(text):
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	13 '''like str.splitlines, but only split on newlines.'''
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	14 lines = [l + '\n' for l in text.split('\n')]
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	15 if lines:
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	16 if lines[-1] == '\n':
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	17 lines.pop()
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	18 else:
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	19 lines[-1] = lines[-1][:-1]
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	20 return lines
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	21
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	22 class diffopts(object):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	23 '''context is the number of context lines
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	24 text treats all files as text
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	25 showfunc enables diff -p output
2907 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	26 git enables the git extended patch format
3199 096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers Stephen Darnell <stephen@darnell.plus.com> parents: 3026 diff changeset	27 nodates removes dates from diff headers
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	28 ignorews ignores all whitespace changes in the diff
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	29 ignorewsamount ignores changes in the amount of whitespace
10189 e451e599fbcf patch: support diff data loss detection and upgrade Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	30 ignoreblanklines ignores changes whose lines are all blank
e451e599fbcf patch: support diff data loss detection and upgrade Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	31 upgrade generates git diffs to avoid data loss
e451e599fbcf patch: support diff data loss detection and upgrade Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	32 '''
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	33
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	34 defaults = {
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	35 'context': 3,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	36 'text': False,
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5482 diff changeset	37 'showfunc': False,
2907 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	38 'git': False,
3199 096f1c73cdc3 Add -D/--nodates options to hg diff/export that removes dates from diff headers Stephen Darnell <stephen@darnell.plus.com> parents: 3026 diff changeset	39 'nodates': False,
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	40 'ignorews': False,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	41 'ignorewsamount': False,
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	42 'ignoreblanklines': False,
10189 e451e599fbcf patch: support diff data loss detection and upgrade Patrick Mezard <pmezard@gmail.com> parents: 10185 diff changeset	43 'upgrade': False,
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	44 }
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	45
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	46 __slots__ = defaults.keys()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	47
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	48 def __init__(self, **opts):
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	49 for k in self.__slots__:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	50 v = opts.get(k)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	51 if v is None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	52 v = self.defaults[k]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	53 setattr(self, k, v)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	54
6467 65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	55 try:
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	56 self.context = int(self.context)
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	57 except ValueError:
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	58 raise util.Abort(_('diff context lines count must be '
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	59 'an integer, not %r') % self.context)
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	60
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	61 def copy(self, **kwargs):
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	62 opts = dict((k, getattr(self, k)) for k in self.defaults)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	63 opts.update(kwargs)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	64 return diffopts(**opts)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	65
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	66 defaultopts = diffopts()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	67
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	68 def wsclean(opts, text, blank=True):
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	69 if opts.ignorews:
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	70 text = re.sub('[ \t]+', '', text)
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	71 elif opts.ignorewsamount:
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	72 text = re.sub('[ \t]+', ' ', text)
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	73 text = re.sub('[ \t]+\n', '\n', text)
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	74 if blank and opts.ignoreblanklines:
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	75 text = re.sub('\n+', '', text)
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	76 return text
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	77
7200 ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	78 def diffline(revs, a, b, opts):
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	79 parts = ['diff']
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	80 if opts.git:
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	81 parts.append('--git')
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	82 if revs and not opts.git:
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	83 parts.append(' '.join(["-r %s" % rev for rev in revs]))
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	84 if opts.git:
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	85 parts.append('a/%s' % a)
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	86 parts.append('b/%s' % b)
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	87 else:
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	88 parts.append(a)
ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	89 return ' '.join(parts) + '\n'
7204 ad28279053ef Remove trailing space Thomas Arendsen Hein <thomas@intevation.de> parents: 7200 diff changeset	90
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	91 def unidiff(a, ad, b, bd, fn1, fn2, r=None, opts=defaultopts):
4679 826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	92 def datetag(date, addtab=True):
826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	93 if not opts.git and not opts.nodates:
826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	94 return '\t%s\n' % date
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	95 if addtab and ' ' in fn1:
4679 826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	96 return '\t\n'
826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	97 return '\n'
3026 d838bfac668d Remove dates from git export file lines - they confuse git-apply Brendan Cully <brendan@kublai.com> parents: 2907 diff changeset	98
35 9197c26a414b unidiff: punt on comparing empty files mpm@selenic.com parents: 0 diff changeset	99 if not a and not b: return ""
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	100 epoch = util.datestr((0, 0))
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	101
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	102 if not opts.text and (util.binary(a) or util.binary(b)):
6871 13fe85fe396b mdiff: compare content of binary files directly Martin Geisler <mg@daimi.au.dk> parents: 6470 diff changeset	103 if a and b and len(a) == len(b) and a == b:
4103 544838cc1158 Don't lie that "binary file has changed" tailgunner@smtp.ru parents: 3199 diff changeset	104 return ""
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	105 l = ['Binary file %s has changed\n' % fn1]
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	106 elif not a:
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	107 b = splitnewlines(b)
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	108 if a is None:
4679 826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	109 l1 = '--- /dev/null%s' % datetag(epoch, False)
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	110 else:
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	111 l1 = "--- %s%s" % ("a/" + fn1, datetag(ad))
e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	112 l2 = "+++ %s%s" % ("b/" + fn2, datetag(bd))
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	113 l3 = "@@ -0,0 +1,%d @@\n" % len(b)
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	114 l = [l1, l2, l3] + ["+" + e for e in b]
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	115 elif not b:
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	116 a = splitnewlines(a)
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	117 l1 = "--- %s%s" % ("a/" + fn1, datetag(ad))
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	118 if b is None:
4679 826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	119 l2 = '+++ /dev/null%s' % datetag(epoch, False)
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	120 else:
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	121 l2 = "+++ %s%s" % ("b/" + fn2, datetag(bd))
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	122 l3 = "@@ -1,%d +0,0 @@\n" % len(a)
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	123 l = [l1, l2, l3] + ["-" + e for e in a]
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	124 else:
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	125 al = splitnewlines(a)
35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	126 bl = splitnewlines(b)
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5367 diff changeset	127 l = list(bunidiff(a, b, al, bl, "a/" + fn1, "b/" + fn2, opts=opts))
278 777e388c06d6 unidiff: handle empty diffs more gracefully mpm@selenic.com parents: 272 diff changeset	128 if not l: return ""
272 467cea2bf2d8 diff: use tab to separate date from filename mpm@selenic.com parents: 264 diff changeset	129 # difflib uses a space, rather than a tab
3026 d838bfac668d Remove dates from git export file lines - they confuse git-apply Brendan Cully <brendan@kublai.com> parents: 2907 diff changeset	130 l[0] = "%s%s" % (l[0][:-2], datetag(ad))
d838bfac668d Remove dates from git export file lines - they confuse git-apply Brendan Cully <brendan@kublai.com> parents: 2907 diff changeset	131 l[1] = "%s%s" % (l[1][:-2], datetag(bd))
170 e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	132
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	133 for ln in xrange(len(l)):
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	134 if l[ln][-1] != '\n':
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	135 l[ln] += "\n\ No newline at end of file\n"
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	136
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	137 if r:
7200 ca5ac40949dc patch/diff: use a separate function to write the first line of a file diff Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6871 diff changeset	138 l.insert(0, diffline(r, fn1, fn2, opts))
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	139
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140 return "".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	141
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	142 # somewhat self contained replacement for difflib.unified_diff
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	143 # t1 and t2 are the text to be diffed
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	144 # l1 and l2 are the text broken up into lines
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	145 # header1 and header2 are the filenames for the diff output
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	146 def bunidiff(t1, t2, l1, l2, header1, header2, opts=defaultopts):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	147 def contextend(l, len):
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	148 ret = l + opts.context
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	149 if ret > len:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	150 ret = len
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	151 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	152
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	153 def contextstart(l):
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	154 ret = l - opts.context
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	155 if ret < 0:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	156 return 0
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	157 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	158
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	159 def yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	160 if header:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	161 for x in header:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	162 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	163 (astart, a2, bstart, b2, delta) = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	164 aend = contextend(a2, len(l1))
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	165 alen = aend - astart
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	166 blen = b2 - bstart + aend - a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	167
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	168 func = ""
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	169 if opts.showfunc:
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	170 # walk backwards from the start of the context
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	171 # to find a line starting with an alphanumeric char.
7436 07faba78cf5a diff: fix obscure off-by-one error in diff -p Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7204 diff changeset	172 for x in xrange(astart - 1, -1, -1):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	173 t = l1[x].rstrip()
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	174 if funcre.match(t):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	175 func = ' ' + t[:40]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	176 break
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	177
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	178 yield "@@ -%d,%d +%d,%d @@%s\n" % (astart + 1, alen,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	179 bstart + 1, blen, func)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	180 for x in delta:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	181 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	182 for x in xrange(a2, aend):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	183 yield ' ' + l1[x]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	184
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	185 header = [ "--- %s\t\n" % header1, "+++ %s\t\n" % header2 ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	186
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	187 if opts.showfunc:
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	188 funcre = re.compile('\w')
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	189
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	190 # bdiff.blocks gives us the matching sequences in the files. The loop
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	191 # below finds the spaces between those matching sequences and translates
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	192 # them into diff output.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	193 #
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	194 if opts.ignorews or opts.ignorewsamount:
4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	195 t1 = wsclean(opts, t1, False)
4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	196 t2 = wsclean(opts, t2, False)
4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	197
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	198 diff = bdiff.blocks(t1, t2)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	199 hunk = None
8632 9e055cfdd620 replace "i in range(len(xs))" with "i, x in enumerate(xs)" Martin Geisler <mg@lazybytes.net> parents: 8312 diff changeset	200 for i, s1 in enumerate(diff):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	201 # The first match is special.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	202 # we've either found a match starting at line 0 or a match later
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	203 # in the file. If it starts later, old and new below will both be
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	204 # empty and we'll continue to the next match.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	205 if i > 0:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	206 s = diff[i-1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	207 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	208 s = [0, 0, 0, 0]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	209 delta = []
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	210 a1 = s[1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	211 a2 = s1[0]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	212 b1 = s[3]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	213 b2 = s1[2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	214
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	215 old = l1[a1:a2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	216 new = l2[b1:b2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	217
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	218 # bdiff sometimes gives huge matches past eof, this check eats them,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	219 # and deals with the special first match case described above
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	220 if not old and not new:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	221 continue
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	222
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	223 if opts.ignoreblanklines:
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	224 if wsclean(opts, "".join(old)) == wsclean(opts, "".join(new)):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	225 continue
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	226
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	227 astart = contextstart(a1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	228 bstart = contextstart(b1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	229 prev = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	230 if hunk:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	231 # join with the previous hunk if it falls inside the context
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	232 if astart < hunk[1] + opts.context + 1:
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	233 prev = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	234 astart = hunk[1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	235 bstart = hunk[3]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	236 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	237 for x in yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	238 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	239 # we only want to yield the header if the files differ, and
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	240 # we only want to yield it once.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	241 header = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	242 if prev:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	243 # we've joined the previous hunk, record the new ending points.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	244 hunk[1] = a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	245 hunk[3] = b2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	246 delta = hunk[4]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	247 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	248 # create a new hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	249 hunk = [ astart, a2, bstart, b2, delta ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	250
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	251 delta[len(delta):] = [ ' ' + x for x in l1[astart:a1] ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	252 delta[len(delta):] = [ '-' + x for x in old ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	253 delta[len(delta):] = [ '+' + x for x in new ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	254
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	255 if hunk:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	256 for x in yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	257 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	258
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	259 def patchtext(bin):
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	260 pos = 0
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	261 t = []
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	262 while pos < len(bin):
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	263 p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	264 pos += 12
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	265 t.append(bin[pos:pos + l])
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	266 pos += l
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	267 return "".join(t)
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	268
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	269 def patch(a, bin):
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	270 return mpatch.patches(a, [bin])
432 3b9e3d3d2810 Start using bdiff for generating deltas mpm@selenic.com parents: 396 diff changeset	271
4361 99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	272 # similar to difflib.SequenceMatcher.get_matching_blocks
99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	273 def get_matching_blocks(a, b):
99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	274 return [(d[0], d[2], d[1] - d[0]) for d in bdiff.blocks(a, b)]
99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	275
5367 7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 4878 diff changeset	276 def trivialdiffheader(length):
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 4878 diff changeset	277 return struct.pack(">lll", 0, 0, length)
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 4878 diff changeset	278
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	279 patches = mpatch.patches
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 1723 diff changeset	280 patchedsize = mpatch.patchedsize
432 3b9e3d3d2810 Start using bdiff for generating deltas mpm@selenic.com parents: 396 diff changeset	281 textdiff = bdiff.bdiff

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/mdiff.py @ 10189:e451e599fbcf