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

annotate: support diff whitespace filtering flags (issue3030)...

annotate: support diff whitespace filtering flags (issue3030) splitblock() was added to handle blocks returned by bdiff.blocks() which differ only by blank lines but are not made only of blank lines. I do not know exactly how it could happen but mdiff.blocks() threshold behaviour makes me think it can if those blocks are made of very popular lines mixed with popular blank lines. If it is proven to be wrong, the function can be dropped. The first implementation made annotate share diff configuration entries. But it looks like users will user -w/b for annotate but not for diff, on both the command line and hgweb. Since the latter cannot use command line entries, we introduce a new [annotate] section duplicating the diff whitespace options.

Brodie Rao - - Load All Authors

File last commit:

r12387:4f8067c9 default


                r15528:a84698ba

default

Download file

             diffhelpers.py
        
                    60 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / pure / diffhelpers.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # diffhelpers.py - pure Python implementation of diffhelpers.c

      #

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

      #

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

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

      def addlines(fp, hunk, lena, lenb, a, b):

          while True:

              todoa = lena - len(a)

              todob = lenb - len(b)

              num = max(todoa, todob)

              if num == 0:

                  break

              for i in xrange(num):

                  s = fp.readline()

                  c = s[0]

                  if s == "\\ No newline at end of file\n":

                      fix_newline(hunk, a, b)

                      continue

                  if c == "\n":

                      # Some patches may be missing the control char

                      # on empty lines. Supply a leading space.

                      s = " \n"

                  hunk.append(s)

                  if c == "+":

                      b.append(s[1:])

                  elif c == "-":

                      a.append(s)

                  else:

                      b.append(s[1:])

                      a.append(s)

          return 0

      def fix_newline(hunk, a, b):

          l = hunk[-1]

          # tolerate CRLF in last line

          if l.endswith('\r\n'):

              hline = l[:-2]

          else:

              hline = l[:-1]

          c = hline[0]

          if c in " +":

              b[-1] = hline[1:]

          if c in " -":

              a[-1] = hline

          hunk[-1] = hline

          return 0

      def testhunk(a, b, bstart):

          alen = len(a)

          blen = len(b)

          if alen > blen - bstart:

              return -1

          for i in xrange(alen):

              if a[i][1:] != b[i + bstart]:

                  return -1

          return 0

	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

				# diffhelpers.py - pure Python implementation of diffhelpers.c
				#
				# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				def addlines(fp, hunk, lena, lenb, a, b):
				while True:
				todoa = lena - len(a)
				todob = lenb - len(b)
				num = max(todoa, todob)
				if num == 0:
				break
				for i in xrange(num):
				s = fp.readline()
				c = s[0]
				if s == "\\ No newline at end of file\n":
				fix_newline(hunk, a, b)
				continue
				if c == "\n":
				# Some patches may be missing the control char
				# on empty lines. Supply a leading space.
				s = " \n"
				hunk.append(s)
				if c == "+":
				b.append(s[1:])
				elif c == "-":
				a.append(s)
				else:
				b.append(s[1:])
				a.append(s)
				return 0

				def fix_newline(hunk, a, b):
				l = hunk[-1]
				# tolerate CRLF in last line
				if l.endswith('\r\n'):
				hline = l[:-2]
				else:
				hline = l[:-1]
				c = hline[0]

				if c in " +":
				b[-1] = hline[1:]
				if c in " -":
				a[-1] = hline
				hunk[-1] = hline
				return 0


				def testhunk(a, b, bstart):
				alen = len(a)
				blen = len(b)
				if alen > blen - bstart:
				return -1
				for i in xrange(alen):
				if a[i][1:] != b[i + bstart]:
				return -1
				return 0