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

py2exe: add workaround to allow bundling of hgext3rd.* extensions...

py2exe: add workaround to allow bundling of hgext3rd.* extensions py2exe doesn't know how to handle namespace packages *at all*, so it treats them like normal packages. As a result, if we try and bundle hgext3rd.evolve in a py2exe build, it won't work if we install evolve into the virtualenv. In order to work around this, tortoisehg installs hgext3rd.evolve etc into its staged hg directory, since it doesn't use a virtualenv. As a workaround for us, we'll just allow any extra packages users want bundled are part of hg during the pseudo-install phase that py2exe uses. I'm not happy about this, but it *works*. As a sample of how you'd make an MSI with evolve bundled: import os import shutil import subprocess import tempfile def stage_evolve(version): """Stage evolve for inclusion in py2exe binary.""" with tempfile.TemporaryDirectory() as temp: evolve = os.path.join(temp, "evolve") subprocess.check_call([ "hg.exe", "clone", "https://www.mercurial-scm.org/repo/evolve/", "--update", version, evolve, ]) dest = os.path.join('..', 'hgext3rd', 'evolve') if os.path.exists(dest): shutil.rmtree(dest) shutil.copytree(os.path.join(evolve, "hgext3rd", "evolve"), dest) def main(): stage_evolve('tip') print("\0") print("hgext3rd") print("hgext3rd.evolve") print("hgext3rd.evolve.hack") print("hgext3rd.evolve.thirdparty") if __name__ == "__main__": main() is a script you can pass to the wix/build.py as --extra-packages-script, and the resulting .msi will have an hg binary with evolve baked in. users will still need to enable evolve in their hgrc, so you'd probably also want to bundle configs in your msi for an enterprise environment, but that's already easy to do with the support for extra features and wxs files in the wix build process. Differential Revision: https://phab.mercurial-scm.org/D6189

Gregory Szorc - - Load All Authors

File last commit:

r38806:e7aa113b default


                r42221:399ed3e8

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