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

annotate mercurial/mdiff.py @ 50224:99296ca9f29e

narrow: get the narrow patterns from the repository object instead of disk Relying on disk data make the transactionally of this change complicated, so let us start reading data from other API instead.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Thu, 23 Feb 2023 04:02:38 +0100
parents	a78dfb1ad60e
children	362d5a2ffd17

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 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 45957 diff changeset	3 # Copyright 2005, 2006 Olivia Mackall <olivia@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
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10185 diff changeset	6 # GNU General Public License version 2 or any later version.
239 75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	7
27484 0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	8
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	9 import re
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	10 import struct
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	11 import zlib
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	12
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	13 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	14 from .pycompat import (
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	15 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	16 setattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43087 diff changeset	17 )
27484 0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	18 from . import (
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44470 diff changeset	19 diffhelper,
36444 44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	20 encoding,
27484 0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	21 error,
32408 3b88a7fa97d8 bdiff: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32246 diff changeset	22 policy,
31636 a7acda2de4b8 diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str Pulkit Goyal <7895pulkit@gmail.com> parents: 31283 diff changeset	23 pycompat,
27484 0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	24 util,
0d7635dca691 mdiff: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	25 )
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36444 diff changeset	26 from .utils import dateutil
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	27
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43531 diff changeset	28 bdiff = policy.importmod('bdiff')
9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43531 diff changeset	29 mpatch = policy.importmod('mpatch')
32408 3b88a7fa97d8 bdiff: switch to policy importer Yuya Nishihara <yuya@tcha.org> parents: 32246 diff changeset	30
32246 ded48ad55146 bdiff: proxy through mdiff module Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	31 blocks = bdiff.blocks
ded48ad55146 bdiff: proxy through mdiff module Yuya Nishihara <yuya@tcha.org> parents: 32245 diff changeset	32 fixws = bdiff.fixws
32244 2d84947cd85d mdiff: move re-exports to top Yuya Nishihara <yuya@tcha.org> parents: 31808 diff changeset	33 patches = mpatch.patches
2d84947cd85d mdiff: move re-exports to top Yuya Nishihara <yuya@tcha.org> parents: 31808 diff changeset	34 patchedsize = mpatch.patchedsize
36684 68026dd7c4f9 cext: accept arguments as Py_buffer Gregory Szorc <gregory.szorc@gmail.com> parents: 36654 diff changeset	35 textdiff = bdiff.bdiff
36184 29dd37a418aa bdiff: write a native version of splitnewlines Augie Fackler <augie@google.com> parents: 35991 diff changeset	36 splitnewlines = bdiff.splitnewlines
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	37
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	38
43531 f2f460cdb4f5 mdiff: mark diffopts as having dynamic attributes Augie Fackler <augie@google.com> parents: 43117 diff changeset	39 # TODO: this looks like it could be an attrs, which might help pytype
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	40 class diffopts:
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45888 diff changeset	41 """context is the number of context lines
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	42 text treats all files as text
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	43 showfunc enables diff -p output
2907 8b02af865990 Add diff --git option Brendan Cully <brendan@kublai.com> parents: 2874 diff changeset	44 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	45 nodates removes dates from diff headers
23293 b89856abf4e2 mdiff.diffopts: add doc comment for nobinary Siddharth Agarwal <sid0@fb.com> parents: 21790 diff changeset	46 nobinary ignores binary files
23294 ec8c73b02e2e mdiff.diffopts: add a new noprefix option Siddharth Agarwal <sid0@fb.com> parents: 23293 diff changeset	47 noprefix disables the 'a/' and 'b/' prefixes (ignored in plain mode)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	48 ignorews ignores all whitespace changes in the diff
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	49 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	50 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	51 upgrade generates git diffs to avoid data loss
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45888 diff changeset	52 """
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	53
43531 f2f460cdb4f5 mdiff: mark diffopts as having dynamic attributes Augie Fackler <augie@google.com> parents: 43117 diff changeset	54 _HAS_DYNAMIC_ATTRIBUTES = True
f2f460cdb4f5 mdiff: mark diffopts as having dynamic attributes Augie Fackler <augie@google.com> parents: 43117 diff changeset	55
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	56 defaults = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	57 b'context': 3,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	58 b'text': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	59 b'showfunc': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	60 b'git': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	61 b'nodates': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	62 b'nobinary': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	63 b'noprefix': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	64 b'index': 0,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	65 b'ignorews': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	66 b'ignorewsamount': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	67 b'ignorewseol': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	68 b'ignoreblanklines': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	69 b'upgrade': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	70 b'showsimilarity': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	71 b'worddiff': False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	72 b'xdiff': False,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	73 }
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	74
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	75 def __init__(self, **opts):
31636 a7acda2de4b8 diff: use pycompat.{byteskwargs, strkwargs} to switch opts b/w bytes and str Pulkit Goyal <7895pulkit@gmail.com> parents: 31283 diff changeset	76 opts = pycompat.byteskwargs(opts)
29416 30789efb1e5e mdiff: remove use of __slots__ Gregory Szorc <gregory.szorc@gmail.com> parents: 27711 diff changeset	77 for k in self.defaults.keys():
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	78 v = opts.get(k)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	79 if v is None:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	80 v = self.defaults[k]
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	81 setattr(self, k, v)
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	82
6467 65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	83 try:
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	84 self.context = int(self.context)
65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	85 except ValueError:
48413 67064c238ae7 errors: use detailed exit code for non-integer number of diff context lines Martin von Zweigbergk <martinvonz@google.com> parents: 46819 diff changeset	86 raise error.InputError(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43089 diff changeset	87 _(b'diff context lines count must be an integer, not %r')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	88 % pycompat.bytestr(self.context)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	89 )
6467 65029a3aafc2 Let --unified default to diff.unified (issue 1076) Patrick Mezard <pmezard@gmail.com> parents: 5863 diff changeset	90
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	91 def copy(self, **kwargs):
44470 9d2b2df2c2ba cleanup: run pyupgrade on our source tree to clean up varying things Augie Fackler <augie@google.com> parents: 43554 diff changeset	92 opts = {k: getattr(self, k) for k in self.defaults}
33114 1b6946f87c50 py3: use pycompat.strkwargs() to convert kwargs keys to str Pulkit Goyal <7895pulkit@gmail.com> parents: 32410 diff changeset	93 opts = pycompat.strkwargs(opts)
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	94 opts.update(kwargs)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	95 return diffopts(**opts)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9827 diff changeset	96
49973 a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	97 def __bytes__(self):
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	98 return b", ".join(
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	99 b"%s: %r" % (k, getattr(self, k)) for k in self.defaults
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	100 )
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	101
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	102 __str__ = encoding.strmethod(__bytes__)
a78dfb1ad60e mdiff: add a __str__ method to diffopts Matt Harbison <matt_harbison@yahoo.com> parents: 49292 diff changeset	103
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	104
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	105 defaultopts = diffopts()
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	106
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	107
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	108 def wsclean(opts, text, blank=True):
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	109 if opts.ignorews:
15530 eeac5e179243 mdiff: replace wscleanup() regexps with C loops Patrick Mezard <pmezard@gmail.com> parents: 15529 diff changeset	110 text = bdiff.fixws(text, 1)
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	111 elif opts.ignorewsamount:
15530 eeac5e179243 mdiff: replace wscleanup() regexps with C loops Patrick Mezard <pmezard@gmail.com> parents: 15529 diff changeset	112 text = bdiff.fixws(text, 0)
9827 4fe9ca519637 mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Patrick Mezard <pmezard@gmail.com> parents: 8632 diff changeset	113 if blank and opts.ignoreblanklines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 text = re.sub(b'\n+', b'\n', text).strip(b'\n')
34031 da07367d683b mdiff: add a --ignore-space-at-eol option David Soria Parra <davidsp@fb.com> parents: 33114 diff changeset	115 if opts.ignorewseol:
37371 d3286dd2ca2f py3: add missing b'' prefix in mdiff.py Pulkit Goyal <7895pulkit@gmail.com> parents: 37370 diff changeset	116 text = re.sub(br'[ \t\r\f]+\n', br'\n', text)
4878 372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	117 return text
372d93f03d3a diff: correctly handle combinations of whitespace options Matt Mackall <mpm@selenic.com> parents: 4679 diff changeset	118
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	119
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	120 def splitblock(base1, lines1, base2, lines2, opts):
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	121 # The input lines matches except for interwoven blank lines. We
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	122 # transform it into a sequence of matching blocks and blank blocks.
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	123 lines1 = [(wsclean(opts, l) and 1 or 0) for l in lines1]
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	124 lines2 = [(wsclean(opts, l) and 1 or 0) for l in lines2]
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	125 s1, e1 = 0, len(lines1)
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	126 s2, e2 = 0, len(lines2)
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	127 while s1 < e1 or s2 < e2:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	128 i1, i2, btype = s1, s2, b'='
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	129 if i1 >= e1 or lines1[i1] == 0 or i2 >= e2 or lines2[i2] == 0:
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	130 # Consume the block of blank lines
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	131 btype = b'~'
15528 a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	132 while i1 < e1 and lines1[i1] == 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	133 i1 += 1
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	134 while i2 < e2 and lines2[i2] == 0:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	135 i2 += 1
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	136 else:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	137 # Consume the matching lines
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	138 while i1 < e1 and lines1[i1] == 1 and lines2[i2] == 1:
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	139 i1 += 1
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	140 i2 += 1
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	141 yield [base1 + s1, base1 + i1, base2 + s2, base2 + i2], btype
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	142 s1 = i1
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	143 s2 = i2
a84698badf0b annotate: support diff whitespace filtering flags (issue3030) Patrick Mezard <pmezard@gmail.com> parents: 15526 diff changeset	144
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	145
31808 ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	146 def hunkinrange(hunk, linerange):
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	147 """Return True if `hunk` defined as (start, length) is in `linerange`
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	148 defined as (lowerbound, upperbound).
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	149
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	150 >>> hunkinrange((5, 10), (2, 7))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	151 True
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	152 >>> hunkinrange((5, 10), (6, 12))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	153 True
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	154 >>> hunkinrange((5, 10), (13, 17))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	155 True
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	156 >>> hunkinrange((5, 10), (3, 17))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	157 True
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	158 >>> hunkinrange((5, 10), (1, 3))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	159 False
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	160 >>> hunkinrange((5, 10), (18, 20))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	161 False
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	162 >>> hunkinrange((5, 10), (1, 5))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	163 False
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	164 >>> hunkinrange((5, 10), (15, 27))
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	165 False
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	166 """
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	167 start, length = hunk
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	168 lowerbound, upperbound = linerange
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	169 return lowerbound < start + length and start < upperbound
ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	171
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	172 def blocksinrange(blocks, rangeb):
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	173 """filter `blocks` like (a1, a2, b1, b2) from items outside line range
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	174 `rangeb` from ``(b1, b2)`` point of view.
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	175
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	176 Return `filteredblocks, rangea` where:
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	177
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	178 * `filteredblocks` is list of ``block = (a1, a2, b1, b2), stype`` items of
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	179 `blocks` that are inside `rangeb` from ``(b1, b2)`` point of view; a
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	180 block ``(b1, b2)`` being inside `rangeb` if
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	181 ``rangeb[0] < b2 and b1 < rangeb[1]``;
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	182 * `rangea` is the line range w.r.t. to ``(a1, a2)`` parts of `blocks`.
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	183 """
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	184 lbb, ubb = rangeb
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	185 lba, uba = None, None
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	186 filteredblocks = []
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	187 for block in blocks:
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	188 (a1, a2, b1, b2), stype = block
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	189 if lbb >= b1 and ubb <= b2 and stype == b'=':
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	190 # rangeb is within a single "=" hunk, restrict back linerange1
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	191 # by offsetting rangeb
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	192 lba = lbb - b1 + a1
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	193 uba = ubb - b1 + a1
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	194 else:
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	195 if b1 <= lbb < b2:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	196 if stype == b'=':
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	197 lba = a2 - (b2 - lbb)
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	198 else:
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	199 lba = a1
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	200 if b1 < ubb <= b2:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	201 if stype == b'=':
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	202 uba = a1 + (ubb - b1)
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	203 else:
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	204 uba = a2
31808 ca3b4a2b7e54 mdiff: add a hunkinrange helper function Denis Laxalde <denis@laxalde.org> parents: 31720 diff changeset	205 if hunkinrange((b1, (b2 - b1)), rangeb):
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	206 filteredblocks.append(block)
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	207 if lba is None or uba is None or uba < lba:
45888 c8860a212770 errors: raise InputError when line range to followlines() is out of bounds Martin von Zweigbergk <martinvonz@google.com> parents: 45154 diff changeset	208 raise error.InputError(_(b'line range exceeds file size'))
30717 3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	209 return filteredblocks, (lba, uba)
3eeb8e138e5c mdiff: add a "blocksinrange" function to filter diff blocks by line range Denis Laxalde <denis.laxalde@logilab.fr> parents: 30025 diff changeset	210
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	211
36705 c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	212 def chooseblocksfunc(opts=None):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	213 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	214 opts is None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	215 or not opts.xdiff
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	216 or not util.safehasattr(bdiff, b'xdiffblocks')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	217 ):
36705 c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	218 return bdiff.blocks
c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	219 else:
c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	220 return bdiff.xdiffblocks
c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	221
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	222
30025 ff17dff99295 mdiff: remove unused parameter 'refine' from allblocks() Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 29416 diff changeset	223 def allblocks(text1, text2, opts=None, lines1=None, lines2=None):
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	224 """Return (block, type) tuples, where block is an mdiff.blocks
e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	225 line entry. type is '=' for blocks matching exactly one another
e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	226 (bdiff blocks), '!' for non-matching blocks and '~' for blocks
30025 ff17dff99295 mdiff: remove unused parameter 'refine' from allblocks() Philippe Pepiot <philippe.pepiot@logilab.fr> parents: 29416 diff changeset	227 matching only after having filtered blank lines.
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	228 line1 and line2 are text1 and text2 split with splitnewlines() if
e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	229 they are already available.
15525 935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	230 """
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	231 if opts is None:
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	232 opts = defaultopts
34031 da07367d683b mdiff: add a --ignore-space-at-eol option David Soria Parra <davidsp@fb.com> parents: 33114 diff changeset	233 if opts.ignorews or opts.ignorewsamount or opts.ignorewseol:
15525 935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	234 text1 = wsclean(opts, text1, False)
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	235 text2 = wsclean(opts, text2, False)
36705 c6a61298ac32 mdiff: add a config option to use xdiff algorithm Jun Wu <quark@fb.com> parents: 36684 diff changeset	236 diff = chooseblocksfunc(opts)(text1, text2)
15525 935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	237 for i, s1 in enumerate(diff):
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	238 # The first match is special.
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	239 # we've either found a match starting at line 0 or a match later
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	240 # in the file. If it starts later, old and new below will both be
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	241 # empty and we'll continue to the next match.
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	242 if i > 0:
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	243 s = diff[i - 1]
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	244 else:
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	245 s = [0, 0, 0, 0]
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	246 s = [s[1], s1[0], s[3], s1[2]]
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	247
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	248 # bdiff sometimes gives huge matches past eof, this check eats them,
935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	249 # and deals with the special first match case described above
15529 b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	250 if s[0] != s[1] or s[2] != s[3]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	251 type = b'!'
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	252 if opts.ignoreblanklines:
15529 b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	253 if lines1 is None:
b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	254 lines1 = splitnewlines(text1)
b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	255 if lines2 is None:
b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	256 lines2 = splitnewlines(text2)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	257 old = wsclean(opts, b"".join(lines1[s[0] : s[1]]))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	258 new = wsclean(opts, b"".join(lines2[s[2] : s[3]]))
15529 b35cf47286a6 mdiff: split lines in allblocks() only when necessary Patrick Mezard <pmezard@gmail.com> parents: 15528 diff changeset	259 if old == new:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	260 type = b'~'
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	261 yield s, type
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 yield s1, b'='
15525 935bf2e7dbc5 mdiff: extract blocks whitespace normalization in diffblocks() Patrick Mezard <pmezard@gmail.com> parents: 15513 diff changeset	263
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	264
35990 8b6dd3922f70 patch: unify check_binary and binary flags Yuya Nishihara <yuya@tcha.org> parents: 35983 diff changeset	265 def unidiff(a, ad, b, bd, fn1, fn2, binary, opts=defaultopts):
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	266 """Return a unified diff as a (headers, hunks) tuple.
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	267
b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	268 If the diff is not null, `headers` is a list with unified diff header
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	269 lines "--- <original>" and "+++ <new>" and `hunks` is a generator yielding
92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	270 (hunkrange, hunklines) coming from _unidiff().
92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	271 Otherwise, `headers` and `hunks` are empty.
35890 079b27b5a869 patch: avoid repeated binary checks if all files in a patch are text Joerg Sonnenberger <joerg@bec.de> parents: 35584 diff changeset	272
35990 8b6dd3922f70 patch: unify check_binary and binary flags Yuya Nishihara <yuya@tcha.org> parents: 35983 diff changeset	273 Set binary=True if either a or b should be taken as a binary file.
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	274 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	275
16362 16b75661828e mdiff: fix diff header generation for files with spaces (issue3357) Patrick Mezard <patrick@mezard.eu> parents: 16089 diff changeset	276 def datetag(date, fn=None):
4679 826659bd8053 git patches: correct handling of filenames with spaces Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4361 diff changeset	277 if not opts.git and not opts.nodates:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	278 return b'\t%s' % date
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	279 if fn and b' ' in fn:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	280 return b'\t'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	281 return b''
3026 d838bfac668d Remove dates from git export file lines - they confuse git-apply Brendan Cully <brendan@kublai.com> parents: 2907 diff changeset	282
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	283 sentinel = [], ()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	284 if not a and not b:
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	285 return sentinel
23299 1f510efcd5f3 mdiff.unidiff: add support for noprefix Siddharth Agarwal <sid0@fb.com> parents: 23294 diff changeset	286
1f510efcd5f3 mdiff.unidiff: add support for noprefix Siddharth Agarwal <sid0@fb.com> parents: 23294 diff changeset	287 if opts.noprefix:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	288 aprefix = bprefix = b''
23299 1f510efcd5f3 mdiff.unidiff: add support for noprefix Siddharth Agarwal <sid0@fb.com> parents: 23294 diff changeset	289 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	290 aprefix = b'a/'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	291 bprefix = b'b/'
23299 1f510efcd5f3 mdiff.unidiff: add support for noprefix Siddharth Agarwal <sid0@fb.com> parents: 23294 diff changeset	292
36636 c6061cadb400 util: extract all date-related utils in utils/dateutil module Boris Feld <boris.feld@octobus.net> parents: 36444 diff changeset	293 epoch = dateutil.datestr((0, 0))
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	294
15437 8f08b635cdce diff: always use / in paths in diff Mads Kiilerich <mads@kiilerich.com> parents: 15141 diff changeset	295 fn1 = util.pconvert(fn1)
8f08b635cdce diff: always use / in paths in diff Mads Kiilerich <mads@kiilerich.com> parents: 15141 diff changeset	296 fn2 = util.pconvert(fn2)
8f08b635cdce diff: always use / in paths in diff Mads Kiilerich <mads@kiilerich.com> parents: 15141 diff changeset	297
35990 8b6dd3922f70 patch: unify check_binary and binary flags Yuya Nishihara <yuya@tcha.org> parents: 35983 diff changeset	298 if binary:
6871 13fe85fe396b mdiff: compare content of binary files directly Martin Geisler <mg@daimi.au.dk> parents: 6470 diff changeset	299 if a and b and len(a) == len(b) and a == b:
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	300 return sentinel
b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	301 headerlines = []
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	302 hunks = ((None, [b'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	303 elif not a:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	304 without_newline = not b.endswith(b'\n')
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	305 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	306 if a is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	307 l1 = b'--- /dev/null%s' % datetag(epoch)
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	308 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	309 l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	310 l2 = b"+++ %s%s" % (bprefix + fn2, datetag(bd, fn2))
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	311 headerlines = [l1, l2]
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	312 size = len(b)
92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	313 hunkrange = (0, 0, 1, size)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	314 hunklines = [b"@@ -0,0 +1,%d @@\n" % size] + [b"+" + e for e in b]
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	315 if without_newline:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	316 hunklines[-1] += b'\n'
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44470 diff changeset	317 hunklines.append(diffhelper.MISSING_NEWLINE_MARKER)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	318 hunks = ((hunkrange, hunklines),)
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	319 elif not b:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	320 without_newline = not a.endswith(b'\n')
2251 35fb62a3a673 fix speed regression in mdiff caused by line split bugfix. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2248 diff changeset	321 a = splitnewlines(a)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 l1 = b"--- %s%s%s" % (aprefix, fn1, datetag(ad, 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	323 if b is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	324 l2 = b'+++ /dev/null%s' % datetag(epoch)
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	325 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 l2 = b"+++ %s%s%s" % (bprefix, fn2, datetag(bd, fn2))
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	327 headerlines = [l1, l2]
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	328 size = len(a)
92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	329 hunkrange = (1, size, 0, 0)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	330 hunklines = [b"@@ -1,%d +0,0 @@\n" % size] + [b"-" + e for e in a]
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	331 if without_newline:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	332 hunklines[-1] += b'\n'
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44470 diff changeset	333 hunklines.append(diffhelper.MISSING_NEWLINE_MARKER)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	334 hunks = ((hunkrange, hunklines),)
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	335 else:
35892 6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	336 hunks = _unidiff(a, b, opts=opts)
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	337 if not next(hunks):
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	338 return sentinel
10614 d0050f36e688 remove header handling out of mdiff.bunidiff, rename it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	339
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	340 headerlines = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	341 b"--- %s%s%s" % (aprefix, fn1, datetag(ad, fn1)),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	342 b"+++ %s%s%s" % (bprefix, fn2, datetag(bd, fn2)),
31281 b3861be6aa6c mdiff: distinguish diff headers from hunks in unidiff() Denis Laxalde <denis.laxalde@logilab.fr> parents: 31279 diff changeset	343 ]
31283 92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	344
92714858dd3e mdiff: let unidiff return (diffheader, hunks) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31282 diff changeset	345 return headerlines, hunks
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	346
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	347
31277 881ed6a4cf87 mdiff: compute newlines-splitted texts within _unidiff Denis Laxalde <denis.laxalde@logilab.fr> parents: 30806 diff changeset	348 def _unidiff(t1, t2, opts=defaultopts):
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	349 """Yield hunks of a headerless unified diff from t1 and t2 texts.
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	350
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	351 Each hunk consists of a (hunkrange, hunklines) tuple where `hunkrange` is a
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	352 tuple (s1, l1, s2, l2) representing the range information of the hunk to
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	353 form the '@@ -s1,l1 +s2,l2 @@' header and `hunklines` is a list of lines
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	354 of the hunk combining said header followed by line additions and
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	355 deletions.
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	356
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	357 The hunks are prefixed with a bool.
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	358 """
31277 881ed6a4cf87 mdiff: compute newlines-splitted texts within _unidiff Denis Laxalde <denis.laxalde@logilab.fr> parents: 30806 diff changeset	359 l1 = splitnewlines(t1)
881ed6a4cf87 mdiff: compute newlines-splitted texts within _unidiff Denis Laxalde <denis.laxalde@logilab.fr> parents: 30806 diff changeset	360 l2 = splitnewlines(t2)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	361
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	362 def contextend(l, len):
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	363 ret = l + opts.context
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	364 if ret > len:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	365 ret = len
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	366 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	367
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	368 def contextstart(l):
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	369 ret = l - opts.context
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	370 if ret < 0:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	371 return 0
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	372 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	373
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	374 lastfunc = [0, b'']
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	375
10614 d0050f36e688 remove header handling out of mdiff.bunidiff, rename it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	376 def yieldhunk(hunk):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	377 (astart, a2, bstart, b2, delta) = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	378 aend = contextend(a2, len(l1))
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	379 alen = aend - astart
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	380 blen = b2 - bstart + aend - a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	381
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	382 func = b""
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2859 diff changeset	383 if opts.showfunc:
15141 16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	384 lastpos, func = lastfunc
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	385 # walk backwards from the start of the context up to the start of
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	386 # the previous hunk context until we find a line starting with an
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	387 # alphanumeric char.
49292 d44e3c45f0e4 py3: replace `pycompat.xrange` by `range` Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	388 for i in range(astart - 1, lastpos - 1, -1):
35583 2f123f309f61 py3: slice on bytes instead of indexing Pulkit Goyal <7895pulkit@gmail.com> parents: 35286 diff changeset	389 if l1[i][0:1].isalnum():
36444 44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	390 func = b' ' + l1[i].rstrip()
44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	391 # split long function name if ASCII. otherwise we have no
44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	392 # idea where the multi-byte boundary is, so just leave it.
44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	393 if encoding.isasciistr(func):
44c4a38bf563 diff: do not split function name if character encoding is unknown Yuya Nishihara <yuya@tcha.org> parents: 36184 diff changeset	394 func = func[:41]
15141 16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	395 lastfunc[1] = func
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	396 break
15141 16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	397 # by recording this hunk's starting point as the next place to
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	398 # start looking for function lines, we avoid reading any line in
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	399 # the file more than once.
16dc9a32ca04 mdiff: speed up showfunc for large diffs Brodie Rao <brodie@bitheap.org> parents: 12751 diff changeset	400 lastfunc[0] = astart
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	401
15462 2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	402 # zero-length hunk ranges report their start line as one less
2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	403 if alen:
2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	404 astart += 1
2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	405 if blen:
2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	406 bstart += 1
2b1ec74c961f mdiff/patch: fix bad hunk handling for unified diffs with zero context Nicolas Venegas <nvenegas@atlassian.com> parents: 15141 diff changeset	407
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	408 hunkrange = astart, alen, bstart, blen
5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	409 hunklines = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	410 [b"@@ -%d,%d +%d,%d @@%s\n" % (hunkrange + (func,))]
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	411 + delta
49292 d44e3c45f0e4 py3: replace `pycompat.xrange` by `range` Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	412 + [b' ' + l1[x] for x in range(a2, aend)]
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	413 )
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	414 # If either file ends without a newline and the last line of
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	415 # that file is part of a hunk, a marker is printed. If the
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	416 # last line of both files is identical and neither ends in
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	417 # a newline, print only one marker. That's the only case in
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	418 # which the hunk can end in a shared line without a newline.
a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	419 skip = False
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	420 if not t1.endswith(b'\n') and astart + alen == len(l1) + 1:
49292 d44e3c45f0e4 py3: replace `pycompat.xrange` by `range` Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	421 for i in range(len(hunklines) - 1, -1, -1):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	422 if hunklines[i].startswith((b'-', b' ')):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	423 if hunklines[i].startswith(b' '):
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	424 skip = True
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	425 hunklines[i] += b'\n'
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44470 diff changeset	426 hunklines.insert(i + 1, diffhelper.MISSING_NEWLINE_MARKER)
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	427 break
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	428 if not skip and not t2.endswith(b'\n') and bstart + blen == len(l2) + 1:
49292 d44e3c45f0e4 py3: replace `pycompat.xrange` by `range` Manuel Jacob <me@manueljacob.de> parents: 49037 diff changeset	429 for i in range(len(hunklines) - 1, -1, -1):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	430 if hunklines[i].startswith(b'+'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	431 hunklines[i] += b'\n'
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 44470 diff changeset	432 hunklines.insert(i + 1, diffhelper.MISSING_NEWLINE_MARKER)
35891 a9d07bd8f758 mdiff: explicitly compute places for the newline marker Joerg Sonnenberger <joerg@bec.de> parents: 35890 diff changeset	433 break
31279 5e7fd3a0b17f mdiff: let _unidiff yield hunks as (<range information>, <hunk lines>) Denis Laxalde <denis.laxalde@logilab.fr> parents: 31278 diff changeset	434 yield hunkrange, hunklines
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	435
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	436 # 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	437 # below finds the spaces between those matching sequences and translates
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	438 # them into diff output.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	439 #
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	440 hunk = None
16089 2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	441 ignoredlines = 0
35892 6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	442 has_hunks = False
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	443 for s, stype in allblocks(t1, t2, opts, l1, l2):
16089 2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	444 a1, a2, b1, b2 = s
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	445 if stype != b'!':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	446 if stype == b'~':
16089 2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	447 # The diff context lines are based on t1 content. When
2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	448 # blank lines are ignored, the new lines offsets must
2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	449 # be adjusted as if equivalent blocks ('~') had the
2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	450 # same sizes on both sides.
2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	451 ignoredlines += (b2 - b1) - (a2 - a1)
15526 e6519c628454 mdiff: make diffblocks() return all blocks, matching and changed Patrick Mezard <pmezard@gmail.com> parents: 15525 diff changeset	452 continue
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	453 delta = []
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	454 old = l1[a1:a2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	455 new = l2[b1:b2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	456
16089 2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	457 b1 -= ignoredlines
2e8f4b82c551 mdiff: adjust hunk offsets with --ignore-blank-lines (issue3234) Patrick Mezard <patrick@mezard.eu> parents: 15657 diff changeset	458 b2 -= ignoredlines
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	459 astart = contextstart(a1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	460 bstart = contextstart(b1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	461 prev = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	462 if hunk:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	463 # 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	464 if astart < hunk[1] + opts.context + 1:
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	465 prev = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	466 astart = hunk[1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	467 bstart = hunk[3]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	468 else:
35892 6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	469 if not has_hunks:
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	470 has_hunks = True
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	471 yield True
10614 d0050f36e688 remove header handling out of mdiff.bunidiff, rename it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	472 for x in yieldhunk(hunk):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	473 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	474 if prev:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	475 # 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	476 hunk[1] = a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	477 hunk[3] = b2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	478 delta = hunk[4]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	479 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	480 # create a new hunk
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	481 hunk = [astart, a2, bstart, b2, delta]
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	482
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	483 delta[len(delta) :] = [b' ' + x for x in l1[astart:a1]]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	484 delta[len(delta) :] = [b'-' + x for x in old]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	485 delta[len(delta) :] = [b'+' + x for x in new]
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	486
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	487 if hunk:
35892 6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	488 if not has_hunks:
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	489 has_hunks = True
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	490 yield True
10614 d0050f36e688 remove header handling out of mdiff.bunidiff, rename it Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	491 for x in yieldhunk(hunk):
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	492 yield x
35892 6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	493 elif not has_hunks:
6a33e81e4c5e mdiff: remove rewindhunk by yielding a bool first to indicate data Joerg Sonnenberger <joerg@bec.de> parents: 35891 diff changeset	494 yield False
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	495
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	496
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	497 def b85diff(to, tn):
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	498 '''print base85-encoded binary diff'''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	499
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	500 def fmtline(line):
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	501 l = len(line)
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	502 if l <= 26:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	503 l = pycompat.bytechr(ord(b'A') + l - 1)
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	504 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 l = pycompat.bytechr(l - 26 + ord(b'a') - 1)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	506 return b'%c%s\n' % (l, util.b85encode(line, True))
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	507
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	508 def chunk(text, csize=52):
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	509 l = len(text)
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	510 i = 0
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	511 while i < l:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	512 yield text[i : i + csize]
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	513 i += csize
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	514
17946 1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	515 if to is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	516 to = b''
17946 1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	517 if tn is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	518 tn = b''
17946 1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	519
1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	520 if to == tn:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	521 return b''
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	522
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	523 # TODO: deltas
17946 1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	524 ret = []
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	525 ret.append(b'GIT binary patch\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	526 ret.append(b'literal %d\n' % len(tn))
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	527 for l in chunk(zlib.compress(tn)):
d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	528 ret.append(fmtline(l))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 ret.append(b'\n')
17946 1e13b1184292 diff: move index header generation to patch Guillermo P?rez <bisho@fb.com> parents: 17941 diff changeset	530
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	531 return b''.join(ret)
17939 d587925680d9 diff: move b85diff to mdiff module Guillermo P?rez <bisho at fb.com> parents: 16362 diff changeset	532
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	533
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	534 def patchtext(bin):
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	535 pos = 0
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	536 t = []
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	537 while pos < len(bin):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	538 p1, p2, l = struct.unpack(b">lll", bin[pos : pos + 12])
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	539 pos += 12
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	540 t.append(bin[pos : pos + l])
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	541 pos += l
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	542 return b"".join(t)
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	543
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	544
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	545 def patch(a, bin):
12025 2315a95ee887 mdiff.patch(): add a special case for when the base text is empty Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10614 diff changeset	546 if len(a) == 0:
2315a95ee887 mdiff.patch(): add a special case for when the base text is empty Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10614 diff changeset	547 # skip over trivial delta header
15657 d976b1ef6760 util: don't mess with builtins to emulate buffer() Matt Mackall <mpm@selenic.com> parents: 15530 diff changeset	548 return util.buffer(bin, 12)
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	549 return mpatch.patches(a, [bin])
432 3b9e3d3d2810 Start using bdiff for generating deltas mpm@selenic.com parents: 396 diff changeset	550
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	551
4361 99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	552 # 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	553 def get_matching_blocks(a, b):
99c853a1408c add mdiff.get_matching_blocks Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4108 diff changeset	554 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	555
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	556
5367 7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 4878 diff changeset	557 def trivialdiffheader(length):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	558 return struct.pack(b">lll", 0, 0, length) if length else b''
5367 7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 4878 diff changeset	559
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 38823 diff changeset	560
24119 a5a06c9c7407 mdiff: add helper for making deltas which replace the full text of a revision Mike Edgar <adgar@google.com> parents: 23299 diff changeset	561 def replacediffheader(oldlen, newlen):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	562 return struct.pack(b">lll", 0, oldlen, newlen)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/mdiff.py @ 50224:99296ca9f29e