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

py3: allow run-tests.py to run on Windows...

py3: allow run-tests.py to run on Windows This is now functional: HGMODULEPOLICY=py py -3 run-tests.py --local test-help.t --pure --view bcompare However, on this machine without a C compiler, it tries to load cext anyway, and blows up. I haven't looked into why, other than to see that it does set the environment variable. When the test exits though, I see it can't find killdaemons.py, get-with-headers.py, etc. I have no idea why these changes are needed, given that it runs on Linux. But os.system() is insisting that it take a str, and subprocess.Popen() blows up without str: Errored test-help.t: Traceback (most recent call last): File "run-tests.py", line 810, in run self.runTest() File "run-tests.py", line 858, in runTest ret, out = self._run(env) File "run-tests.py", line 1268, in _run exitcode, output = self._runcommand(cmd, env) File "run-tests.py", line 1141, in _runcommand env=env) File "C:\Program Files\Python37\lib\subprocess.py", line 756, in __init__ restore_signals, start_new_session) File "C:\Program Files\Python37\lib\subprocess.py", line 1100, in _execute_child args = list2cmdline(args) File "C:\Program Files\Python37\lib\subprocess.py", line 511, in list2cmdline needquote = (" " in arg) or ("\t" in arg) or not arg TypeError: argument of type 'int' is not iterable This is exactly how it crashes when trying to spin up a pager too. I left one instance of os.system() unchanged in _installhg(), because it doesn't get there.

Gregory Szorc - - Load All Authors

File last commit:

r38806:e7aa113b default


                r39683:543a788e

default

Download file

             diffhelper.py
        
                    78 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 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

      from .i18n import _

      from . import (

          error,

          pycompat,

      )

      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 pycompat.xrange(num):

                  s = fp.readline()

                  if not s:

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

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

                      fixnewline(hunk, a, b)

                      continue

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

                      # Some patches may be missing the control char

                      # on empty lines. Supply a leading space.

                      s = ' ' + s

                  hunk.append(s)

                  if s.startswith('+'):

                      b.append(s[1:])

                  elif s.startswith('-'):

                      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('\r\n'):

              hline = l[:-2]

          else:

              hline = l[:-1]

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

              b[-1] = hline[1:]

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

              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 pycompat.xrange(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 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

				from .i18n import _

				from . import (
				error,
				pycompat,
				)

				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 pycompat.xrange(num):
				s = fp.readline()
				if not s:
				raise error.ParseError(_('incomplete hunk'))
				if s == "\\ No newline at end of file\n":
				fixnewline(hunk, a, b)
				continue
				if s == '\n' or s == '\r\n':
				# Some patches may be missing the control char
				# on empty lines. Supply a leading space.
				s = ' ' + s
				hunk.append(s)
				if s.startswith('+'):
				b.append(s[1:])
				elif s.startswith('-'):
				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('\r\n'):
				hline = l[:-2]
				else:
				hline = l[:-1]

				if hline.startswith((' ', '+')):
				b[-1] = hline[1:]
				if hline.startswith((' ', '-')):
				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 pycompat.xrange(alen):
				if a[i][1:] != b[i + bstart]:
				return False
				return True