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

tests-subrepo-git: emit a different "pwned" message based on the test...

tests-subrepo-git: emit a different "pwned" message based on the test Having a single "pwned" message which may or may not be emitted during the tests for CVE-2016-3068 leads to extra confusion. Allow each test to emit a more detailed message based on what the expectations are. In both cases, we expect a version of git which has had the vulnerability plugged, as well as a version of mercurial which also knows about GIT_ALLOW_PROTOCOL. For the first test, we make sure GIT_ALLOW_PROTOCOL is unset, meaning that the ext-protocol subrepo should be ignored; if it isn't, there's either a problem with mercurial or the installed copy of git. For the second test, we explicitly allow ext-protocol subrepos, which means that the subrepo will be accessed and a message emitted confirming that this was, in fact, our intention.

Gregory Szorc - - Load All Authors

File last commit:

r27336:80214358 default


                r29257:a9764ab8

3.8.3 stable

Download file

             diffhelpers.py
        
                    62 lines
            
             | 1.6 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.

      from __future__ import absolute_import

      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.

				from __future__ import absolute_import

				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