upstream/mercurial-mirror Files · mercurial/pure/bdiff.py

wireproto: define and expose types of wire command arguments...

wireproto: define and expose types of wire command arguments Exposing the set of argument names is cool. But with wire protocol version 2, we're using CBOR to transport arguments and this allows us to have typing for arguments. Typed arguments are much nicer because they will cut down on transfer overhead and processing overhead for decoding values. This commit teaches @wireprotocommand to accept a dictionary for arguments. The arguments registered for version 2 transports are canonically stored as dictionaries rather than a space-delimited string. It is an error to defined arguments with a dictionary for commands using version 1 transports. This reinforces my intent to fully decouple command handlers for version 2 transports. Differential Revision: https://phab.mercurial-scm.org/D3202

Augie Fackler - - Load All Authors

File last commit:

r36163:29dd37a4 default


                r37553:69e46c18

default

Download file

             bdiff.py
        
                    102 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / bdiff.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
      # bdiff.py - Python implementation of bdiff.c

      #

      # Copyright 2009 Matt Mackall <mpm@selenic.com> and others

      #

        Martin Geisler
    
updated license to be explicit about GPL version 2

              r8225
            
      # This software may be used and distributed according to the terms of the

        Matt Mackall
    
Update license to GPLv2+

              r10263
            
      # GNU General Public License version 2 or any later version.

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
        Gregory Szorc
    
bdiff: use absolute_import

              r27335
            
      from __future__ import absolute_import

      import difflib

      import re

      import struct

        Matt Mackall
    
pure/bdiff: fix circular import

              r7944
            
      def splitnewlines(text):

          '''like str.splitlines, but only split on newlines.'''

          lines = [l + '\n' for l in text.split('\n')]

          if lines:

              if lines[-1] == '\n':

                  lines.pop()

              else:

                  lines[-1] = lines[-1][:-1]

          return lines

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
      def _normalizeblocks(a, b, blocks):

          prev = None

        Dan Villiom Podlaski Christiansen
    
pure bdiff: don't use a generator...

              r14066
            
          r = []

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
          for curr in blocks:

              if prev is None:

                  prev = curr

                  continue

              shift = 0

              a1, b1, l1 = prev

              a1end = a1 + l1

              b1end = b1 + l1

              a2, b2, l2 = curr

              a2end = a2 + l2

              b2end = b2 + l2

              if a1end == a2:

        Matt Mackall
    
many, many trivial check-code fixups

              r10282
            
                  while (a1end + shift < a2end and

                         a[a1end + shift] == b[b1end + shift]):

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
                      shift += 1

              elif b1end == b2:

        Matt Mackall
    
many, many trivial check-code fixups

              r10282
            
                  while (b1end + shift < b2end and

                         a[a1end + shift] == b[b1end + shift]):

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
                      shift += 1

        Dan Villiom Podlaski Christiansen
    
pure bdiff: don't use a generator...

              r14066
            
              r.append((a1, b1, l1 + shift))

        Matt Mackall
    
many, many trivial check-code fixups

              r10282
            
              prev = a2 + shift, b2 + shift, l2 - shift

        Dan Villiom Podlaski Christiansen
    
pure bdiff: don't use a generator...

              r14066
            
          r.append(prev)

          return r

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
      def bdiff(a, b):

        Yuya Nishihara
    
py3: use bytes() to cast to immutable bytes in pure.bdiff.bdiff()

              r31641
            
          a = bytes(a).splitlines(True)

          b = bytes(b).splitlines(True)

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
          if not a:

              s = "".join(b)

              return s and (struct.pack(">lll", 0, 0, len(s)) + s)

          bin = []

          p = [0]

        Alex Gaynor
    
style: never put multiple statements on one line...

              r34436
            
          for i in a:

              p.append(p[-1] + len(i))

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
          d = difflib.SequenceMatcher(None, a, b).get_matching_blocks()

          d = _normalizeblocks(a, b, d)

          la = 0

          lb = 0

          for am, bm, size in d:

              s = "".join(b[lb:bm])

              if am > la or s:

                  bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s)

              la = am + size

              lb = bm + size

          return "".join(bin)

      def blocks(a, b):

        Matt Mackall
    
pure/bdiff: fix circular import

              r7944
            
          an = splitnewlines(a)

          bn = splitnewlines(b)

        Martin Geisler
    
pure Python implementation of bdiff.c

              r7703
            
          d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks()

          d = _normalizeblocks(an, bn, d)

          return [(i, i + n, j, j + n) for (i, j, n) in d]

        Patrick Mezard
    
mdiff: replace wscleanup() regexps with C loops...

              r15530
            
      def fixws(text, allws):

          if allws:

              text = re.sub('[ \t\r]+', '', text)

          else:

              text = re.sub('[ \t\r]+', ' ', text)

              text = text.replace(' \n', '\n')

          return text

        Augie Fackler
    
bdiff: write a native version of splitnewlines...

              r36163
            
      def splitnewlines(text):

          '''like str.splitlines, but only split on newlines.'''

          lines = [l + '\n' for l in text.split('\n')]

          if lines:

              if lines[-1] == '\n':

                  lines.pop()

              else:

                  lines[-1] = lines[-1][:-1]

          return lines

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Martin Geisler pure Python implementation of bdiff.c	r7703	# bdiff.py - Python implementation of bdiff.c
		#
		# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
		#
Martin Geisler updated license to be explicit about GPL version 2	r8225	# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
Martin Geisler pure Python implementation of bdiff.c	r7703
Gregory Szorc bdiff: use absolute_import	r27335	from __future__ import absolute_import

		import difflib
		import re
		import struct
Matt Mackall pure/bdiff: fix circular import	r7944
		def splitnewlines(text):
		'''like str.splitlines, but only split on newlines.'''
		lines = [l + '\n' for l in text.split('\n')]
		if lines:
		if lines[-1] == '\n':
		lines.pop()
		else:
		lines[-1] = lines[-1][:-1]
		return lines
Martin Geisler pure Python implementation of bdiff.c	r7703
		def _normalizeblocks(a, b, blocks):
		prev = None
Dan Villiom Podlaski Christiansen pure bdiff: don't use a generator...	r14066	r = []
Martin Geisler pure Python implementation of bdiff.c	r7703	for curr in blocks:
		if prev is None:
		prev = curr
		continue
		shift = 0

		a1, b1, l1 = prev
		a1end = a1 + l1
		b1end = b1 + l1

		a2, b2, l2 = curr
		a2end = a2 + l2
		b2end = b2 + l2
		if a1end == a2:
Matt Mackall many, many trivial check-code fixups	r10282	while (a1end + shift < a2end and
		a[a1end + shift] == b[b1end + shift]):
Martin Geisler pure Python implementation of bdiff.c	r7703	shift += 1
		elif b1end == b2:
Matt Mackall many, many trivial check-code fixups	r10282	while (b1end + shift < b2end and
		a[a1end + shift] == b[b1end + shift]):
Martin Geisler pure Python implementation of bdiff.c	r7703	shift += 1
Dan Villiom Podlaski Christiansen pure bdiff: don't use a generator...	r14066	r.append((a1, b1, l1 + shift))
Matt Mackall many, many trivial check-code fixups	r10282	prev = a2 + shift, b2 + shift, l2 - shift
Dan Villiom Podlaski Christiansen pure bdiff: don't use a generator...	r14066	r.append(prev)
		return r
Martin Geisler pure Python implementation of bdiff.c	r7703
		def bdiff(a, b):
Yuya Nishihara py3: use bytes() to cast to immutable bytes in pure.bdiff.bdiff()	r31641	a = bytes(a).splitlines(True)
		b = bytes(b).splitlines(True)
Martin Geisler pure Python implementation of bdiff.c	r7703
		if not a:
		s = "".join(b)
		return s and (struct.pack(">lll", 0, 0, len(s)) + s)

		bin = []
		p = [0]
Alex Gaynor style: never put multiple statements on one line...	r34436	for i in a:
		p.append(p[-1] + len(i))
Martin Geisler pure Python implementation of bdiff.c	r7703
		d = difflib.SequenceMatcher(None, a, b).get_matching_blocks()
		d = _normalizeblocks(a, b, d)
		la = 0
		lb = 0
		for am, bm, size in d:
		s = "".join(b[lb:bm])
		if am > la or s:
		bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s)
		la = am + size
		lb = bm + size

		return "".join(bin)

		def blocks(a, b):
Matt Mackall pure/bdiff: fix circular import	r7944	an = splitnewlines(a)
		bn = splitnewlines(b)
Martin Geisler pure Python implementation of bdiff.c	r7703	d = difflib.SequenceMatcher(None, an, bn).get_matching_blocks()
		d = _normalizeblocks(an, bn, d)
		return [(i, i + n, j, j + n) for (i, j, n) in d]

Patrick Mezard mdiff: replace wscleanup() regexps with C loops...	r15530	def fixws(text, allws):
		if allws:
		text = re.sub('[ \t\r]+', '', text)
		else:
		text = re.sub('[ \t\r]+', ' ', text)
		text = text.replace(' \n', '\n')
		return text
Augie Fackler bdiff: write a native version of splitnewlines...	r36163
		def splitnewlines(text):
		'''like str.splitlines, but only split on newlines.'''
		lines = [l + '\n' for l in text.split('\n')]
		if lines:
		if lines[-1] == '\n':
		lines.pop()
		else:
		lines[-1] = lines[-1][:-1]
		return lines