upstream/mercurial-mirror Files · mercurial/diffhelper.py

phases: large rewrite on retract boundary...

phases: large rewrite on retract boundary The new code is still pure Python, so we still have room to going significantly faster. However its complexity of the complex part is `O(|[min_new_draft, tip]|)` instead of `O(|[min_draft, tip]|` which should help tremendously one repository with old draft (like mercurial-devel or mozilla-try). This is especially useful as the most common "retract boundary" operation happens when we commit/rewrite new drafts or when we push new draft to a non-publishing server. In this case, the smallest new_revs is very close to the tip and there is very few work to do. A few smaller optimisation could be done for these cases and will be introduced in later changesets. We still have iterate over large sets of roots, but this is already a great improvement for a very small amount of work. We gather information on the affected changeset as we go as we can put it to use in the next changesets. This extra data collection might slowdown the `register_new` case a bit, however for register_new, it should not really matters. The set of new nodes is either small, so the impact is negligible, or the set of new nodes is large, and the amount of work to do to had them will dominate the overhead the collecting information in `changed_revs`. As this new code compute the changes on the fly, it unlock other interesting improvement to be done in later changeset.

Manuel Jacob - - Load All Authors

File last commit:

r50179:d44e3c45 default


                r52302:2f39c7ae

default

Download file

             diffhelper.py
        
                    81 lines
            
             | 2.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / diffhelper.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # diffhelper.py - helper routines for patch

      #

      # Copyright 2009 Olivia Mackall <olivia@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.

      from .i18n import _

      from . import (

          error,

      )

      MISSING_NEWLINE_MARKER = b'\\ No newline at end of file\n'

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

          """Read lines from fp into the hunk

          The hunk is parsed into two arrays, a and b. a gets the old state of

          the text, b gets the new state. The control char from the hunk is saved

          when inserting into a, but not b (for performance while deleting files.)

          """

          while True:

              todoa = lena - len(a)

              todob = lenb - len(b)

              num = max(todoa, todob)

              if num == 0:

                  break

              for i in range(num):

                  s = fp.readline()

                  if not s:

                      raise error.ParseError(_(b'incomplete hunk'))

                  if s == MISSING_NEWLINE_MARKER:

                      fixnewline(hunk, a, b)

                      continue

                  if s == b'\n' or s == b'\r\n':

                      # Some patches may be missing the control char

                      # on empty lines. Supply a leading space.

                      s = b' ' + s

                  hunk.append(s)

                  if s.startswith(b'+'):

                      b.append(s[1:])

                  elif s.startswith(b'-'):

                      a.append(s)

                  else:

                      b.append(s[1:])

                      a.append(s)

      def fixnewline(hunk, a, b):

          """Fix up the last lines of a and b when the patch has no newline at EOF"""

          l = hunk[-1]

          # tolerate CRLF in last line

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

              hline = l[:-2]

          else:

              hline = l[:-1]

          if hline.startswith((b' ', b'+')):

              b[-1] = hline[1:]

          if hline.startswith((b' ', b'-')):

              a[-1] = hline

          hunk[-1] = hline

      def testhunk(a, b, bstart):

          """Compare the lines in a with the lines in b

          a is assumed to have a control char at the start of each line, this char

          is ignored in the compare.

          """

          alen = len(a)

          blen = len(b)

          if alen > blen - bstart or bstart < 0:

              return False

          for i in range(alen):

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

                  return False

          return True

	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

				# diffhelper.py - helper routines for patch
				#
				# Copyright 2009 Olivia Mackall <olivia@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.


				from .i18n import _

				from . import (
				error,
				)

				MISSING_NEWLINE_MARKER = b'\\ No newline at end of file\n'


				def addlines(fp, hunk, lena, lenb, a, b):
				"""Read lines from fp into the hunk

				The hunk is parsed into two arrays, a and b. a gets the old state of
				the text, b gets the new state. The control char from the hunk is saved
				when inserting into a, but not b (for performance while deleting files.)
				"""
				while True:
				todoa = lena - len(a)
				todob = lenb - len(b)
				num = max(todoa, todob)
				if num == 0:
				break
				for i in range(num):
				s = fp.readline()
				if not s:
				raise error.ParseError(_(b'incomplete hunk'))
				if s == MISSING_NEWLINE_MARKER:
				fixnewline(hunk, a, b)
				continue
				if s == b'\n' or s == b'\r\n':
				# Some patches may be missing the control char
				# on empty lines. Supply a leading space.
				s = b' ' + s
				hunk.append(s)
				if s.startswith(b'+'):
				b.append(s[1:])
				elif s.startswith(b'-'):
				a.append(s)
				else:
				b.append(s[1:])
				a.append(s)


				def fixnewline(hunk, a, b):
				"""Fix up the last lines of a and b when the patch has no newline at EOF"""
				l = hunk[-1]
				# tolerate CRLF in last line
				if l.endswith(b'\r\n'):
				hline = l[:-2]
				else:
				hline = l[:-1]

				if hline.startswith((b' ', b'+')):
				b[-1] = hline[1:]
				if hline.startswith((b' ', b'-')):
				a[-1] = hline
				hunk[-1] = hline


				def testhunk(a, b, bstart):
				"""Compare the lines in a with the lines in b

				a is assumed to have a control char at the start of each line, this char
				is ignored in the compare.
				"""
				alen = len(a)
				blen = len(b)
				if alen > blen - bstart or bstart < 0:
				return False
				for i in range(alen):
				if a[i][1:] != b[i + bstart]:
				return False
				return True